满意度评价列表

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SatisfactionEvaluationListFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/18 09:57
+ * @DESC
+ */
+@Data
+public class SatisfactionEvaluationListFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1790517675681175478L;
+
+    public interface SatisfactionEvaluationListForm{}
+
+    @NotBlank(message = "projectId不能为空",groups = SatisfactionEvaluationListForm.class)
+    private String projectId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/SatisfactionEvaluationListResultDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/18 09:58
+ * @DESC
+ */
+@Data
+public class SatisfactionEvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4086193179665858119L;
+
+    /**
+     * 评价人
+     */
+    private String evaluationUser;
+
+    @JsonIgnore
+    private String userId;
+
+    /**
+     * 评价时间
+     */
+    private String time;
+
+    /**
+     * 评价内容
+     */
+    private String content;
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@@ -351,4 +351,16 @@ public class ProjectController {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<PageData>().ok(projectService.projectList(formDTO));
     }
+
+    /**
+     * Desc: 满意度评价列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/18 10:03
+     */
+    @PostMapping("satisfaction-evaluation-list")
+    public Result<List<SatisfactionEvaluationListResultDTO>> satisfactionEvaluationList(@RequestBody SatisfactionEvaluationListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, SatisfactionEvaluationListFormDTO.SatisfactionEvaluationListForm.class);
+        return new Result<List<SatisfactionEvaluationListResultDTO>>().ok(projectService.satisfactionEvaluationList(formDTO));
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java

@@ -20,10 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.ProjectEvaluationListFormDTO;
 import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
-import com.epmet.dto.result.EvaluationListResultDTO;
-import com.epmet.dto.result.ProjectEvaluateDetailResultDTO;
-import com.epmet.dto.result.ProjectEvaluateInfoResultDTO;
-import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -69,4 +66,12 @@ public interface ProjectSatisfactionDetailDao extends BaseDao<ProjectSatisfactio
      */
     List<ProjectEvaluateDetailResultDTO> selectProjectEvaluateDetail(@Param("projectIds")List<String> projectIds);
 
+    /**
+     * Desc: 满意度评价列表
+     * @param projectId
+     * @author zxc
+     * @date 2022/5/18 10:03
+     */
+    List<SatisfactionEvaluationListResultDTO> satisfactionEvaluationList(@Param("projectId")String projectId);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -1,20 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
@@ -393,4 +376,12 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 */
 	PageData projectList(ProjectManageListFormDTO formDTO);
 
+	/**
+	 * Desc: 满意度评价列表
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2022/5/18 10:03
+	 */
+	List<SatisfactionEvaluationListResultDTO> satisfactionEvaluationList(SatisfactionEvaluationListFormDTO formDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -42,6 +42,7 @@ import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.*;
 import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectOrgRelationDao;
+import com.epmet.dao.ProjectSatisfactionDetailDao;
 import com.epmet.dao.ProjectSatisfactionStatisticsDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
@@ -96,8 +97,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntity> implements ProjectService {
 	private Logger logger = LogManager.getLogger(ProjectServiceImpl.class);
-	@Autowired
-	private ProjectRedis projectRedis;
+
 	@Autowired
 	private CustomerProjectParameterService parameterService;
 	@Autowired
@@ -150,6 +150,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private LoginUserUtil loginUserUtil;
 	@Autowired
 	private BlockChainUploadService blockChainUploadService;
+	@Autowired
+	private ProjectSatisfactionDetailDao satisfactionDetailDao;
 
 	private final static String ONE_DAY = "<1";
 
@@ -3230,7 +3232,27 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return result;
     }
 
-    /**
+	/**
+	 * Desc: 满意度评价列表
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2022/5/18 10:03
+	 */
+	@Override
+	public List<SatisfactionEvaluationListResultDTO> satisfactionEvaluationList(SatisfactionEvaluationListFormDTO formDTO) {
+		PageInfo<SatisfactionEvaluationListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> satisfactionDetailDao.satisfactionEvaluationList(formDTO.getProjectId()));
+		List<SatisfactionEvaluationListResultDTO> result = pageInfo.getList();
+		if (CollectionUtils.isNotEmpty(result)){
+			Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(result.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList()));
+			if (!listResult.success()){
+				throw new EpmetException("查询user信息失败...");
+			}
+			listResult.getData().forEach(u -> result.stream().filter(r -> r.getUserId().equals(u.getUserId())).forEach(r -> r.setEvaluationUser(u.getRealName())));
+		}
+		return result;
+	}
+
+	/**
 	 * @Description  区间项目分类数量处理
 	 * 查询的是时间段内的分类项目数，查询的时间 是传入一个日期，拼上时间，在进行比较大小
 	 * @param categories

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml

@@ -75,4 +75,16 @@
             )
     </select>
 
+    <!-- 满意度评价列表 -->
+    <select id="satisfactionEvaluationList" resultType="com.epmet.dto.result.SatisfactionEvaluationListResultDTO">
+        SELECT
+            created_by AS userId,
+            `COMMENT` AS content,
+            CREATED_TIME AS time
+        FROM project_satisfaction_detail
+        WHERE DEL_FLAG = '0'
+          AND PROJECT_ID = #{projectId}
+        ORDER BY CREATED_TIME DESC
+    </select>
+
 </mapper>