fix(企标稽查计划): 79357

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java

@@ -182,7 +182,7 @@ public class ProcessEsInspectPlanController extends JeroController<ProcessEsInsp
     * @param response
     * @return
     */
-    @PostMapping(value = "/importExcel")
+    @GetMapping(value = "/importExcel")
     public Result<ProcessEsInspectPlan> importExcel(HttpServletRequest request, HttpServletResponse response) throws Exception {
         return processEsInspectPlanService.importExcel(request, response);
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanOpinionMapper.java

@@ -2,6 +2,9 @@ package com.jero.modules.activiti.process.esinspectplan.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description: 企标稽查计划业务_意见表
@@ -11,4 +14,10 @@ import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPl
  */
 public interface ProcessEsInspectPlanOpinionMapper extends BaseMapper<ProcessEsInspectPlanOpinion> {
 
+    /**
+     * 标准化组-根据账号分组查最新
+     * @param id
+     * @return
+     */
+    List<ProcessEsInspectPlanOpinion> findLastByGroup(@Param("inspectPlanId") String inspectPlanId);
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanOpinionMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.modules.activiti.process.esinspectplan.mapper.ProcessEsInspectPlanOpinionMapper">
 
+    <select id="findLastByGroup"
+            resultType="com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion">
+        select *
+        from (select create_by, max(id) id
+              from process_es_inspect_plan_opinion
+              where inspect_plan_id = #{inspectPlanId}
+                and del_flag = 0
+              group by create_by) t1
+                 left join process_es_inspect_plan_opinion t2 on t1.create_by = t2.create_by and t1.id = t2.id
+    </select>
 </mapper>

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java

@@ -79,4 +79,11 @@ public interface IProcessEsInspectPlanOpinionService extends IService<ProcessEsI
 	 * @return
 	 */
 	ProcessEsInspectPlanOpinion queryLastOpinion(String inspectPlanId);
+
+	/**
+	 * 标准化组-根据账号分组查最新
+	 * @param id
+	 * @return
+	 */
+	List<ProcessEsInspectPlanOpinion> findLastByGroup(String inspectPlanId);
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java

@@ -30,8 +30,13 @@ import java.util.List;
 @Transactional(rollbackFor = JeroBootException.class)
 public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl<ProcessEsInspectPlanOpinionMapper, ProcessEsInspectPlanOpinion> implements IProcessEsInspectPlanOpinionService {
 
+	private final ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper;
 
-    /**
+	public ProcessEsInspectPlanOpinionServiceImpl(ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper) {
+		this.processEsInspectPlanOpinionMapper = processEsInspectPlanOpinionMapper;
+	}
+
+	/**
      * 分页查询
      *
      * @param processEsInspectPlanOpinion
@@ -136,4 +141,9 @@ public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl<ProcessE
 		queryWrapper.last("limit 1");
 		return getOne(queryWrapper,false);
 	}
+
+	@Override
+	public List<ProcessEsInspectPlanOpinion> findLastByGroup(String inspectPlanId) {
+		return processEsInspectPlanOpinionMapper.findLastByGroup(inspectPlanId);
+	}
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java

@@ -108,10 +108,8 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 
 	private void fillProperty(List<ProcessEsInspectPlan> list) {
 		for (ProcessEsInspectPlan processEsInspectPlan : list) {
-			LambdaQueryWrapper<ProcessEsInspectPlanOpinion> queryWrapper = new LambdaQueryWrapper<ProcessEsInspectPlanOpinion>()
+			// 意见
-					.eq(ProcessEsInspectPlanOpinion::getInspectPlanId, processEsInspectPlan.getId());
+			List<ProcessEsInspectPlanOpinion> opinionList = iProcessEsInspectPlanOpinionService.findLastByGroup( processEsInspectPlan.getId());
-			queryWrapper.orderByDesc(ProcessEsInspectPlanOpinion::getCreateTime);
-			List<ProcessEsInspectPlanOpinion> opinionList = iProcessEsInspectPlanOpinionService.list(queryWrapper);
 			for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) {
 				// 用户翻译
 				processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getCreateBy()));