认证清单-编辑、流程重置、发布、撤回增加修改历史。
This commit is contained in:
wangzhijiang
+11
-2
@@ -95,6 +95,9 @@ public class ProjectCertificationInventoryEO implements Serializable {
|
||||
/**责任领域名称**/
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryName;
|
||||
/**责任领域名称-英文**/
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryNameEn;
|
||||
|
||||
/**交付物*/
|
||||
@Excel(name = "交付物", width = 15)
|
||||
@@ -126,14 +129,20 @@ public class ProjectCertificationInventoryEO implements Serializable {
|
||||
@Excel(name = "交付物类型", width = 15)
|
||||
@ApiModelProperty(value = "交付物类型")
|
||||
private java.lang.String deliverableType;
|
||||
@TableField(exist = false)
|
||||
// 交付物类型名称
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeName;
|
||||
// 交付物类型名称-英文
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeNameEn;
|
||||
|
||||
/**交付物模板*/
|
||||
@Excel(name = "交付物模板", width = 15)
|
||||
@ApiModelProperty(value = "交付物模板")
|
||||
private java.lang.String deliverableTemplate;
|
||||
/**交付物模板名称**/
|
||||
@TableField(exist = false)
|
||||
private String deliverableTemplateName;
|
||||
|
||||
/**交付结果*/
|
||||
@Excel(name = "交付结果", width = 15)
|
||||
@@ -151,8 +160,8 @@ public class ProjectCertificationInventoryEO implements Serializable {
|
||||
@Excel(name = "流程状态", width = 15)
|
||||
@ApiModelProperty(value = "流程状态")
|
||||
private java.lang.String flowStatus;
|
||||
@TableField(exist = false)
|
||||
// 流程状态展示名称
|
||||
@TableField(exist = false)
|
||||
private String flowStatusName;
|
||||
|
||||
/**报告编号*/
|
||||
|
||||
+1
@@ -58,6 +58,7 @@ public enum OperatorTypeEnum {
|
||||
CERTIFICATION_INVENTORY_EDIT("认证清单-编辑","certificationInventoryEdit"),
|
||||
CERTIFICATION_INVENTORY_ADD("认证清单-添加","certificationInventoryAdd"),
|
||||
CERTIFICATION_INVENTORY_CALL("认证清单-调取","certificationInventoryCall"),
|
||||
CERTIFICATION_INVENTORY_STUDIO_ISSUE("认证清单-studio发布","certificationInventoryStudioIssue"),
|
||||
;
|
||||
|
||||
String name;
|
||||
|
||||
+137
-28
@@ -17,6 +17,8 @@ import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
|
||||
import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
|
||||
import com.jero.modules.feishu.enums.TemplateInfoEnum2;
|
||||
import com.jero.modules.feishu.service.IFeishuService;
|
||||
import com.jero.modules.oss.entity.OSSFile;
|
||||
import com.jero.modules.oss.service.IOSSFileService;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
|
||||
import com.jero.modules.project.entity.ProjectLibraryBase;
|
||||
@@ -110,6 +112,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService;
|
||||
@Autowired
|
||||
private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
|
||||
@Autowired
|
||||
private IOSSFileService ossFileService;
|
||||
|
||||
|
||||
@Value(value = "${jero.backUrl}")
|
||||
@@ -142,8 +146,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
List<ProjectCertificationInventoryEO> editBeforeList = new ArrayList<>();
|
||||
ProjectCertificationInventoryEO editBefore = this.queryById(projectCertificationInventoryEO.getId());
|
||||
editBeforeList.add(editBefore);
|
||||
this.disposeData(editBeforeList,CutEnum.CN.getValue());
|
||||
List<ProjectCertificationInventoryEO> editAfterList = new ArrayList<>();
|
||||
editAfterList.add(projectCertificationInventoryEO);
|
||||
this.disposeData(editAfterList,CutEnum.CN.getValue());
|
||||
this.setEditProjectCertificationInventoryLogEO(editBeforeList,editAfterList);
|
||||
|
||||
Date now = new Date();
|
||||
@@ -182,102 +188,153 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
if(!StringUtils.equals(editBeforeById.getSerialNumber(),editAfter.getSerialNumber())){
|
||||
contentCnSb.append("\"").append("法规编号").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getSerialNumber()).append(" 修改为 ").append(editAfter.getSerialNumber()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getSerialNumber()) ? editBeforeById.getSerialNumber() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getSerialNumber()) ? editAfter.getSerialNumber() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Regulation No").append("\"");
|
||||
contentEnSb.append(editBeforeById.getSerialNumber()).append(" to ").append(editAfter.getSerialNumber()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getSerialNumber()) ? editBeforeById.getSerialNumber() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getSerialNumber()) ? editAfter.getSerialNumber() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getWvtaId(),editAfter.getWvtaId())){
|
||||
contentCnSb.append("\"").append("WVTA ID").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getWvtaId()).append(" 修改为 ").append(editAfter.getWvtaId()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getWvtaId()) ? editBeforeById.getWvtaId() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getWvtaId()) ? editAfter.getWvtaId() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("WVTA ID").append("\"");
|
||||
contentEnSb.append(editBeforeById.getWvtaId()).append(" to ").append(editAfter.getWvtaId()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getWvtaId()) ? editBeforeById.getWvtaId() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getWvtaId()) ? editAfter.getWvtaId() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getCategory(),editAfter.getCategory())){
|
||||
contentCnSb.append("\"").append("类别").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getCategory()).append(" 修改为 ").append(editAfter.getCategory()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getCategory()) ? editBeforeById.getCategory() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getCategory()) ? editAfter.getCategory() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Category").append("\"");
|
||||
contentEnSb.append(editBeforeById.getCategory()).append(" to ").append(editAfter.getCategory()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getCategory()) ? editBeforeById.getCategory() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getCategory()) ? editAfter.getCategory() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getInspectionItem(),editAfter.getInspectionItem())){
|
||||
contentCnSb.append("\"").append("检验项目").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getInspectionItem()).append(" 修改为 ").append(editAfter.getInspectionItem()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getInspectionItem()) ? editBeforeById.getInspectionItem() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getInspectionItem()) ? editAfter.getInspectionItem() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Inspection Items").append("\"");
|
||||
contentEnSb.append(editBeforeById.getInspectionItem()).append(" to ").append(editAfter.getInspectionItem()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getInspectionItem()) ? editBeforeById.getInspectionItem() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getInspectionItem()) ? editAfter.getInspectionItem() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getConfigItem(),editAfter.getConfigItem())){
|
||||
contentCnSb.append("\"").append("配置项").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getConfigItem()).append(" 修改为 ").append(editAfter.getConfigItem()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getConfigItem()) ? editBeforeById.getConfigItem() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getConfigItem()) ? editAfter.getConfigItem() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Configuration Item").append("\"");
|
||||
contentEnSb.append(editBeforeById.getConfigItem()).append(" to ").append(editAfter.getConfigItem()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getConfigItem()) ? editBeforeById.getConfigItem() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getConfigItem()) ? editAfter.getConfigItem() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getDutyTerritory(),editAfter.getDutyTerritory())){
|
||||
contentCnSb.append("\"").append("责任领域").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getDutyTerritory()).append(" 修改为 ").append(editAfter.getDutyTerritory()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getDutyTerritoryName()) ? editBeforeById.getDutyTerritoryName() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getDutyTerritoryName()) ? editAfter.getDutyTerritoryName() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Responsible Field").append("\"");
|
||||
contentEnSb.append(editBeforeById.getDutyTerritory()).append(" to ").append(editAfter.getDutyTerritory()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getDutyTerritoryNameEn()) ? editBeforeById.getDutyTerritoryNameEn() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getDutyTerritoryNameEn()) ? editAfter.getDutyTerritoryNameEn() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getDeliverableType(),editAfter.getDeliverableType())){
|
||||
contentCnSb.append("\"").append("交付物类型").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getDeliverableType()).append(" 修改为 ").append(editAfter.getDeliverableType()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getDeliverableTypeName()) ? editBeforeById.getDeliverableTypeName() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getDeliverableTypeName()) ? editAfter.getDeliverableTypeName() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Deliverable Type").append("\"");
|
||||
contentEnSb.append(editBeforeById.getDeliverableType()).append(" to ").append(editAfter.getDeliverableType()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getDeliverableTypeNameEn()) ? editBeforeById.getDeliverableTypeNameEn() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getDeliverableTypeNameEn()) ? editAfter.getDeliverableTypeNameEn() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getDeliverableTemplate(),editAfter.getDeliverableTemplate())){
|
||||
if(!StringUtils.equals(editBeforeById.getDeliverableTemplateName(),editAfter.getDeliverableTemplateName())){
|
||||
contentCnSb.append("\"").append("交付物模板").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getDeliverableTemplate()).append(" 修改为 ").append(editAfter.getDeliverableTemplate()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getDeliverableTemplateName()) ? editBeforeById.getDeliverableTemplateName() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getDeliverableTemplateName()) ? editAfter.getDeliverableTemplateName() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Deliverable Template").append("\"");
|
||||
contentEnSb.append(editBeforeById.getDeliverableTemplate()).append(" to ").append(editAfter.getDeliverableTemplate()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getDeliverableTemplateName()) ? editBeforeById.getDeliverableTemplateName() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getDeliverableTemplateName()) ? editAfter.getDeliverableTemplateName() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getSdt(),editAfter.getSdt())){
|
||||
if(!StringUtils.equals(editBeforeById.getSdtName(),editAfter.getSdtName())){
|
||||
contentCnSb.append("\"").append("工程接口人").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getSdt()).append(" 修改为 ").append(editAfter.getSdt()).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeById.getSdtName()) ? editBeforeById.getSdtName() : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfter.getSdtName()) ? editAfter.getSdtName() : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Eng. Interface").append("\"");
|
||||
contentEnSb.append(editBeforeById.getSdt()).append(" to ").append(editAfter.getSdt()).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeById.getSdtName()) ? editBeforeById.getSdtName() : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfter.getSdtName()) ? editAfter.getSdtName() : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
String editBeforeEndTime = DateUtils.formatDate(editBeforeById.getEndTime());
|
||||
String editAfterEndTime = DateUtils.formatDate(editAfter.getEndTime());
|
||||
String editBeforeEndTime = "";
|
||||
if(editBeforeById.getEndTime() != null){
|
||||
editBeforeEndTime = DateUtils.formatDate(editBeforeById.getEndTime());
|
||||
}
|
||||
String editAfterEndTime = "";
|
||||
if(editAfter.getEndTime() != null){
|
||||
editAfterEndTime = DateUtils.formatDate(editAfter.getEndTime());
|
||||
}
|
||||
|
||||
if(!StringUtils.equals(editBeforeEndTime,editAfterEndTime)){
|
||||
contentCnSb.append("\"").append("截止时间").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeEndTime).append(" 修改为 ").append(editAfterEndTime).append("，");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editBeforeEndTime) ? editBeforeEndTime : "空");
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(StringUtils.isNotEmpty(editAfterEndTime) ? editAfterEndTime : "空").append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Due Date").append("\"");
|
||||
contentEnSb.append(editBeforeEndTime).append(" to ").append(editAfterEndTime).append("，");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editBeforeEndTime) ? editBeforeEndTime : "null");
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(StringUtils.isNotEmpty(editAfterEndTime) ? editAfterEndTime : "null").append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
if(!StringUtils.equals(editBeforeById.getDutyPerson(),editAfter.getDutyPerson())){
|
||||
if(!StringUtils.equals(editBeforeById.getDutyPersonName(),editAfter.getDutyPersonName())){
|
||||
contentCnSb.append("\"").append("责任人").append("\"");
|
||||
contentCnSb.append("由 ");
|
||||
contentCnSb.append(editBeforeById.getDutyPerson()).append(" 修改为 ").append(editAfter.getDutyPerson()).append("，");
|
||||
contentCnSb.append(editBeforeById.getDutyPersonName());
|
||||
contentCnSb.append(" 修改为 ");
|
||||
contentCnSb.append(editAfter.getDutyPersonName()).append("，");
|
||||
|
||||
contentEnSb.append("\"").append("Assignee").append("\"");
|
||||
contentEnSb.append(editBeforeById.getDutyPerson()).append(" to ").append(editAfter.getDutyPerson()).append("，");
|
||||
contentEnSb.append(editBeforeById.getDutyPersonName());
|
||||
contentEnSb.append(" to ");
|
||||
contentEnSb.append(editAfter.getDutyPersonName()).append("，");
|
||||
saveFlag = true;
|
||||
}
|
||||
|
||||
@@ -488,10 +545,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
if(StringUtils.isNotEmpty(data.getDeliverableType())){
|
||||
String deliverableTypeName = this.getTreeName(cut, categoryList, Arrays.asList(data.getDeliverableType().split(",")));
|
||||
data.setDeliverableTypeName(deliverableTypeName);
|
||||
|
||||
String deliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(data.getDeliverableType().split(",")));
|
||||
data.setDeliverableTypeNameEn(deliverableTypeNameEn);
|
||||
}
|
||||
if(StringUtils.isNotEmpty(data.getDutyTerritory())){
|
||||
String dutyTerritoryName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
|
||||
data.setDutyTerritoryName(dutyTerritoryName);
|
||||
|
||||
String dutyTerritoryNameEn = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),CutEnum.EN.getValue(), ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
|
||||
data.setDutyTerritoryNameEn(dutyTerritoryNameEn);
|
||||
}
|
||||
if(StringUtils.isNotEmpty(data.getCertificationProgress())){
|
||||
String certificationProgress_dictText = "";
|
||||
@@ -507,6 +570,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
}
|
||||
data.setCertificationProgress_dictText(certificationProgress_dictText);
|
||||
}
|
||||
if(StringUtils.isNotEmpty(data.getDeliverableTemplate())){
|
||||
List<OSSFile> deliverableTemplateFileInfos = this.ossFileService.getFileInfos(data.getDeliverableTemplate());
|
||||
if(CollectionUtils.isNotEmpty(deliverableTemplateFileInfos)){
|
||||
String deliverableTemplateNames = deliverableTemplateFileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
|
||||
data.setDeliverableTemplateName(deliverableTemplateNames);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -566,12 +636,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
|
||||
List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
|
||||
|
||||
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
|
||||
// 将数据的状态更新为：清单待校核，更新截止时间。等待认证工程师进行操作。
|
||||
projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
|
||||
// projectCertificationInventoryEO.setEndTime(DateUtils.str2Date(endTime,DateUtils.date_sdf.get()));
|
||||
|
||||
String contentCn = "\"" + currentUser.getUsername() + "\"" +"发布了认证清单";
|
||||
String contentEn = "\"" + currentUser.getUsername() + "\"" +" publishes the authentication list";
|
||||
ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
|
||||
projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
|
||||
projectCertificationInventoryLogEO.setContentCn(contentCn);
|
||||
projectCertificationInventoryLogEO.setContentEn(contentEn);
|
||||
projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue());
|
||||
projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
|
||||
}
|
||||
|
||||
if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
|
||||
this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
|
||||
}
|
||||
|
||||
String projectLibraryId = json.getString("projectLibraryId");
|
||||
@@ -1552,6 +1638,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
}
|
||||
|
||||
List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
|
||||
List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
|
||||
String certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(","));
|
||||
|
||||
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
|
||||
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
|
||||
|
||||
@@ -1599,6 +1688,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
|
||||
this.processInfoDetailEOService.remove(detailRemoveWrap);
|
||||
|
||||
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
List<ProjectCertificationInventoryLogEO> projectCertificationInventoryLogEOList = new ArrayList<>();
|
||||
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
|
||||
// 把交付结果、截止日期清空，流程状态 设置为 清单待发布
|
||||
LambdaUpdateWrapper<ProjectCertificationInventoryEO> updateWrap = new LambdaUpdateWrapper<>();
|
||||
@@ -1607,10 +1698,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
||||
updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
|
||||
updateWrap.eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
|
||||
this.update(updateWrap);
|
||||
|
||||
String contentCn = "";
|
||||
String contentEn = "";
|
||||
if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
|
||||
contentCn = "\"" + currentUser.getUsername() + "\"" +"从"+"\""+certificationEngineerUserNames + "\""+"撤回了流程";
|
||||
contentEn = "\"" + currentUser.getUsername() + "\"" + " retracts the process from " +"\""+certificationEngineerUserNames + "\"";
|
||||
}else if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
|
||||
contentCn = "\"" + currentUser.getUsername() + "\"" + " 操作了流程重置功能";
|
||||
contentEn = "\"" + currentUser.getUsername() + "\"" + " enables the process reset function";
|
||||
}
|
||||
ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO();
|
||||
projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId());
|
||||
projectCertificationInventoryLogEO.setContentCn(contentCn);
|
||||
projectCertificationInventoryLogEO.setContentEn(contentEn);
|
||||
projectCertificationInventoryLogEO.setOperatorType(operatorType);
|
||||
projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO);
|
||||
}
|
||||
if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){
|
||||
this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList);
|
||||
}
|
||||
|
||||
try {
|
||||
List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
|
||||
if(CollectionUtils.isNotEmpty(certificationEngineerList)){
|
||||
for (String certificationEngineerId : certificationEngineerIdList) {
|
||||
String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId);
|
||||
|
||||
Reference in New Issue
Block a user