diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java index 6f2530edb..b4b623d6e 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java @@ -61,7 +61,7 @@ public class GridOpeningResultDTO implements Serializable { private int itemCount = 0; /** - * 项目结案数 + * 项目解决数 */ private int itemCloseCount = 0; diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index bc0331ffa..9a58f5628 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -140,7 +140,7 @@ epen.GRID_ID gridId, COUNT( epen.ID ) itemCount, COUNT(epen.EVALUATION_SCORE = '2' OR NULL) itemPraiseCount, - count(epen.ITEM_STATE = '10' or null) itemCloseCount + count(epen.ITEM_STATE = '10' or epen.ITEM_STATE = '5' or null) itemCloseCount FROM esua_epdc_events.epdc_item epen WHERE