diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 11bb66002..914006d57 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -25,11 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; @@ -188,7 +186,7 @@ public class ItemController { /** - * 统计项目处理数 包括:网格呼叫总数,网格呼叫被响应数,网格呼叫被关闭数 + * kpi- 统计项目处理数 包括:网格呼叫总数,网格呼叫被响应数,网格呼叫被关闭数 * * @param metaDataFormDto * @return com.elink.esua.epdc.commons.tools.utils.Result> @@ -202,15 +200,15 @@ public class ItemController { } /*** - * 网格工作评议 - * @param kpiEventJobEvaluationFromDTO + * kpi- 网格对项目处理的评价 不满意 满意 非常满意 统计 + * @param metaDataFormDto * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/12/20 15:37 */ - @PostMapping("queryListJobEvaluation") - public Result> queryListJobEvaluation(@RequestBody KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO) { - - return itemService.listJobEvaluation(kpiEventJobEvaluationFromDTO); + @PostMapping("statGridEvaluationMetaData") + public Result> statGridEvaluationMetaData(@RequestBody KpiMetaDataOfEventsFormDTO metaDataFormDto) { + List list = itemService.statGridEvaluationMetaData(metaDataFormDto); + return new Result().ok(list); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index c3af0d7a4..b0946bbf1 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -18,10 +18,8 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; @@ -210,13 +208,13 @@ public interface ItemDao extends BaseDao { List selectListPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); /*** - * 绩效考核 - 项目 - 网格工作评议 不满意 满意 非常满意 统计 - * @param kpiEventJobEvaluationFromDTO + * 绩效考核 - 项目 - 网格对项目处理的评价 不满意 满意 非常满意 统计 + * @param metaDataFormDto * @return java.util.List * @author qushutong * @date 2019/12/20 15:43 */ - List selectListJobEvaluation(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO); + List selectListGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); /*** * 绩效考核 - 项目 - 网格吹哨总数 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 919d29148..9aeae3bac 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -20,10 +20,8 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.*; @@ -324,11 +322,11 @@ public interface ItemService extends BaseService { List statItemHandleAmount(KpiMetaDataOfEventsFormDTO metaDataFormDto); /*** - * 网格工作评议 - * @param kpiEventJobEvaluationFromDTO + * 绩效考核 - 项目 - 网格对项目处理的评价 不满意 满意 非常满意 统计 + * @param metaDataFormDto * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/12/20 15:40 */ - Result> listJobEvaluation(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO); + List statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 5d22e670f..66a68b353 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -35,14 +35,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.*; import com.elink.esua.epdc.constants.MenuCodeConstant; import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; import com.elink.esua.epdc.dto.MenuNoticeDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO; import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemDeptDTO; @@ -855,21 +853,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem } @Override - public Result> listJobEvaluation(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO) { - List kpiMetaDataDTOList; - List allMetaDataList = new ArrayList<>(); - //统计不满意 - kpiEventJobEvaluationFromDTO.setEvaluationLevel(ItemEvaluationLevel.levaluationLevelBad); - kpiMetaDataDTOList = baseDao.selectListJobEvaluation(kpiEventJobEvaluationFromDTO); - allMetaDataList.addAll(kpiMetaDataDTOList); - //满意 - kpiEventJobEvaluationFromDTO.setEvaluationLevel(ItemEvaluationLevel.levaluationLevelBetter); - kpiMetaDataDTOList = baseDao.selectListJobEvaluation(kpiEventJobEvaluationFromDTO); - allMetaDataList.addAll(kpiMetaDataDTOList); - //非常满意 - kpiEventJobEvaluationFromDTO.setEvaluationLevel(ItemEvaluationLevel.levaluationLevelBest); - kpiMetaDataDTOList = baseDao.selectListJobEvaluation(kpiEventJobEvaluationFromDTO); - allMetaDataList.addAll(kpiMetaDataDTOList); - return new Result>().ok(allMetaDataList); + public List statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) { + List list = baseDao.selectListGridEvaluationMetaData(metaDataFormDto); + return list; } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index bd62d641e..220f3875a 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -804,56 +804,38 @@ ) noticeTable ON pendingTable.keystr = noticeTable.keystr - SELECT - dept.deptId, - COUNT( ei.EVALUATION_SCORE = '0' OR NULL ) lowAmount, - COUNT( ei.EVALUATION_SCORE = '1' OR NULL ) mediumAmount, - COUNT( ei.EVALUATION_SCORE = '2' OR NULL ) highAmount + dept.deptId, + COUNT( ei.EVALUATION_SCORE = '0' OR NULL ) lowAmount, + COUNT( ei.EVALUATION_SCORE = '1' OR NULL ) mediumAmount, + COUNT( ei.EVALUATION_SCORE = '2' OR NULL ) highAmount FROM - ( - - SELECT #{item} AS deptId - - ) dept + + SELECT #{item} AS deptId + LEFT JOIN epdc_item ei ON ei.GRID_ID = dept.deptId WHERE - (ei.DEL_FLAG = '0' AND ei.CREATED_TIME BETWEEN #{startDate} AND #{endDate}) - OR ei.DEL_FLAG IS NULL - GROUP BY - dept.deptId + (ei.DEL_FLAG = '0' AND ei.CREATED_TIME BETWEEN #{startDate} AND #{endDate}) + OR ei.DEL_FLAG IS NULL + GROUP BY dept.deptId - SELECT - - '网格评议不满意数' as dataName, - 'grid_low_evaluation_amount' as dataCode, - - - '网格评议基本满意数' as dataName, - 'grid_medium_evaluation_amount' as dataCode, - - - '网格评议满意数' as data_name, - 'grid_high_evaluation_amount' as dataCode, - - COUNT(ed.ID) as dataValue, - #{startDate} as startDate, - #{endDate} as endDate, - dept.deptId AS deptId + dept.deptId, + COUNT(ed.EVALUATION_LEVEL = '0' OR NULL) lowAmount, + COUNT(ed.EVALUATION_LEVEL = '1' OR NULL) mediumAmount, + COUNT(ed.EVALUATION_LEVEL = '2' OR NULL) highAmount FROM - - SELECT #{deptId} AS deptId - - LEFT JOIN - epdc_item_evaluate_dept ed ON dept.deptId = ed.DEPT_ID - AND - #{evaluationLevel} = ed.EVALUATION_LEVEL - AND ed.DEL_FLAG = '0' AND ed.CREATED_TIME BETWEEN #{startDate} AND #{endDate} - GROUP BY - dept.deptId + + SELECT #{deptId} AS deptId + + LEFT JOIN epdc_item_evaluate_dept ed ON dept.deptId = ed.DEPT_ID + WHERE + (ed.DEL_FLAG = '0' AND ed.CREATED_TIME BETWEEN #{startDate} AND #{endDate}) + OR ed.DEL_FLAG IS NULL + GROUP BY dept.deptId