认证-参数项收集-带入工程接口人

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -479,6 +479,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		}
 	}
 
+	/**
+	 *  带入工程接口人
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-带入工程接口人")
+	@ApiOperation(value="参数项收集清单-带入工程接口人", notes="参数项收集清单-带入工程接口人")
+	@PostMapping(value = "/bringSdtInto")
+//	@RequiresPermissions("params:collectManifest:bring")
+	public Result<?> bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
+		paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO);
+		return Result.OK("带入工程接口人成功！");
+	}
+
 
 
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java

@@ -139,4 +139,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 
 	// 同步上报库
 	boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 带入工程接口人
+	boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO);
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1579,6 +1579,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return isSuccess;
 	}
 
+	@Override
+	public boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+		String projectId = paramsCollectManifestVO.getProjectId();
+
+		// 查询所有收集参数项
+		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
+		List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+		// 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
+		list = list.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList());
+
+		List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(list)) {
+			list.forEach(collectManifestEO -> {
+
+				// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+				ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, collectManifestEO.getDutyTerritory());
+				if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+					String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+					if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+						SysUser sysUser = sysUserService.getById(sdtId);
+						if (ObjectUtil.isNotEmpty(sysUser)) {
+							ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+							updateCollectManifestEO.setId(collectManifestEO.getId());
+							updateCollectManifestEO.setSdt(sysUser.getUsername());
+
+							updateCollectManifestEOList.add(updateCollectManifestEO);
+						}
+					}
+				}
+			});
+
+		}
+
+		return updateBatchById(updateCollectManifestEOList);
+	}
+
 	/**
 	 * 获取一个类和其父类的所有属性
 	 *

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java

@@ -58,7 +58,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		}
 
 		if (StringUtils.isNotEmpty(paramsReportEO.getTitle())) {
-			paramsReportEO.setProjectName(paramsReportEO.getTitle().replace("%", "\\%"));
+			paramsReportEO.setTitle(paramsReportEO.getTitle().replace("%", "\\%"));
 		}
 
 		IPage page = new Page(pageNo, pageSize);

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml

@@ -32,7 +32,7 @@
         <where>
             <if test="paramsReportEO != null">
                 <if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
-                    AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.paramsManifestTitle}),'%')
+                    AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%')
                 </if>
                 <if test="paramsReportEO.projectName !=null and paramsReportEO.projectName !=''">
                     AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportEO.projectName}),'%')