diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java index d512fc623..65abf89eb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java @@ -79,7 +79,9 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl 1 THEN ID END) AS responseCount, - COUNT(CASE WHEN EVALUATION_SCORE > 0 THEN ID END) AS satisfiedCount + COUNT(CASE WHEN ITEM_STATE = '10' AND (EVALUATION_SCORE != 0 OR EVALUATION_SCORE > 0) THEN ID END) AS satisfiedCount FROM epdc_item a LEFT JOIN ( SELECT ITEM_ID, count(ID) AS 'processCount' @@ -67,7 +67,11 @@ THEN ID END) AS closedCount, COUNT(CASE WHEN DATE_FORMAT(b.CREATED_TIME, '%Y-%m') = #{statDate} THEN ID END) AS responseCount, COUNT(CASE - WHEN DATE_FORMAT(EVALUATION_TIME, '%Y-%m') = #{statDate} AND EVALUATION_SCORE > 0 + WHEN ITEM_STATE = '10' AND + DATE_FORMAT(c.CREATED_TIME, '%Y-%m') = #{statDate} AND + (EVALUATION_SCORE != 0 OR + (DATE_FORMAT(EVALUATION_TIME, '%Y-%m') = #{statDate} AND + EVALUATION_SCORE > 0)) THEN ID END) AS satisfiedCount FROM epdc_item a LEFT JOIN ( @@ -141,7 +145,11 @@ THEN ID END) AS closedCount, COUNT(CASE WHEN DATE_FORMAT(b.CREATED_TIME, '%Y') = #{statDate} THEN ID END) AS responseCount, COUNT(CASE - WHEN DATE_FORMAT(EVALUATION_TIME, '%Y') = #{statDate} AND EVALUATION_SCORE > 0 + WHEN ITEM_STATE = '10' AND + DATE_FORMAT(c.CREATED_TIME, '%Y') = #{statDate} AND + (EVALUATION_SCORE != 0 OR + (DATE_FORMAT(EVALUATION_TIME, '%Y') = #{statDate} AND + EVALUATION_SCORE > 0)) THEN ID END) AS satisfiedCount FROM epdc_item a LEFT JOIN ( @@ -256,9 +264,14 @@ '%Y-%m-%d') <= #{endDate} THEN ID END) AS responseCount, COUNT(CASE - WHEN DATE_FORMAT(EVALUATION_TIME, '%Y-%m-%d') >= #{startDate} AND - DATE_FORMAT(EVALUATION_TIME, - '%Y-%m-%d') <= #{endDate} AND EVALUATION_SCORE > 0 + WHEN + ITEM_STATE = '10' AND + DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d') >= #{startDate} AND + DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d') <= #{endDate} AND + (EVALUATION_SCORE != 0 OR + (DATE_FORMAT(EVALUATION_TIME, '%Y-%m-%d') >= #{startDate} AND + DATE_FORMAT(EVALUATION_TIME, '%Y-%m-%d') <= #{endDate} AND + EVALUATION_SCORE > 0)) THEN ID END) AS satisfiedCount FROM epdc_item a LEFT JOIN (