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

Merge branch 'dev_20230516_LCCZ'

Browse Source 
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
高嵩
2023-05-23 11:16:34 +08:00
parent 38e6da04dc 24beda9393
commit db320f464e
18 changed files with 767 additions and 50 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/OperatorTypeEnum.java
+3
View File
@@ -90,6 +90,9 @@ public enum OperatorTypeEnum {
LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE("法规清单-验证-引用交付物","lawsInventoryVerifyCiteDeliverable"),
LAWS_INVENTORY_STUDIO_COPY("法规清单-studio复制","lawsInventoryStudioCopy"),
LAWS_INVENTORY_REGULATION_OWNER_COPY("法规清单-法规工程师复制","lawsInventoryRegulationOwnerCopy"),
LAWS_INVENTORY_ALL_RESET_FLOW("法规清单-设计和验证-重置流程","lawsInventoryAllResetFlow"),
LAWS_INVENTORY_DESIGN_RESET_FLOW("法规清单-设计-重置流程","lawsInventoryDesignResetFlow"),
LAWS_INVENTORY_VERIFY_RESET_FLOW("法规清单-验证-重置流程","lawsInventoryVerifyResetFlow"),
/**
* 待办中心-将法规工程师的法规清单确认待办任务转为已办
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+25 -9
View File
@@ -6704,8 +6704,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
public Result<?> change(JSONObject parmas) {
String ids = parmas.getString("ids");
String projectLibraryId = parmas.getString("projectLibraryId");
String operateType = parmas.getString("operateType");
if (StringUtils.isNotEmpty(ids)) {
List<String> piFlowTypeList = new ArrayList<>();
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId, projectLibraryId);
@@ -6730,20 +6733,32 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null);
updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
// 区分重置设计、验证、全部流程
if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
piFlowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
piFlowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())){
updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
piFlowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())){
updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
piFlowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
}
super.update(projectLawsInventoryEO, updateWrapper);
QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, idList);
processInfoQueryWrap.lambda().in(ProcessInfoEO::getFlowType,piFlowTypeList);
List<ProcessInfoEO> processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap);
List<String> actiProcInstIdList = processInfoEOList.stream().filter(processInfo -> {
boolean flag = false;
if (StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue()) || StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue())) {
flag = true;
}
return flag;
}).map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
List<String> actiProcInstIdList = processInfoEOList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
@@ -6835,6 +6850,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//清除流程中心对应的数据
params.put("ids", ids);
params.put("operateType", operateType);
this.processInfoEOService.change(params);
// 删除流程历史数据
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java
+5
View File
@@ -13,6 +13,11 @@ public enum DesignComplianceFlowNodeKeyEnum {
ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核
// 修改交付物流程
BCTJ_ZRRBCTJFQ("补充提交","Supplementary submission","zrrbctjfq"), // 责任人补充提交发起
BCTJ_ZRRBCTJXG("补充提交","Supplementary submission","zrrbctjxg"), // 责任人补充提交修改
BCTJ_FGGCSBCSH("补充审查","Supplemental Examination","fggcsbcsh"), // 法规工程师补充审核
;
String cnName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java
+5
View File
@@ -13,6 +13,11 @@ public enum VerifyComplianceFlowNodeKeyEnum {
ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核
// 修改交付物流程
BCTJ_ZRRBCTJFQ("补充提交","Supplementary submission","zrrbctjfq"), // 责任人补充提交发起
BCTJ_ZRRBCTJXG("补充提交","Supplementary submission","zrrbctjxg"), // 责任人补充提交修改
BCTJ_FGGCSBCSH("补充审查","Supplemental Examination","fggcsbcsh"), // 法规工程师补充审核
;
String cnName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+2 -2
View File
@@ -80,7 +80,7 @@
<if test="params.cut == 'en'">
concat(pli.serial_number,' ',bdl.title_en) as standard_info,
</if>
pi.flow_type,
(case pi.flow_type when '32' THEN '2' when '34' THEN '4' else pi.flow_type END) as flow_type,
pi.create_by,
pi.end_time,
pi.status,
@@ -173,7 +173,7 @@
<if test="params.cut == 'en'">
concat(pli.serial_number,' ',bdl.title_en) as standard_info,
</if>
pi.flow_type,
(case pi.flow_type when '32' THEN '2' when '34' THEN '4' else pi.flow_type END) as flow_type,
pi.create_by,
pi.end_time,
pi.STATUS,
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+26 -7
View File
@@ -224,6 +224,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
flowTypeList.add(FlowTypeEnum.RWQRLC.getValue());
flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
// 2023-03-08 去掉原来的Pre-Homo
// flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue());
params.put("flowTypeList",flowTypeList);
@@ -359,6 +361,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
public void change(Map<String, Object> params) {
//需要清除数据的法规清单ids
String ids = (String)params.get("ids");
String operateType = (String)params.get("operateType");
List<String> projectLawsInventoryIdList = Arrays.asList(ids.split(","));
if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){
//清除清单确认相关数据
@@ -404,17 +407,31 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
* 4.清除验证符合性流程相关数据
*/
List<String> flowTypeList = new ArrayList<>();
flowTypeList.add(FlowTypeEnum.RWQRLC.getValue());
flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
// flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue());
flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
// 区分重置设计、验证、全部流程
if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())) {
flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
} else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())) {
flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
} else if (StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())) {
flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
}
// flowTypeList.add(FlowTypeEnum.RWQRLC.getValue());
// flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
// // flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue());
// flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
//根据法规清单id，查询待办中心数据
QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,projectLawsInventoryIdList);
processInfoQueryWrap.lambda().in(ProcessInfoEO::getFlowType,flowTypeList);
processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId, projectLawsInventoryIdList);
processInfoQueryWrap.lambda().in(ProcessInfoEO::getFlowType, flowTypeList);
List<ProcessInfoEO> processInfoEOList = this.list(processInfoQueryWrap);
if(CollectionUtils.isNotEmpty(processInfoEOList)){
if (CollectionUtils.isNotEmpty(processInfoEOList)) {
List<String> processInfoIdList = processInfoEOList.stream().map(ProcessInfoEO::getId).distinct().collect(Collectors.toList());
/*QueryWrapper<ProcessInfoDetailEO> detailRemoveWrap = new QueryWrapper<>();
detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProcessInfoId,processInfoIdList);
@@ -501,6 +518,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
flowTypeList.add(FlowTypeEnum.RWQRLC.getValue());
flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
// flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue());
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/ProcessHistoryEOController.java
+13
View File
@@ -182,4 +182,17 @@ public class ProcessHistoryEOController extends JeroController<ProcessHistoryEO,
return this.processHistoryEOService.processCall(jsonObject);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "流程历史表-符合性流程-列表查询")
@ApiOperation(value="流程历史表-符合性流程-列表查询", notes="流程历史表-符合性流程-列表查询")
@GetMapping(value = "/queryComplianceProcessHistoryList")
public Result<List<ProcessHistoryEO>> queryComplianceProcessHistoryList(@RequestParam Map<String,Object> params) {
List<ProcessHistoryEO> list = processHistoryEOService.queryComplianceProcessHistoryList(params);
return Result.OK(list);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
+3
View File
@@ -76,6 +76,9 @@ public class workFlowController {
}else if(StringUtils.equals(type,FlowTypeEnum.FGJSPG.getValue())){
jsonObject.put("processDefinitionKey", FlowTypeEnum.FGJSPG.getProcessDefinitionKey());
return this.startLawsTechnologyEvaluationProcess(jsonObject);
}else if(StringUtils.equals(type,FlowTypeEnum.XGJFWLC.getValue())){
jsonObject.put("id", FlowTypeEnum.XGJFWLC.getProcessDefinitionKey());
return this.activiti_define_start(jsonObject);
}else{
return null;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java
+3
View File
@@ -17,6 +17,9 @@ public enum FlowTypeEnum {
FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory and technical assessment"),
QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单发布","Release of regulatory list"),
CERTIFICATION_LC("21","认证流程","CERTIFICATION_LC","认证流程","certification_lc","Pre-Homo流程","Pre-Homo flow"),
XGJFWLC("31","修改交付物流程","XGJFWLC","修改交付物流程","xgjfwlc","修改交付物流程","Update Deliverable"),
SJ_XGJFWLC("32","设计-修改交付物流程","SJ_XGJFWLC","设计-修改交付物流程","sj_xgjfwlc","设计-修改交付物流程","Design Update Deliverable"),
YZ_XGJFWLC("34","验证-修改交付物流程","YZ_XGJFWLC","验证-修改交付物流程","yz_xgjfwlc","验证-修改交付物流程","Verify Update Deliverable"),
;
private String value;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java
+7
View File
@@ -70,4 +70,11 @@ public interface IProcessHistoryEOService extends IService<ProcessHistoryEO> {
Result<?> processCall(JSONObject jsonObject);
void deleteBiActiProcInstIdList(List<String> actiProcInstIdList);
/**
* 查询符合性流程历史
* @param params
* @return
*/
List<ProcessHistoryEO> queryComplianceProcessHistoryList(Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+41 -9
View File
@@ -180,17 +180,17 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
return flag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(processInfoListTemp)){
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));
if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue()) || StringUtils.equals(flowType, FlowTypeEnum.SJ_XGJFWLC.getValue())) {
data.setName(DesignComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(), cut));
} else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue()) || StringUtils.equals(flowType, FlowTypeEnum.YZ_XGJFWLC.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));
} else if (StringUtils.isNotEmpty(data.getTaskDefinitionKey())) {
data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(), cut));
}
if(StringUtils.isNotEmpty(data.getApprovalFile())){
@@ -246,4 +246,36 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
}
}
@Override
public List<ProcessHistoryEO> queryComplianceProcessHistoryList(Map<String, Object> params) {
String cut = (String) params.get("cut");
String projectLawsInventoryId = (String) params.get("projectLawsInventoryId");
if (StringUtils.isEmpty(projectLawsInventoryId)) {
throw new JeroBootException("法规清单id不能为空！");
}
String flowType = (String) params.get("flowType");
List<String> flowTypeList = new ArrayList<>();
flowTypeList.add(flowType);
if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
}
QueryWrapper<ProcessInfoEO> piQueryWrap = new QueryWrapper<>();
piQueryWrap.lambda().eq(ProcessInfoEO::getProjectLawsInventoryId, projectLawsInventoryId);
piQueryWrap.lambda().in(ProcessInfoEO::getFlowType, flowTypeList);
List<ProcessInfoEO> piInfoList = this.processInfoEOService.list(piQueryWrap);
List<String> actiProcInstIdList = piInfoList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
List<ProcessHistoryEO> processHistoryEOList = null;
if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
QueryWrapper<ProcessHistoryEO> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByAsc("create_time");
queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId, actiProcInstIdList);
processHistoryEOList = this.baseMapper.selectList(queryWrapper);
this.disposeData(processHistoryEOList, cut);
}
return processHistoryEOList;
}
}