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

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

Browse Source
This commit is contained in:
高嵩
2023-04-04 23:11:00 +08:00
parent c91e52d04f 9a7761d960
commit 5675ff6809
6 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+2 -2
View File
@@ -1219,7 +1219,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
String value = ""; String value = "";
boolean flag = true; boolean flag = true;
List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); // List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode());
//编号验证 //编号验证
verifySerialNumber(datas,authDummyInventoryInfoEOTemp); verifySerialNumber(datas,authDummyInventoryInfoEOTemp);
@@ -1309,7 +1309,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
} }
//责任领域 //责任领域
if(StringUtils.isNotBlank(dutyTerritory)){ if(StringUtils.isNotBlank(dutyTerritory)){
value = pullMore(dutyTerritoryDictItemList, authDummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory"); value = pullMore(dictItemList, authDummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field",DicCodeEnum.DUTY_TERRITORY.getCode());
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
authDummyInventoryInfoEO.setDutyTerritory(value); authDummyInventoryInfoEO.setDutyTerritory(value);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+6 -6
View File
@@ -5498,12 +5498,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut);
errorMsg += (String) resultMap.get("errorMsg"); errorMsg += (String) resultMap.get("errorMsg");
countError += (int) resultMap.get("countError"); countError += (int) resultMap.get("countError");
configDataEO.setPullData(value.split("#")[1]); configDataEO.setPullData(value.split("#")[0]);
resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut); resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut);
errorMsg += (String) resultMap.get("errorMsg"); errorMsg += (String) resultMap.get("errorMsg");
countError += (int) resultMap.get("countError"); countError += (int) resultMap.get("countError");
configDataEO.setTextData(value.split("#")[0]); configDataEO.setTextData(value.split("#")[1]);
} else if (value.split("#").length == 1 && value.endsWith("#")) { } else if (value.split("#").length == 1 && value.endsWith("#")) {
resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut);
@@ -5577,12 +5577,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut);
errorMsg += (String) resultMap.get("errorMsg"); errorMsg += (String) resultMap.get("errorMsg");
countError += (int) resultMap.get("countError"); countError += (int) resultMap.get("countError");
configDataEO.setPullData(value.split("#")[1]); configDataEO.setPullData(value.split("#")[0]);
resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut); resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut);
errorMsg += (String) resultMap.get("errorMsg"); errorMsg += (String) resultMap.get("errorMsg");
countError += (int) resultMap.get("countError"); countError += (int) resultMap.get("countError");
configDataEO.setTextData(value.split("#")[0]); configDataEO.setTextData(value.split("#")[1]);
} else if (value.split("#").length == 1 && value.endsWith("#")) { } else if (value.split("#").length == 1 && value.endsWith("#")) {
resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut);
errorMsg += (String) resultMap.get("errorMsg"); errorMsg += (String) resultMap.get("errorMsg");
@@ -5870,12 +5870,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut);
errorMsg += (String) resultMap.get("errorMsg"); errorMsg += (String) resultMap.get("errorMsg");
countError += (int) resultMap.get("countError"); countError += (int) resultMap.get("countError");
configDataEO.setPullData(value.split("#")[1]); configDataEO.setPullData(value.split("#")[0]);
resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut); resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), "1000", cut);
errorMsg += (String) resultMap.get("errorMsg"); errorMsg += (String) resultMap.get("errorMsg");
countError += (int) resultMap.get("countError"); countError += (int) resultMap.get("countError");
configDataEO.setTextData(value.split("#")[0]); configDataEO.setTextData(value.split("#")[1]);
if (!value.endsWith("#")) { //3 if (!value.endsWith("#")) { //3
resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[2], ParamsIsMustEnum.NO.getValue(), cut); resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[2], ParamsIsMustEnum.NO.getValue(), cut);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
+1
View File
@@ -83,6 +83,7 @@ public enum OperatorTypeEnum {
* 待办中心-将法规工程师的法规清单确认待办任务转为已办 * 待办中心-将法规工程师的法规清单确认待办任务转为已办
*/ */
TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE("待办中心，法规工程师待办任务转为已办","toDoCenterFgConvertToHaveDone"), TO_DO_CENTER_FG_CONVERT_TO_HAVE_DONE("待办中心，法规工程师待办任务转为已办","toDoCenterFgConvertToHaveDone"),
TO_DO_CENTER_QUERY_PROCESS_INFO_BY_LAWS_INVENTORY_ID_QDQR("待办中心-清单确认流程，根据法规清单id，查询流程表信息","toDoCenterQueryProcessInfoByLawsInventoryIdQdqr"),
; ;
String name; String name;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+7 -3
View File
@@ -598,12 +598,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
allList.addAll(certificationEngineerList); allList.addAll(certificationEngineerList);
} }
} }
allList = allList.stream().distinct().collect(Collectors.toList()); allList = allList.stream().filter(all -> {
return StringUtils.isNotBlank(all);
}).distinct().collect(Collectors.toList());
/*
for(String all : allList){ for(String all : allList){
if(all.equals("")){ if(all.equals("")){
allList.remove(all); allList.remove(all);
} }
} }
*/
//遍历所有人alllist中是否包含责任人,如果包含，不用操作。 //遍历所有人alllist中是否包含责任人,如果包含，不用操作。
//-------如果不包含,再去判断当前用户的角色是studio、法规还是认证 //-------如果不包含,再去判断当前用户的角色是studio、法规还是认证
for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
@@ -6967,7 +6971,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String value = ""; String value = "";
boolean flag = true; boolean flag = true;
List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); // List<SysDictItem> dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode());
List<String> userNameList = new ArrayList<>(); List<String> userNameList = new ArrayList<>();
String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(",")); String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(","));
@@ -7109,7 +7113,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//责任领域(多选必填) //责任领域(多选必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field"); flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field");
if(flag){ if(flag){
value = pullMore(dutyTerritoryDictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory"); value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field",DicCodeEnum.DUTY_TERRITORY.getCode());
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
//工程接口人(责任领域下的工程接口人) //工程接口人(责任领域下的工程接口人)
Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java
+6 -1
View File
@@ -128,7 +128,12 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl<ProcessInfoDetai
processInfoDetailEO = JSONObject.parseObject(JSONObject.toJSONString(processInfoDetail), ProcessInfoDetailEO.class); processInfoDetailEO = JSONObject.parseObject(JSONObject.toJSONString(processInfoDetail), ProcessInfoDetailEO.class);
// 当前流程 当前用户 的数据删掉 确保唯一。 // 当前流程 当前用户 的数据删掉 确保唯一。
QueryWrapper<ProcessInfoDetailEO> deleteWrapper = new QueryWrapper<>(); QueryWrapper<ProcessInfoDetailEO> deleteWrapper = new QueryWrapper<>();
deleteWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,processInfoDetailEO.getActiProcInstId()); if(StringUtils.isNotBlank(processInfoDetailEO.getActiProcInstId())){
deleteWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,processInfoDetailEO.getActiProcInstId());
}
if(StringUtils.isNotBlank(processInfoDetailEO.getProcessInfoId())){
deleteWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoDetailEO.getProcessInfoId());
}
deleteWrapper.lambda().eq(ProcessInfoDetailEO::getUserId,processInfoDetailEO.getUserId()); deleteWrapper.lambda().eq(ProcessInfoDetailEO::getUserId,processInfoDetailEO.getUserId());
deleteWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,processInfoDetailEO.getFlowType()); deleteWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,processInfoDetailEO.getFlowType());
this.baseMapper.delete(deleteWrapper); this.baseMapper.delete(deleteWrapper);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+11
View File
@@ -194,6 +194,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
}else if(StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE_STATUS.getValue())){ }else if(StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE_STATUS.getValue())){
ProcessInfoEO processInfo = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("processInfo")),ProcessInfoEO.class); ProcessInfoEO processInfo = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("processInfo")),ProcessInfoEO.class);
this.updateById(processInfo); this.updateById(processInfo);
}else if(StringUtils.equals(operatorType, OperatorTypeEnum.TO_DO_CENTER_QUERY_PROCESS_INFO_BY_LAWS_INVENTORY_ID_QDQR.getValue())){
String projectLawsInventoryId = jsonObject.getString("projectLawsInventoryId");
QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryId);
pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue());
List<ProcessInfoDetailEO> pidInfoList = this.processInfoDetailEOService.list(pidQueryWrap);
if(CollectionUtils.isNotEmpty(pidInfoList)){
ProcessInfoEO processInfoEO = this.queryById(pidInfoList.get(0).getProcessInfoId());
return Result.OK(processInfoEO);
}
} }
return new Result<>().success("调用成功！"); return new Result<>().success("调用成功！");
} }