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 { "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 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 { Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper 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 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 " 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 rpcApplyPersonList =rpcApplyPersonMapper.selectPerson(id); if(ArrayUtil.isNotEmpty(rpcApplyPersonList)){ superviseVo.setRpcApplyPeoples(rpcApplyPersonList);