Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform

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

@@ -30,6 +30,7 @@ public class SubProcessDTO implements Serializable {
 	 */
 	private String handleUserName;
 	private String subId;
+	private String processId;
 	/**
 	 * 处理内容
 	 */

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

@@ -45,10 +45,10 @@ public interface ProjectSubProcessDao extends BaseDao<ProjectSubProcessEntity> {
 
     /**
      * @Description  查询进展和附件
-     * @Param processId
+     * @Param processIds
      * @author zxc
      * @date 2021/3/18 下午2:57
      */
-    List<SubProcessDTO> selectSubProcessAndAttachment(@Param("processId") String processId);
+    List<SubProcessDTO> selectSubProcessAndAttachment(@Param("processIds")List<String> processIds);
 
 }

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

@@ -104,9 +104,9 @@ public interface ProjectSubProcessService extends BaseService<ProjectSubProcessE
 
     /**
      * @Description  查询进展和附件
-     * @Param processId
+     * @Param processIds
      * @author zxc
      * @date 2021/3/18 下午2:57
      */
-    List<SubProcessDTO> selectSubProcessAndAttachment(String processId);
+    List<SubProcessDTO> selectSubProcessAndAttachment(List<String> processIds);
 }

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

@@ -31,7 +31,9 @@ import com.epmet.service.ProjectSubProcessService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -106,18 +108,24 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
      */
     @Override
     public ProjectSubProcessDTO selectSubProcess(List<String> projectStaffIds) {
+        if (CollectionUtils.isEmpty(projectStaffIds)){
+            return null;
+        }
         return baseDao.selectSubProcess(projectStaffIds);
     }
 
     /**
      * @Description  查询进展和附件
-     * @Param processId
+     * @Param processIds
      * @author zxc
      * @date 2021/3/18 下午2:57
      */
     @Override
-    public List<SubProcessDTO> selectSubProcessAndAttachment(String processId) {
+    public List<SubProcessDTO> selectSubProcessAndAttachment(List<String> processIds) {
-        return baseDao.selectSubProcessAndAttachment(processId);
+        if (CollectionUtils.isEmpty(processIds)){
+            return new ArrayList<>();
+        }
+        return baseDao.selectSubProcessAndAttachment(processIds);
     }
 
 }

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

@@ -144,12 +144,20 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 			log.warn(ProjectConstant.NOT_EXIST_PROJECT);
 			return new ArrayList<>();
 		}
+		List<String> processIds = processList.stream().filter(f -> f.getIsSend().equals(NumConstant.ONE)).map(m -> m.getProcessId()).collect(Collectors.toList());
+		List<SubProcessDTO> subProcess = projectSubProcessService.selectSubProcessAndAttachment(processIds);
 		// 是否发送到外部系统 0否 1是
+		if (!CollectionUtils.isEmpty(subProcess)){
 			processList.forEach(p -> {
-			if (p.getIsSend().equals(NumConstant.ONE)){
+				subProcess.forEach(s -> {
-				p.setSubProcess(projectSubProcessService.selectSubProcessAndAttachment(p.getProcessId()));
+					if (p.getProcessId().equals(s.getProcessId())){
+						List<SubProcessDTO> process = new ArrayList<>();
+						process.add(s);
+						p.setSubProcess(process);
 					}
 				});
+			});
+		}
 
 		// 查询进展附件列表
 		List<PublicAndInternalFileResultDTO> files = attachmentDao.selectAttachByProjectId(formDTO.getProjectId());

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

@@ -51,6 +51,7 @@
         <result property="handleUserName" column="handleUserName"/>
         <result property="result" column="result"/>
         <result property="subId" column="subId"/>
+        <result property="processId" column="processId"/>
         <collection property="subFile" column="subId" select="selectAtt" ofType="com.epmet.dto.result.PublicAndInternalFileResultDTO"/>
     </resultMap>
     <!-- 查询进展和附件 -->
@@ -60,11 +61,15 @@
             psp.EXTERNAL_STATUS as externalStatus,
             psp.CREATED_TIME AS processTime,
             psp.HANDLE_USER_NAME as handleUserName,
-            psp.RESULT as result
+            psp.RESULT as result,
+            psp.process_id as processId
         FROM project_sub_process psp
-
         WHERE psp.DEL_FLAG = 0
-          AND psp.PROCESS_ID = #{processId}
+          AND (
+              <foreach collection="processIds" item="processId" separator=" OR ">
+                  psp.PROCESS_ID = #{processId}
+              </foreach>
+            )
     </select>
     <select id="selectAtt" resultType="com.epmet.dto.result.PublicAndInternalFileResultDTO">
         SELECT