diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java index 3849717..80be62d 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java @@ -23,7 +23,7 @@ public interface RpcApplyMapper extends BaseMapper { Double countComfortMoney(Date beginTime, Date endTime); @Select("SELECT " + - "b.person_type,\n" + + "b.person_type, " + "IFNULL( sdd.dict_label,'未知') as name , " + "count(*) as `value`FROM rpc_apply as a " + "LEFT JOIN (SELECT emp_no, person_type, `name` FROM sup_police WHERE del =0) as b on a.applicant_emp_no = b.emp_no " + @@ -153,7 +153,6 @@ public interface RpcApplyMapper extends BaseMapper { "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id " + "WHERE ra.rpc_id is not null " + "AND ra.type =1 " + - "AND ra.verified = 0 " + "AND ra.crt_time >= #{beginTime} AND ra.crt_time <= #{endTime} " + "AND (sd.id =#{id} OR sdd.id=#{id} or sddd.id=#{id});") List getIncidentOrg(Date beginTime, Date endTime, String id);