WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改参数清单带入接口人问题

Browse Source
This commit is contained in:
gaosong
2024-01-18 18:06:48 +08:00
parent 496750e875
commit 0dc0289450
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+2 -2
View File
@@ -164,8 +164,8 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
}
@ApiOperation(value = "参数清单-更新模板", notes = "参数清单-更新模板更新参数")
@PostMapping(value = "/updateModel")
public Result<?> updateModel(String mid, String version,String cid) {
@GetMapping(value = "/updateModel")
public Result<?> updateModel(@RequestParam(name="mid",required=true) String mid, @RequestParam(name="version",required=true) String version,@RequestParam(name="cid",required=true) String cid) {
boolean isSuccess = paramsManifestEOService.updateModel(mid,version, cid);
if (isSuccess) {
return Result.OK("更新成功！");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+16 -11
View File
@@ -4849,6 +4849,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String projectId = paramsCollectManifestVO.getProjectId();
String cut = paramsCollectManifestVO.getCut();
String sdt = paramsCollectManifestVO.getSdt();
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 查询参数清单
@@ -4871,23 +4872,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestEO.getId());
updateEO.setDutyTerritory(dutyTerritory);
// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectVersionId(), dutyTerritory);
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)) {
updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
if(StringUtils.isNotBlank(sdt)){
SysUser sysUser = sysUserService.getById(sdt);
updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
}else{
// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectVersionId(), dutyTerritory);
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)) {
updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
} else {
updateEO.setSdt(""); // 设置工程接口人
}
} else {
updateEO.setSdt(""); // 设置工程接口人
}
} else {
updateEO.setSdt(""); // 设置工程接口人
}
} else {
updateEO.setSdt(""); // 设置工程接口人
}
updateEOList.add(updateEO);