From f50815dd685f7a431c8135ba8a6c0f2a35260674 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 27 Sep 2019 15:01:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=86=85=E5=AE=B9=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E6=BB=A1=E6=84=8F?= =?UTF-8?q?=E5=BA=A6=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ItemContentForPCEndResultDTO.java | 8 ++++++ .../result/ItemDeptEvaluateResultDTO.java | 24 +++++++++++++++++ .../modules/item/dao/ItemEvaluateDeptDao.java | 14 ++++++++++ .../item/service/ItemEvaluateDeptService.java | 12 +++++++++ .../impl/ItemEvaluateDeptServiceImpl.java | 6 +++++ .../item/service/impl/ItemServiceImpl.java | 5 +++- .../main/resources/mapper/item/ItemDao.xml | 6 +++++ .../mapper/item/ItemEvaluateDeptDao.xml | 27 +++++++++++++++++++ 8 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDeptEvaluateResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemEvaluateDeptDao.xml diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java index a77c98fc7..3a24d3bba 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java @@ -51,4 +51,12 @@ public class ItemContentForPCEndResultDTO implements Serializable { * 图片 */ private List images; + /** + * 项目满意度 + */ + private String evaluationScore; + /** + * 部门满意度评价 + */ + private List deptEvaluateResultDTOS; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDeptEvaluateResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDeptEvaluateResultDTO.java new file mode 100644 index 000000000..034e3379a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDeptEvaluateResultDTO.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 部门满意度评价 + * @Author：liuchuang + * @Date：2019/9/27 14:23 + */ +@Data +public class ItemDeptEvaluateResultDTO implements Serializable { + private static final long serialVersionUID = 2744943467551946778L; + + /** + * 部门名称 + */ + private String deptName; + /** + * 满意度 + */ + private String evaluationLevel; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemEvaluateDeptDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemEvaluateDeptDao.java index abeaa4de5..53f0cb32b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemEvaluateDeptDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemEvaluateDeptDao.java @@ -18,9 +18,12 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEvaluateDeptEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 部门满意度评价表 * @@ -30,4 +33,15 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ItemEvaluateDeptDao extends BaseDao { + /** + * + * 根据项目ID获取部门满意度评价 + * + * @params [itemId] + * @return java.util.List + * @author liuchuang + * @since 2019/9/27 14:41 + */ + List selectListOfDeptEvaluateByItemId(String itemId); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemEvaluateDeptService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemEvaluateDeptService.java index 66d152084..009e28528 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemEvaluateDeptService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemEvaluateDeptService.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; +import com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEvaluateDeptEntity; import java.util.List; @@ -49,4 +50,15 @@ public interface ItemEvaluateDeptService extends BaseService evaluateDeptDTOS, String itemId, Long createdDeptId); + + /** + * + * 根据项目ID获取部门满意度评价 + * + * @params [itemId] + * @return java.util.List + * @author liuchuang + * @since 2019/9/27 14:42 + */ + List listOfDeptEvaluateByItemId(String itemId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java index 1b363303b..4aa40316d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.item.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; +import com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO; import com.elink.esua.epdc.modules.item.dao.ItemEvaluateDeptDao; import com.elink.esua.epdc.modules.item.entity.ItemEvaluateDeptEntity; import com.elink.esua.epdc.modules.item.service.ItemEvaluateDeptService; @@ -61,4 +62,9 @@ public class ItemEvaluateDeptServiceImpl extends BaseServiceImpl listOfDeptEvaluateByItemId(String itemId) { + return baseDao.selectListOfDeptEvaluateByItemId(itemId); + } + } 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 69daa546a..367f7b6d7 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 @@ -500,9 +500,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem public ItemContentForPCEndResultDTO getItemContentDetail(String itemId) { // 详情 ItemContentForPCEndResultDTO resultDTO = baseDao.selectItemContentForPCEnd(itemId); - //处理进度 + // 处理进度 List handleProgressResultDTOS = this.listOfItemHandleProgress(itemId, 0); resultDTO.setHandleProgressResultDTOS(handleProgressResultDTOS); + // 部门满意度评价 + List deptEvaluateResultDTOS = itemEvaluateDeptService.listOfDeptEvaluateByItemId(itemId); + resultDTO.setDeptEvaluateResultDTOS(deptEvaluateResultDTOS); return resultDTO; } 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 81acadb80..bca3d5f28 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 @@ -361,6 +361,12 @@ eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.COMMENT_NUM, + CASE item.EVALUATION_SCORE + WHEN 0 THEN '不满意' + WHEN 1 THEN '基本满意' + WHEN 2 THEN '非常满意' + ELSE '' + END AS evaluationScore, img.IMG_URL FROM epdc_item item diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemEvaluateDeptDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemEvaluateDeptDao.xml new file mode 100644 index 000000000..70b7340b6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemEvaluateDeptDao.xml @@ -0,0 +1,27 @@ + + + + + + + + \ No newline at end of file