diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index c872e5e..3f5e667 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -236,19 +236,19 @@ public interface NegativeMapper extends BaseMapper { @Select("select " + - "sd.short_name AS `name`," + - "sd.id AS departId, " + - "COUNT( DISTINCT ng.id ) AS totalPro, " + - "COUNT( DISTINCT IF(ng.problemSourcesCode=13, ng.id, NULL) ) AS xc, " + - "COUNT( DISTINCT IF(ng.problemSourcesCode=15, ng.id, NULL) ) AS zx, " + - "COUNT( DISTINCT IF(ng.processing_status in ('signing', 'processing', 'approval'), ng.id, NULL) ) AS processingNumber, " + - "COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) ) AS completedNumber " + - "from sup_depart sd " + - "LEFT JOIN negative ng ON ng.second_involve_depart_id=sd.id AND ng.problemSourcesCode IN (13,14, 15) " + - "AND crtTime BETWEEN #{beginTime} AND #{endTime} " + - "WHERE sd.statistics_group_id=3 " + - "GROUP BY sd.short_name " + - "ORDER BY totalPro DESC;" + " sd.short_name AS `name`," + + " sd.id AS departId, " + + " COUNT( DISTINCT ng.id ) AS totalPro, " + + " COUNT( DISTINCT IF(ng.problemSourcesCode=13, ng.id, NULL) ) AS xc, " + + " COUNT( DISTINCT IF(ng.problemSourcesCode=15, ng.id, NULL) ) AS zx, " + + " COUNT( DISTINCT IF(ng.processing_status in ('signing', 'processing', 'approval'), ng.id, NULL) ) AS processingNumber, " + + " COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) ) AS completedNumber " + + " from sup_depart sd " + + " LEFT JOIN negative ng ON ng.second_involve_depart_id=sd.id AND ng.problemSourcesCode IN (13,14, 15) " + + " AND crtTime BETWEEN #{beginTime} AND #{endTime} " + + " WHERE sd.statistics_group_id=3 " + + " GROUP BY sd.short_name " + + " ORDER BY totalPro DESC;" ) List getSupervisionMapIconData(Date beginTime, Date endTime); @@ -257,23 +257,23 @@ public interface NegativeMapper extends BaseMapper { //获取personNum、relationOrg @Select( "select count(*) FROM sup_depart sd " + - "LEFT JOIN negative ng ON ng.second_involve_depart_id=sd.id AND ng.problemSourcesCode IN (13,14, 15) " + - "AND crtTime BETWEEN #{beginTime} AND #{endTime} " + - "LEFT JOIN negative_blame nb ON ng.id=nb.negativeId " + - "WHERE nb.handleResultName != '' and nb.handleResultName IS NOT NULL and nb.handleResultName != '不予追责' " + - "and nb.type = #{code} and sd.id =#{departId}" + " LEFT JOIN negative ng ON ng.second_involve_depart_id=sd.id AND ng.problemSourcesCode IN (13,14, 15) " + + " AND crtTime BETWEEN #{beginTime} AND #{endTime} " + + " LEFT JOIN negative_blame nb ON ng.id=nb.negativeId " + + " WHERE nb.handleResultName != '' and nb.handleResultName IS NOT NULL and nb.handleResultName != '不予追责' " + + " and nb.type = #{code} and sd.id =#{departId}" ) String getSupervisionMapStringData(Date beginTime, Date endTime,String code,String departId); //获取completedRate @Select( "select " + - "IFNULL( ROUND( COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) )/COUNT( DISTINCT ng.id )*100, 1), 0) " + - "FROM sup_depart sd" + - "LEFT JOIN negative ng ON ng.second_involve_depart_id=sd.id AND ng.problemSourcesCode IN (13,14, 15)" + - "AND crtTime BETWEEN #{beginTime} AND #{endTime}" + - "LEFT JOIN negative_blame nb ON ng.id=nb.negativeId " + - "where sd.id =#{departId}" + " IFNULL( ROUND( COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) )/COUNT( DISTINCT ng.id )*100, 1), 0) " + + " FROM sup_depart sd" + + " LEFT JOIN negative ng ON ng.second_involve_depart_id=sd.id AND ng.problemSourcesCode IN (13,14, 15)" + + " AND crtTime BETWEEN #{beginTime} AND #{endTime}" + + " LEFT JOIN negative_blame nb ON ng.id=nb.negativeId " + + " where sd.id =#{departId}" ) String getSupervisionMapCompletedRate(Date beginTime, Date endTime,String departId);