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

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

Browse Source
This commit is contained in:
zhn
2022-08-24 20:06:47 +08:00
parent 9a8508951a 431c007110
commit 317f8cf2f2
12 changed files with 1002 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
+13 -1
View File
@@ -54,6 +54,18 @@ ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`
ALTER TABLE `project_laws_inventory_log`
MODIFY COLUMN `log_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'log内容' AFTER `project_library_id`;
-- 2022-08-04 修改字段类型 生产环境已同步
-- 2022-08-04 修改字段长度 生产环境已同步
ALTER TABLE `dummy_inventory_info`
MODIFY COLUMN `subtitle` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子标题' AFTER `wvta_id`;
-- 2022-08-22 修改字段长度 生产环境未同步
ALTER TABLE `project_laws_inventory`
MODIFY COLUMN `subtitle` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子标题' AFTER `title`;
-- 2022-08-22 修改字段长度 生产环境未同步
ALTER TABLE `dummy_inventory_info`
MODIFY COLUMN `serial_number` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号' AFTER `sys_org_code`;
-- 2022-08-22 修改字段长度 生产环境未同步
ALTER TABLE `project_laws_inventory`
MODIFY COLUMN `serial_number` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号' AFTER `project_library_id`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
this.batchInsertProblemKnowledgeBaseUserEO(problemKnowledgeBaseEO);
}else {
//如果展示权限是公开，则把该数据插入到搜索中心中。
//this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
}
// this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+344 -95
View File
@@ -236,11 +236,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
LambdaQueryWrapper<DummyInventoryInfoEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,projectLawsInventoryEO.getDummyInventoryBaseId());
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = dummyInventoryInfoEOService.list(lambdaQueryWrapper);
List<DummyInventoryInfoEO> dummyInventoryInfoEOListNew = new ArrayList<>();
if(dummyInventoryInfoEOList.size() != 0){
List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
if(projectLawsInventoryEOList.size() ==0){
//此时法规清单中没有数据,直接将维护清单中的数据添加即可
//责任领域如果有多个,则需要拆分成多条
for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
String dutyTerritory = dummyInventoryInfoEO.getDutyTerritory();
if(StringUtils.isNotBlank(dutyTerritory)){
for (String dutyTerritoryOne : dutyTerritory.split(",")) {
DummyInventoryInfoEO dummyInventoryInfoEONew = new DummyInventoryInfoEO();
BeanUtils.copyProperties(dummyInventoryInfoEO,dummyInventoryInfoEONew);
dummyInventoryInfoEONew.setDutyTerritory(dutyTerritoryOne);
dummyInventoryInfoEOListNew.add(dummyInventoryInfoEONew);
}
}else{
dummyInventoryInfoEOListNew.add(dummyInventoryInfoEO);
}
}
//此时法规清单中没有数据,直接将维护清单中的数据添加即可
for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp);
@@ -253,7 +269,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}else{
//此时法规清单中有数据,再添加虚拟清单数据时,如果法规清单中已有要填加的虚拟清单数据,则数据以法规清单为准
List<ProjectLawsInventoryEO> projectLawsInventoryEOListTemp = new ArrayList<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
List<ProjectLawsInventoryEO> collect = projectLawsInventoryEOList.stream()
.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList());
if(collect.size() != 0){
@@ -426,7 +442,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, String> infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy);
//设置更新log
setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
// setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
//验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程
@@ -1737,6 +1753,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
inventoryAffirmStatusList.add(InventoryAffirmStatusEnum.REJECTED.getValue());
queryWrapper.lambda().in(ProjectLawsInventoryEO::getInventoryAffirmStatus,inventoryAffirmStatusList);*/
String ids = (String) params.get("ids");
if(StringUtils.isNotEmpty(ids)){
List<String> projectLawsInventoryIdList = Arrays.asList(ids.split(","));
queryWrapper.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList);
}
queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
//查询当前项目下，清单状态为 未发起、拒绝状态的法规清单。
List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper);
@@ -1751,7 +1774,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
//法规清单的责任领域
String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
/*String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
if(StringUtils.isNotBlank(dutyTerritory)){
List<ProjectRelatedPersonnel> projectRelatedPersonnelList = new ArrayList<>();
for (String s : dutyTerritory.split(",")) {
@@ -1828,102 +1851,185 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
}
}
}*/
for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
if(StringUtils.equals(projectRelatedPersonnel.getDutyTerritory(),projectLawsInventoryEO.getDutyTerritory())){
// //法规工程师
// if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
// String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
// if(StringUtils.isNotEmpty(userId)){
// projectLawsInventoryEO.setRegulationOwnerId(userId);
// }
// }
//
// //认证工程师
// if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
// String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
// if(StringUtils.isNotEmpty(userId)){
// projectLawsInventoryEO.setHomologationEngineerId(userId);
// }
// }
//
// //项目接口人
// if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
// String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel,studioEngineer);
// if(StringUtils.isNotEmpty(userId)){
// projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
// }
// }
String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
if(StringUtils.isNotEmpty(dutyTerritory)){
List<ProjectRelatedPersonnel> projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> {
boolean flag = false;
for (String duty : dutyTerritory.split(",")) {
if(StringUtils.equals(duty,relatedPersonnel.getDutyTerritory())){
flag = true;
}
}
return flag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(projectRelatedPersonnelTempList)){
LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
//法规工程师
if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setRegulationOwnerId(userId);
}
}else {
String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getRegulationOwnerId());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setRegulationOwnerId(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerId,null);
}
}
//认证工程师
if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setHomologationEngineerId(userId);
}
}else {
String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getHomologationEngineerId());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setHomologationEngineerId(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerId,null);
}
}
//项目接口人
if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
}
}else {
String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getEngineeringInterfacePerson());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getEngineeringInterfacePerson,null);
}
}
//设计符合性确认
//发起人角色
if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
String designInitiator = projectLawsInventoryEO.getDesignInitiator();
if(StringUtils.isNotEmpty(designInitiator)){
String userId = ToGetAUserId(designInitiator, projectRelatedPersonnel,studioEngineer);
String designInitiator = projectLawsInventoryEO.getDesignInitiator();
if(StringUtils.isNotEmpty(designInitiator)){
if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setDesignInitiatorId(userId);
}
}
}
//责任人角色
if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignDutyId())){
String designDuty = projectLawsInventoryEO.getDesignDuty();
if(StringUtils.isNotEmpty(designDuty)){
String userId = ToGetAUserId(designDuty, projectRelatedPersonnel,studioEngineer);
}else {
String userId = ToGetAUserId(designInitiator, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getDesignInitiatorId());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setDesignDutyId(userId);
projectLawsInventoryEO.setDesignInitiatorId(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getDesignInitiatorId,null);
}
}
}
//prehomo确认
//发起人角色
if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator();
if(StringUtils.isNotEmpty(prehomoInitiator)){
String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnel,studioEngineer);
//责任人角色
String designDuty = projectLawsInventoryEO.getDesignDuty();
if(StringUtils.isNotEmpty(designDuty)){
if(StringUtils.isEmpty(projectLawsInventoryEO.getDesignDutyId())){
String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setPrehomoInitiatorId(userId);
projectLawsInventoryEO.setDesignDutyId(userId);
}
}else {
String userId = ToGetAUserId(designDuty, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getDesignDutyId());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setDesignDutyId(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getDesignDutyId,null);
}
}
}
if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
//责任人角色
String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty();
if(StringUtils.isNotEmpty(prehomoDuty)){
String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnel,studioEngineer);
//prehomo确认
//发起人角色
String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator();
if(StringUtils.isNotEmpty(prehomoInitiator)){
if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setPrehomoInitiatorId(userId);
}
}else {
String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getPrehomoInitiatorId());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setPrehomoInitiatorId(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoInitiatorId,null);
}
}
}
//责任人角色
String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty();
if(StringUtils.isNotEmpty(prehomoDuty)){
if(StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setPrehomoDutyId(userId);
}
}else {
String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getPrehomoDutyId());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setPrehomoDutyId(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDutyId,null);
}
}
}
//验证符合性确认
if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
//发起人角色
String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator();
if(StringUtils.isNotEmpty(verifyInitiator)){
String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnel,studioEngineer);
//发起人角色
String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator();
if(StringUtils.isNotEmpty(verifyInitiator)){
if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setVerifyInitiatorId(userId);
}
}
}
if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyDutyId())){
//责任人角色
String verifyDuty = projectLawsInventoryEO.getVerifyDuty();
if(StringUtils.isNotEmpty(verifyDuty)){
String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnel,studioEngineer);
}else {
String userId = ToGetAUserId(verifyInitiator, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getVerifyInitiatorId());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setVerifyDutyId(userId);
projectLawsInventoryEO.setVerifyInitiatorId(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getVerifyInitiatorId,null);
}
}
}
//责任人角色
String verifyDuty = projectLawsInventoryEO.getVerifyDuty();
if(StringUtils.isNotEmpty(verifyDuty)){
if(StringUtils.isEmpty(projectLawsInventoryEO.getVerifyDutyId())){
String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnelTempList,studioEngineer);
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setVerifyDutyId(userId);
}
}else {
String userId = ToGetAUserId(verifyDuty, projectRelatedPersonnelTempList,studioEngineer,projectLawsInventoryEO.getVerifyDutyId());
if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setVerifyDutyId(userId);
}else {
updateWrapper.set(ProjectLawsInventoryEO::getVerifyDutyId,null);
}
}
}
updateWrapper.eq(ProjectLawsInventoryEO::getId,projectLawsInventoryEO.getId());
super.update(projectLawsInventoryEO, updateWrapper);
}
}
this.baseMapper.updateById(projectLawsInventoryEO);
//this.baseMapper.updateById(projectLawsInventoryEO);
}
}else {
throw new JeroBootException("当前项目中，未找到相关维护人员信息");
@@ -1946,14 +2052,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
/**
* 获取一个用户的id
* @param roleCode
* @param projectRelatedPersonnel
* @param projectRelatedPersonnelList
* @return
*/
public String ToGetAUserId(String roleCode,ProjectRelatedPersonnel projectRelatedPersonnel,String studioEngineer){
public String ToGetAUserId(String roleCode,List<ProjectRelatedPersonnel> projectRelatedPersonnelList,String studioEngineer){
String resultUserId = "";
//法规工程师
if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
String lawEngineer = projectRelatedPersonnel.getLawEngineer();
String lawEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
boolean flag = false;
if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
flag = true;
}
return flag;
}).map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(lawEngineer)){
String[] lawEngineerArr = lawEngineer.split(",");
if(lawEngineerArr.length == 1){
@@ -1963,7 +2075,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//认证工程师
if(StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
String certificationEngineer = projectRelatedPersonnel.getCertificationEngineer();
String certificationEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
boolean flag = false;
if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
flag = true;
}
return flag;
}).map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(certificationEngineer)){
String[] certificationEngineerArr = certificationEngineer.split(",");
if(certificationEngineerArr.length == 1){
@@ -1973,7 +2091,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//工程接口人
if(StringUtils.equals(roleCode,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())){
String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePerson();
String engineeringInterfacePerson = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
boolean flag = false;
if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
flag = true;
}
return flag;
}).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineeringInterfacePerson)){
String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(",");
if(engineeringInterfacePersonArr.length == 1){
@@ -2485,14 +2609,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
this.saveBatch(projectLawsInventoryEOList);
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
String contentLog = username+"复制了“"+serialNumber+"”";
String enContentLog = username+" copied “"+serialNumber+"”";
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String username = sysUser.getUsername();
// String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
// String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
// String contentLog = username+"复制了“"+serialNumber+"”";
// String enContentLog = username+" copied “"+serialNumber+"”";
// projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
// projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
}
@@ -2557,10 +2681,53 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){
projectLawsInventoryEOTemp.setVerifyDueDate(projectLawsInventoryEO.getVerifyDueDate());
}
//================================批量设置人员===================================================
//法规工程师id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){
projectLawsInventoryEOTemp.setRegulationOwnerId(projectLawsInventoryEO.getRegulationOwnerId());
}
//认证工程师id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){
projectLawsInventoryEOTemp.setHomologationEngineerId(projectLawsInventoryEO.getHomologationEngineerId());
}
//工程接口人id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())){
projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLawsInventoryEO.getEngineeringInterfacePerson());
}
//设计符合性流程发起人id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){
projectLawsInventoryEOTemp.setDesignInitiatorId(projectLawsInventoryEO.getDesignInitiatorId());
}
//设计符合性流程责任人id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){
projectLawsInventoryEOTemp.setDesignDutyId(projectLawsInventoryEO.getDesignDutyId());
}
//Pre-homo确认流程发起人id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){
projectLawsInventoryEOTemp.setPrehomoInitiatorId(projectLawsInventoryEO.getPrehomoInitiatorId());
}
//Pre-homo确认责任人id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
projectLawsInventoryEOTemp.setPrehomoDutyId(projectLawsInventoryEO.getPrehomoDutyId());
}
//验证符合性流程发起人id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){
projectLawsInventoryEOTemp.setVerifyInitiatorId(projectLawsInventoryEO.getVerifyInitiatorId());
}
//验证符合性流程责任人id
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){
projectLawsInventoryEOTemp.setVerifyDutyId(projectLawsInventoryEO.getVerifyDutyId());
}
projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
}
this.updateBatchById(projectLawsInventoryEOList);
projectLawsInventoryEOList.forEach(projectLawsInventory -> {
//更新三个符合性流程中的处理人。
this.updateFlowInfo(projectLawsInventory);
});
// for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) {
// LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
// updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId());
@@ -2716,15 +2883,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String enContentIndexStart = enContentLog.substring(0,enContentLog.indexOf("“"));
String enContent= enContentLog.substring(enContentIndexStart.length()+1,enContentLog.length());
if(StringUtils.isNotBlank(content)){
contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
}
// if(StringUtils.isNotBlank(content)){
// contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
// projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
// }
if(StringUtils.isNotBlank(enContent)){
enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
}
// if(StringUtils.isNotBlank(enContent)){
// enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
// projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
// }
}
}
@@ -4248,9 +4415,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null);
updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag,null);
updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag,null);
updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
//updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
//updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate,null);
updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate,null);
super.update(projectLawsInventoryEO, updateWrapper);
@@ -4429,12 +4596,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//子标题
if(StringUtils.isNotBlank(subtitle)){
if(subtitle.length() > 100){
if(subtitle.length() > 300){
String message = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
message = errorMsg + "子标题不能超过100个字符, ";
message = errorMsg + "子标题不能超过300个字符, ";
}else{
message = errorMsg + " Subheadings cannot be checked more than 100 characters, ";
message = errorMsg + " Subheadings cannot be checked more than 300 characters, ";
}
msgList.add(message);
}
@@ -7062,4 +7229,86 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
return sysRoles;
}
/**
* 获取一个用户的id
* 例如：如果法规工程师不是空，判断当前这个法规工程师，是否在这个责任领域的数组里，
* 1、如果在的话，不用管他；
* 2、如果只有一个人，则把这个用户设置进来；
* 3、如果不在，判断这个责任领域下是否有多个法规工程师，如果是，则把这个法规工程师设置为空；
*
* @param roleCode 角色编码
* @param projectRelatedPersonnelList 相关人员对象数组
* @param studioEngineer studioCode
* @param engineersId 现有的工程师id
* @return
*/
public String ToGetAUserId(String roleCode,List<ProjectRelatedPersonnel> projectRelatedPersonnelList,String studioEngineer,String engineersId){
String resultUserId = "";
//法规工程师
if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
String lawEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
boolean flag = false;
if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
flag = true;
}
return flag;
}).map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(lawEngineer)){
if(!StringUtils.contains(lawEngineer,engineersId)){
String[] lawEngineerArr = lawEngineer.split(",");
if(lawEngineerArr.length == 1){
resultUserId = lawEngineer;
}
}else {
resultUserId = engineersId;
}
}
}
//认证工程师
if(StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
String certificationEngineer = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
boolean flag = false;
if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
flag = true;
}
return flag;
}).map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(certificationEngineer)){
if(!StringUtils.contains(certificationEngineer,engineersId)){
String[] certificationEngineerArr = certificationEngineer.split(",");
if(certificationEngineerArr.length == 1){
resultUserId = certificationEngineer;
}
}else {
resultUserId = engineersId;
}
}
}
//工程接口人
if(StringUtils.equals(roleCode,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue())){
String engineeringInterfacePerson = projectRelatedPersonnelList.stream().filter(relatedPersonnel -> {
boolean flag = false;
if(StringUtils.isNotEmpty(relatedPersonnel.getLawEngineer())){
flag = true;
}
return flag;
}).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineeringInterfacePerson)){
if(!StringUtils.contains(engineeringInterfacePerson,engineersId)){
String[] engineeringInterfacePersonArr = engineeringInterfacePerson.split(",");
if(engineeringInterfacePersonArr.length == 1){
resultUserId = engineeringInterfacePerson;
}
}else {
resultUserId = engineersId;
}
}
}
//studio
if(StringUtils.equals(roleCode,ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
resultUserId = studioEngineer;
}
return resultUserId;
}
}