From e7ae412e502d11e6e03899caff10a8aae15886f8 Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Tue, 10 Jun 2025 16:53:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=B4=E6=9D=83=E7=9D=A3=E5=8A=9E?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3v3=20+=20=E7=8E=B0=E5=9C=BA?=
 =?UTF-8?q?=E7=9D=A3=E5=AF=9F=E5=8A=9E=E7=BB=93=E7=8E=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=97=AE=E9=A2=98=E6=95=B0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/biutag/supervision/mapper/NegativeMapper.java     | 3 ++-
 .../com/biutag/supervision/mapper/RpcApplyPersonMapper.java    | 2 +-
 .../com/biutag/supervision/mapper/RpcApplySuperviseMapper.java | 2 +-
 .../biutag/supervision/service/RpcApplySuperviseService.java   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
index fda1877..d837144 100644
--- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
@@ -149,7 +149,8 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "AND sd.statistics_group_id=#{groupId} " +
             "AND crtTime BETWEEN #{beginTime} AND #{endTime} " +
             "GROUP BY sd.short_name " +
-            "ORDER BY rate desc, denominator desc")
+            "ORDER BY  denominator desc")
+    //,rate desc
     List<RankVo> getChangedRateRank(Date beginTime, Date endTime, Integer groupId);
 
     @Select("SELECT npr.oneLevelContent as name, count(*) value FROM negative ng, negative_problem_relation npr " +
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java
index d542e45..1e1fb6f 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java
@@ -19,7 +19,7 @@ public interface RpcApplyPersonMapper extends BaseMapper<RpcApplyPerson> {
     Page<RpcApplyVo> queryPage(@Param("page") Page<RpcApplySupervise> page, @Param(Constants.WRAPPER) QueryWrapper<RpcApplySupervise> queryWrapper);
 
 
-    @Select(" SELECT a.*,sup.job as empType,sup.name as empName from rpc_apply_person as a " +
+    @Select(" SELECT a.*,sup.job_type as empType,sup.name as empName from rpc_apply_person as a " +
             " left join sup_police as sup " +
             " on a.emp_no = sup.emp_no  where a.rpc_id =  #{id} " )
     List<RpcApplyPerson> selectPerson(String id);
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java
index 712d09d..ac4c81b 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java
@@ -22,7 +22,7 @@ public interface RpcApplySuperviseMapper  extends BaseMapper<RpcApplySupervise>
             " p.*, " +
             " ap.injury_severity AS injuryServerity,  " +
             " ap.injury_severity_name as injuryServerityName,    " +
-            " sup.job AS policeJob    " +
+            " sup.job_type AS policeJob    " +
             " FROM  " +
             " rpc_apply_supervise a " +
             " LEFT JOIN rpc_person p ON  a.rpc_id = p.rpc_id " +
diff --git a/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java b/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java
index c0a8611..e549fa1 100644
--- a/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java
+++ b/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java
@@ -89,7 +89,7 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
             if (ArrayUtil.isNotEmpty(rpcInfringerResults)){
                 superviseVo.setRpcInfringerResults(rpcInfringerResults);
             }
-            //获取被害人信息
+            //获取被侵权人信息
             List<RpcApplyPerson> rpcApplyPersonList =rpcApplyPersonMapper.selectPerson(id);
             if(ArrayUtil.isNotEmpty(rpcApplyPersonList)){
                 superviseVo.setRpcApplyPeoples(rpcApplyPersonList);