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

认证-参数项收集-添加功能：调整责任领域

Browse Source
This commit is contained in:
liyawei
2022-08-05 10:21:05 +08:00
parent af80cd1c45
commit 331ecbd17b
3 changed files with 93 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+14
View File
@@ -530,6 +530,20 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
paramsCollectManifestEOService.exportAll(paramsCollectManifestVO, response, request);
}
/**
* 调整责任领域
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-调整责任领域")
@ApiOperation(value="参数项收集清单-调整责任领域", notes="参数项收集清单-调整责任领域")
@PostMapping(value = "/updateBatchDutyTerritory")
// @RequiresPermissions("params:collectManifest:bring")
public Result<List<String>> updateBatchDutyTerritory(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
List<String> msgList = paramsCollectManifestEOService.updateBatchDutyTerritory(paramsCollectManifestVO);
return Result.OK(msgList);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+3
View File
@@ -161,4 +161,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
// 全部导出
void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request);
// 调整责任领域
List<String> updateBatchDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+76 -5
View File
@@ -1532,7 +1532,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
}
return getMsgOfIssueCollection(msgMapList, cut);
return getMsgOfIssueCollection(msgMapList, cut, "1");
}
@Override
@@ -1665,10 +1665,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
}
return getMsgOfIssueCollection(msgMapList, cut);
return getMsgOfIssueCollection(msgMapList, cut, "1");
}
private List<String> getMsgOfIssueCollection(List<Map<String, String>> msgMapList, String cut) {
private List<String> getMsgOfIssueCollection(List<Map<String, String>> msgMapList, String cut, String operation) {
List<String> msgList = new ArrayList<>();
Map<String,String> collectManifestStateEnumMap = CollectManifestStateEnum.toMap(cut);
@@ -1698,9 +1698,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
if (CollectionUtil.isNotEmpty(msgMapList)) {
if (CutEnum.EN.getValue().equals(cut)) {
msgList.add("<span style='color: red'>Homologation Engineer can operate when data state is 'Wait Collect'、'Sdt Back' or 'Change'</span>");
if ("1".equals(operation)) {
msgList.add("<span style='color: red'>Homologation Engineer can operate when data state is 'Wait Collect','Sdt Back' or 'Change'.</span>");
} else if("2".equals(operation)) {
msgList.add("<span style='color: red'>Homologation Engineer can operate when data state is 'Wait Collect','Sdt Back'.</span>");
}
} else {
msgList.add("<span style='color: red'>认证工程师数据状态为 '待发起收集'、'工程接口人退回'或'变更' 时，才有权限操作此按钮。</span>");
if ("1".equals(operation)) {
msgList.add("<span style='color: red'>认证工程师数据状态为 '待发起收集'、'工程接口人退回'或'变更' 时，才有权限操作此按钮。</span>");
} else if("2".equals(operation)) {
msgList.add("<span style='color: red'>认证工程师数据状态为 '待发起收集'、'工程接口人退回 时，才有权限操作此按钮。</span>");
}
}
}
return msgList;
@@ -2228,6 +2236,69 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
}
@Override
public List<String> updateBatchDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
|| StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())
|| StringUtils.isEmpty(paramsCollectManifestVO.getDutyTerritory())) {
throw new JeroBootException("参数不能为空！");
}
List<String> paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestVO.getIds().split(","));
String dutyTerritory = paramsCollectManifestVO.getDutyTerritory();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String projectId = paramsCollectManifestVO.getProjectId();
String cut = paramsCollectManifestVO.getCut();
LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsCollectManifestEO::getId, paramsCollectManifestIdList);
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.selectList(queryWrapper);
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
List<Map<String, String>> msgMapList = new ArrayList<>();
paramsCollectManifestEOList.forEach(paramsCollectManifestEO -> {
if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())
|| CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())) {
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestEO.getId());
updateEO.setDutyTerritory(dutyTerritory);
// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, 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(""); // 设置工程接口人
}
updateEOList.add(updateEO);
} else {
Map<String, String> msgMap = new HashMap<>();
msgMap.put("nioNumber", paramsCollectManifestEO.getNioNumber());
msgMap.put("state", paramsCollectManifestEO.getState());
msgMap.put("type", "2");
msgMapList.add(msgMap);
}
});
// 修改责任领域及工程接口人
updateBatchById(updateEOList);
// 返回不符合参数项的提示信息
return getMsgOfIssueCollection(msgMapList, cut, "2");
}
private String[] getWorkbookTitleForExport(ParamsCollectManifestVO paramsCollectManifestVO) {
String cut = paramsCollectManifestVO.getCut();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();