Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java

@@ -15,6 +15,8 @@ public enum CertificationFlowNodeEnum {
     ZRRJJRW ("zrrjjrw","责任人拒绝任务","The person in charge refused the assignment"),
     ZRRTJRW ("zrrtjrw","责任人提交任务","The responsible person submits the task"),
     RZGCSSC ("rzgcssc","认证工程师审查","Certified engineer review"),
+    RZGCSSC_TG ("rzgcssc_tg","认证工程师审查-通过","Certified engineer review through"),
+    RZGCSSC_TH ("rzgcssc_th","认证工程师审查-退回","Certified engineer review returned"),
     ;
 
     String key;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -301,6 +301,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			throw new JeroBootException("至少选择一条数据进行发布！");
 		}
 		String endTime = json.getString("endTime");
+		String cut = json.getString("cut");
 
 		List<String> idList = Arrays.asList(ids.split(","));
 
@@ -315,7 +316,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(certificationQueryWrap);
 
 		if(CollectionUtils.isEmpty(projectCertificationInventoryEOList)){
-			throw new JeroBootException("至少选择一条数据流程状态为'清单待发布 或 认证退回'的数据！");
+			if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				throw new JeroBootException("Select at least one data flow whose status is' List to be released or Certification returned '!");
+			}else {
+				throw new JeroBootException("至少选择一条数据流程状态为'清单待发布 或 认证退回'的数据！");
+			}
+
 		}
 		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 
@@ -723,18 +729,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 
 		// 给studio分配待办中心任务
-		List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
+		/*List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
 		ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
 		processInfoDetailEO.setUserId(projectLibraryBase.getStudioEngineer());
 		processInfoDetailEOList.add(processInfoDetailEO);
-		this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.STUDIOFQ.getKey());
+		this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.STUDIOFQ.getKey());*/
 
 		try {
 			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
 				projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
 			}
 
-			// 认证工程师发起任务，将数据的状态更新为 任务待确认。
+			// 认证工程师退回任务到studio，将数据的状态更新为 认证退回
 			this.updateBatchById(projectCertificationInventoryEOList);
 
 			// 更新该项目认证流程中，认证工程师的任务状态。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -172,14 +172,14 @@
                    '' as title_en,
                    pi.flow_type,
                    pi.create_by,
-                   <!--(
+                   (
                        select
                             pid.end_time
                        from
                             process_info_detail pid
                        where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1
-                   ) as end_time,-->
+                   ) as end_time,
-                    (
+                    <!--(
                         case when flow_type = '21' then
                             (
                                 SELECT
@@ -206,7 +206,7 @@
                                 pid.end_time ASC
                                 LIMIT 1
                             ) end
-                    )AS end_time,
+                    )AS end_time,-->
                    pi.STATUS,
                    pi.prc_num,
                    pi.prc_name,