项目内容详情增加部门满意度展示

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<String> images;
+    /**
+     * 项目满意度
+     */
+    private String evaluationScore;
+    /**
+     * 部门满意度评价
+     */
+    private List<ItemDeptEvaluateResultDTO> deptEvaluateResultDTOS;
 }

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;
+}

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<ItemEvaluateDeptEntity> {
 
+    /**
+     *
+     * 根据项目ID获取部门满意度评价
+     *
+     * @params [itemId]
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO>
+     * @author liuchuang
+     * @since 2019/9/27 14:41
+     */
+    List<ItemDeptEvaluateResultDTO> selectListOfDeptEvaluateByItemId(String itemId);
+
 }

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<ItemEvaluateDeptEnt
      * @Date: 2019/9/17 9:39
      */
     void saveEvaluateDepts(List<ItemEvaluateDeptDTO> evaluateDeptDTOS, String itemId, Long createdDeptId);
+
+    /**
+     *
+     * 根据项目ID获取部门满意度评价
+     *
+     * @params [itemId]
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO>
+     * @author liuchuang
+     * @since 2019/9/27 14:42
+     */
+    List<ItemDeptEvaluateResultDTO> listOfDeptEvaluateByItemId(String itemId);
 }

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<ItemEvaluateDep
         this.insertBatch(evaluateDeptEntities);
     }
 
+    @Override
+    public List<ItemDeptEvaluateResultDTO> listOfDeptEvaluateByItemId(String itemId) {
+        return baseDao.selectListOfDeptEvaluateByItemId(itemId);
+    }
+
 }

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<ItemDao, ItemEntity> implem
     public ItemContentForPCEndResultDTO getItemContentDetail(String itemId) {
         // 详情
         ItemContentForPCEndResultDTO resultDTO = baseDao.selectItemContentForPCEnd(itemId);
-        //处理进度
+        // 处理进度
         List<ItemHandleProgressResultDTO> handleProgressResultDTOS = this.listOfItemHandleProgress(itemId, 0);
         resultDTO.setHandleProgressResultDTOS(handleProgressResultDTOS);
+        // 部门满意度评价
+        List<ItemDeptEvaluateResultDTO> deptEvaluateResultDTOS = itemEvaluateDeptService.listOfDeptEvaluateByItemId(itemId);
+        resultDTO.setDeptEvaluateResultDTOS(deptEvaluateResultDTOS);
         return resultDTO;
     }
 

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

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemEvaluateDeptDao.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.item.dao.ItemEvaluateDeptDao">
+
+    <select id="selectListOfDeptEvaluateByItemId" resultType="com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO">
+        SELECT
+            DEPT_NAME AS deptName,
+        CASE
+                EVALUATION_LEVEL
+                WHEN 0 THEN
+                '不满意'
+                WHEN 1 THEN
+                '基本满意'
+                WHEN 2 THEN
+                '非常满意' ELSE ''
+            END AS evaluationLevel
+        FROM
+            epdc_item_evaluate_dept
+        WHERE
+            DEL_FLAG = '0'
+            AND ITEM_ID = #{itemId}
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
+
+</mapper>