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

法规清单流程-设计符合性流程对接。

Browse Source
This commit is contained in:
wangzhijiang
2023-03-21 10:11:14 +08:00
parent 6b8cadab4e
commit b0a9d359d3
4 changed files with 77 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java
+6 -1
View File
@@ -13,7 +13,12 @@ public enum ReviewResultEnum {
INCONFORMITY("不符合","Non-Compliance"),
TO_TRACK("待追踪","To be tracked"),
UNINVOLVED("不涉及","NA"),
TERMINATION_OF_TASK("任务终止","Termination of task")
TERMINATION_OF_TASK("任务终止","Termination of task"),
ACCEPTED("接受","Accepted"),
REJECTED("拒绝","Rejected"),
TRANSFER("转办","Transfer"),
RETURNED("退回","Returned"),
ADOPT("通过","Adopt"),
;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java
+10 -10
View File
@@ -7,12 +7,12 @@ import org.apache.commons.lang3.StringUtils;
* 待办中心-设计符合性流程节点key枚举类
*/
public enum DesignComplianceFlowNodeKeyEnum {
fqlc("发起流程","Initiate the process","fqlc"),
zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认
dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认
zrrtjjfw("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
dezrrtjjfw("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
fggcssh("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核
FQLC("发起流程","Initiate the process","fqlc"),
ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认
ZRRTJJFW("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核
;
String cnName;
@@ -51,12 +51,12 @@ public enum DesignComplianceFlowNodeKeyEnum {
public static String getTextByValue(String value,String cut) {
DesignComplianceFlowNodeKeyEnum[] values = values();
for (DesignComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) {
if (todoCenterStatusEnum.value.equals(value)) {
for (DesignComplianceFlowNodeKeyEnum designComplianceFlowNodeKeyEnum : values) {
if (designComplianceFlowNodeKeyEnum.value.equals(value)) {
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
return todoCenterStatusEnum.cnName;
return designComplianceFlowNodeKeyEnum.cnName;
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
return todoCenterStatusEnum.enName;
return designComplianceFlowNodeKeyEnum.enName;
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java
+10 -10
View File
@@ -7,12 +7,12 @@ import org.apache.commons.lang3.StringUtils;
* 待办中心-验证符合性流程节点key枚举类
*/
public enum VerifyComplianceFlowNodeKeyEnum {
fqlc("发起流程","Initiate the process","fqlc"),
zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认
dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认
zrrtjjfw("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
dezrrtjjfw("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
fggcssh("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核
FQLC("发起流程","Initiate the process","fqlc"),
ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认
ZRRTJJFW("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核
;
String cnName;
@@ -51,12 +51,12 @@ public enum VerifyComplianceFlowNodeKeyEnum {
public static String getTextByValue(String value,String cut) {
VerifyComplianceFlowNodeKeyEnum[] values = values();
for (VerifyComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) {
if (todoCenterStatusEnum.value.equals(value)) {
for (VerifyComplianceFlowNodeKeyEnum verifyComplianceFlowNodeKeyEnum : values) {
if (verifyComplianceFlowNodeKeyEnum.value.equals(value)) {
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
return todoCenterStatusEnum.cnName;
return verifyComplianceFlowNodeKeyEnum.cnName;
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
return todoCenterStatusEnum.enName;
return verifyComplianceFlowNodeKeyEnum.enName;
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+51 -1
View File
@@ -5,13 +5,20 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.project.enums.OperatorTypeEnum;
import com.jero.modules.project.enums.RequestSourceEnum;
import com.jero.modules.project.enums.ReviewResultEnum;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.todoCenter.entity.ProcessInfoEO;
import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum;
import com.jero.modules.todoCenter.enums.VerifyComplianceFlowNodeKeyEnum;
import com.jero.modules.todoCenter.service.IProcessInfoEOService;
import com.jero.modules.wkflow.entity.ProcessHistoryEO;
import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
import com.jero.modules.wkflow.enums.FlowTypeEnum;
import com.jero.modules.wkflow.mapper.ProcessHistoryEOMapper;
import com.jero.modules.wkflow.service.IProcessHistoryEOService;
import org.apache.commons.collections4.CollectionUtils;
@@ -38,6 +45,10 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
@Autowired
private ISysUserService sysUserService;
@Autowired
private IProcessInfoEOService processInfoEOService;
@Autowired
private IOSSFileService ossFileService;
/**
* 保存
@@ -141,6 +152,14 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
sysUserList = sysUserService.querySysUserListByIdList(userIdList);
}
List<String> actiProcInstIdList = datas.stream().map(ProcessHistoryEO::getActiProcInstId).distinct().collect(Collectors.toList());
QueryWrapper<ProcessInfoEO> processInfoEOQueryWrap = new QueryWrapper<>();
processInfoEOQueryWrap.lambda().in(ProcessInfoEO::getActiProcInstId,actiProcInstIdList);
List<ProcessInfoEO> processInfoList = this.processInfoEOService.list(processInfoEOQueryWrap);
String approvalFiles = datas.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.joining(","));
List<OSSFile> approvalFileList = this.ossFileService.getFileInfos(approvalFiles);
for (ProcessHistoryEO data : datas) {
if(StringUtils.isNotEmpty(data.getOperatorResult())){
data.setReviewResult(ReviewResultEnum.getTextByValue(data.getOperatorResult(),cut));
@@ -149,9 +168,40 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
SysUser userInfo = sysUserList.stream().filter(sysUser -> sysUser.getId().equals(data.getOperatorPersonId())).collect(Collectors.toList()).get(0);
data.setAssignee(userInfo.getUsername());
}
if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){
List<ProcessInfoEO> processInfoListTemp = processInfoList.stream().filter(processInfo -> {
boolean flag = false;
if (StringUtils.equals(processInfo.getActiProcInstId(), data.getActiProcInstId())) {
flag = true;
}
return flag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(processInfoListTemp)){
String flowType = processInfoListTemp.get(0).getFlowType();
if(StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())){
data.setName(DesignComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
}else if(StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())){
data.setName(VerifyComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
}else if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){
data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
}
}else if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){
data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
}
if(StringUtils.isNotEmpty(data.getApprovalFile())){
if(CollectionUtils.isNotEmpty(approvalFileList)){
String approvalFileNames = approvalFileList.stream().filter(file -> {
boolean flag = false;
if (StringUtils.contains(data.getApprovalFile(), file.getId())) {
flag = true;
}
return flag;
}).map(OSSFile::getFileName).collect(Collectors.joining(","));
data.setApprovalFileName(approvalFileNames);
}
}
}
}
}