From df51d8a69fb8a22407b90d7fb77e2c9fedd1ae68 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 18 Jan 2024 13:57:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=90=88=E8=A7=84=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessProjectStandardController.java | 19 +- .../entity/ProcessProjectStandard.java | 7 + .../entity/ProcessProjectStandardTerm.java | 8 +- .../ProcessProjectStandardTermUser.java | 7 +- .../xml/ProcessProjectStandardMapper.xml | 3 +- .../ProcessProjectStandardService.java | 150 +++-- ...ProcessProjectStandardTermUserService.java | 31 + .../constant/MessageTemplateCodeCommon.java | 1 + .../main/resources/bpmn/法规合规评估流程.bpmn | 533 +++++++++--------- .../bpmn/法规合规评估流程camund.bpmn | 533 +++++++++--------- 10 files changed, 717 insertions(+), 575 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java index 9c5afad3..569105dd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java @@ -9,10 +9,12 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; +import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService; import javax.servlet.http.HttpServletRequest; +import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardTermUserService; import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStandardVO; import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; @@ -45,7 +47,7 @@ import java.util.List; @Slf4j @Api(tags = "法规合规评估流程表") @RestController -@RequestMapping("processProjectStandard") +@RequestMapping("process/projectStandard") public class ProcessProjectStandardController extends JeroController { /** * 服务对象 @@ -54,6 +56,8 @@ public class ProcessProjectStandardController extends JeroController> getTermUserList(ProcessProjectStandardTermUser processProjectStandardTermUser, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + IPage page = termUserService.queryPage(processProjectStandardTermUser, pageNo, pageSize, req); + return Result.OK(page); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java index e7f9a7f9..939b5e62 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java @@ -95,6 +95,13 @@ public class ProcessProjectStandard { @ApiModelProperty(value = "标准编号") private String standardNumber; + /** + * 标准名称 + */ + @TableField(value = "standard_name") + @ApiModelProperty(value = "标准名称") + private String standardName; + /** * 分解单来源 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java index 4aa38a3a..8a365c84 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; +import java.util.List; + import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -161,7 +163,7 @@ public class ProcessProjectStandardTerm { */ @TableField(exist = false) @ApiModelProperty(value="车型系列") - private String modelSeries_dict; + private String modelSeries_dictText; /** * 依据描述 @@ -194,4 +196,8 @@ public class ProcessProjectStandardTerm { @ApiModelProperty(value="评估结果") private String assessResults; + @TableField(exist = false) + @ApiModelProperty(value="评估结果") + private String assessResults_dictText; + } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java index 3b94cde2..322f90fe 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java @@ -109,8 +109,8 @@ public class ProcessProjectStandardTermUser { /**评估结果(1-符合、2-不符合)*/ @TableField(value = "assess_results") - @Dict(dicCode = "standards_assess_results") - @ApiModelProperty(value = "评估结果(1-符合、2-不符合)") + @Dict(dicCode = "assess_results") + @ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-不涉及)") private String assessResults; /** @@ -138,6 +138,7 @@ public class ProcessProjectStandardTermUser { * 车型系列 */ @TableField(value = "model_series") + @Dict(dicCode = "model_series") @ApiModelProperty(value="车型系列") private String modelSeries; /** @@ -145,7 +146,7 @@ public class ProcessProjectStandardTermUser { */ @TableField(exist = false) @ApiModelProperty(value="车型系列") - private String modelSeries_dict; + private String modelSeries_dictText; /** * 依据描述 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml index 25614f43..895d68d5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml @@ -13,11 +13,12 @@ + id, create_by, create_time, update_by, update_time, org_code, del_flag, `source`, - standard_number, decomposition_order_Source + standard_number, standard_name, decomposition_order_Source \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 73e5c11f..cb300e65 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.dto.message.SendMessageDTO; import com.jero.common.api.vo.ResultCommon; import com.jero.common.api.vo.SendMessageAPI; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.DictModel; @@ -24,7 +26,6 @@ import com.jero.modules.activiti.process.fb.dto.ProcessDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.projectassess.common.ProcessProjectAssessCommon; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTermUser; import com.jero.modules.activiti.process.projectstandard.common.ProcessProjectStandardCommon; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermApproval; @@ -35,6 +36,7 @@ import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStanda import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.util.ThreadLocalUtil; +import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; @@ -43,6 +45,8 @@ import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.projectLibrary.common.AssessCommon; +import com.jero.modules.projectLibrary.entity.LawsSpecialProjectLibrary; +import com.jero.modules.projectLibrary.service.ILawsSpecialProjectLibraryService; import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.service.ISarFileSplitInfoService; @@ -56,6 +60,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardMapper; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; @@ -67,6 +72,7 @@ import java.util.stream.Collectors; *@date 2024-01-15 16:17 */ @Service +@Transactional(rollbackFor = Exception.class) public class ProcessProjectStandardService extends ServiceImpl { @Resource @@ -99,6 +105,8 @@ public class ProcessProjectStandardService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessProjectStandardTermUser::getProcessId, processId); List list = new ArrayList<>(); @@ -155,23 +161,16 @@ public class ProcessProjectStandardService extends ServiceImpl dictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); - Map dictevaluationFeedbackMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); + Map assessResultsMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); //给条款中保存关联的信息 Map> termIdListMap = CollStreamUtil.groupByKey(list, ProcessProjectStandardTermUser::getTermId); for (ProcessProjectStandardTerm term : processProjectStandardTermList) { String termId = term.getId(); - List termUsers = termIdListMap.get(termId); - if (CollectionUtil.isNotEmpty(termUsers)){ - - ProcessProjectStandardTermUser termUser = termUsers.get(0); - term.setDescription(termUser.getDescription()); - term.setFileId(termUser.getFileId()); + if (termIdListMap.containsKey(termId)) { + List termUsers = termIdListMap.get(termId); + String assessResults = AssessCommon.NOT_INVOLVED; + String projectApprovalFlag = YesOrNoEnum.NO.getValue(); + List moduleOwnerList = new ArrayList<>(); + for (ProcessProjectStandardTermUser termUser : termUsers) { + moduleOwnerList.add(termUser.getModuleOwner()); + String assessResults1 = termUser.getAssessResults(); + if (AssessCommon.NOT_COMPLIANT.equals(assessResults1)) { + assessResults = AssessCommon.NOT_COMPLIANT; + projectApprovalFlag = YesOrNoEnum.NO.getValue(); + break; + } + if (AssessCommon.ACCORD_WITH.equals(assessResults1)) { + assessResults = AssessCommon.ACCORD_WITH; + projectApprovalFlag = YesOrNoEnum.YES.getValue(); + } + } + List userNameList = new ArrayList<>(); + moduleOwnerList.stream() + .filter(Objects::nonNull) + .distinct().forEach(i ->{ + userNameList.add(userNameMap.get(i)) ; + }); + term.setModuleOwner(String.join(",", userNameList)); + term.setProjectApprovalFlag(projectApprovalFlag); + term.setAssessResults(assessResults); + term.setAssessResults_dictText(assessResultsMap.get(assessResults)); } } - //拼接分类法规标题 - List decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source"); - Map decompositionOrderSourceMap = CollStreamUtil.toMap(decompositionOrderSourceDictModels, DictModel::getValue, DictModel::getText); - Map splitInfoIdMap = this.getSplitInfoIdMap(processId); - List allProjectAssesTermList = new ArrayList<>(); - List usedSplitInfoId = new ArrayList<>(); - for (ProcessProjectStandardTerm term : processProjectStandardTermList) { - String splitInfoId = term.getSplitInfoId(); - if (!usedSplitInfoId.contains(splitInfoId) && splitInfoIdMap.containsKey(splitInfoId)) { - usedSplitInfoId.add(splitInfoId); - ProcessProjectStandardTerm titleTerm = splitInfoIdMap.get(splitInfoId); - ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm(); - term1.setTermName(titleTerm.getTermName()); - term1.setTermNumber(titleTerm.getTermNumber()); - term1.setTermText(decompositionOrderSourceMap.get(titleTerm.getTermText())); - allProjectAssesTermList.add(term1); - } - allProjectAssesTermList.add(term); - } ProcessProjectStandard processProjectStandard = this.getById(processId); @@ -253,6 +255,7 @@ public class ProcessProjectStandardService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) { + String businessId = processInfoVO.getBusinessId(); + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + Task task = processDTO.getTask(); + String executionId = task.getExecutionId(); + //查询流程信息 + ProcessAll process = processAllService.getByProcessInstanceId(processDTO.getProcessInstanceId()); + ProcessProjectStandard processProjectStandard = this.getById(businessId); + //查询不符合的评估 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); + wrapper.eq(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_COMPLIANT); + List notCompliantList = termUserService.list(wrapper); + Map> termIdMap = CollStreamUtil.groupByKey(notCompliantList, ProcessProjectStandardTermUser::getTermId); + //查询表单 + ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + List termList = businessInfoDTO.getProcessProjectStandardTermList(); + List carbonCopyPersonnelList = new ArrayList<>(); + List updateTermList = new ArrayList<>(); + Date date = new Date(); + for (ProcessProjectStandardTerm term : termList) { + ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm(); + String termId = term.getId(); + String assessResults = term.getAssessResults(); + String designEngineer = term.getDesignEngineer(); + term1.setId(termId); + term1.setAssessResults(assessResults); + term1.setDescription(designEngineer); + updateTermList.add(term1); + carbonCopyPersonnelList.addAll(Arrays.asList(term.getCarbonCopyPersonnels().split(","))); + + LawsSpecialProjectLibrary projectLibrary = new LawsSpecialProjectLibrary(); + projectLibrary.setSource(processProjectStandard.getSource()); + String standardNumber = processProjectStandard.getStandardNumber(); + projectLibrary.setStandardNumber(standardNumber); + String standardName = processProjectStandard.getStandardName(); + projectLibrary.setStandardName(standardName); + projectLibrary.setStandardId(processProjectStandard.getStandardId()); + String termName = term.getTermName(); + String termNumber = term.getTermNumber(); + if (!Objects.equals(termName,standardName) && !Objects.equals(termNumber,standardNumber)){ + projectLibrary.setTermNumber(termNumber); + projectLibrary.setTermName(termName); + } + projectLibrary.setStandardState(processProjectStandard.getDecompositionOrderSource()); + projectLibrary.setModelSeries(term.getModelSeries()); + projectLibrary.setResult(term.getAssessResults()); + projectLibrary.setMaterial(term.getFileId()); + projectLibrary.setValuationTime(date); + projectLibrary.setProjectApproval(term.getProjectApprovalFlag()); + projectLibrary.setProcessNum(process.getPrcNum()); + //存入不符合描述 + if (termIdMap.containsKey(termId)) { + List termUserList = termIdMap.get(termId); + String description = termUserList.stream().map(ProcessProjectStandardTermUser::getDescription).collect(Collectors.joining(",")); + projectLibrary.setDescription(description); + } + //推送数据到法规项目库 + lawsSpecialProjectLibraryService.save(projectLibrary); + } + //更新数据 + termService.updateBatchById(updateTermList); + //发送消息 + String carbonCopyPersonnels = carbonCopyPersonnelList.stream().distinct().collect(Collectors.joining(",")); + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_STANDARD_COMPLETE); + sendMessageDTO.setToUserId(carbonCopyPersonnels); + Map sendMap = new HashMap<>(); + sendMap.put("prcName", process.getPrcName()); + sendMap.put("termNumber", process.getPrcName()); + sendMap.put("termName", process.getPrcName()); + sendMessageDTO.setMap(sendMap); + sendMessageAPI.sendMessage(sendMessageDTO); } public void submit(ProcessInfoVO processInfoVO) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java index 91264299..6466675e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java @@ -1,8 +1,18 @@ package com.jero.modules.activiti.process.projectstandard.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardTermUserMapper; @@ -13,5 +23,26 @@ import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectSt */ @Service public class ProcessProjectStandardTermUserService extends ServiceImpl { + @Resource + private ISysBaseAPI sysBaseAPI; + public IPage queryPage(ProcessProjectStandardTermUser processProjectStandardTermUser, Integer pageNo, Integer pageSize, + HttpServletRequest req){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processProjectStandardTermUser, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + Page pageList = page(page, queryWrapper); + //获取所有用户信息 + List userList = sysBaseAPI.getAllUser(); + Map userNameMap = new HashMap<>(); + for (LoginUser loginUser : userList) { + userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo()); + } + for (ProcessProjectStandardTermUser record : pageList.getRecords()) { + String moduleOwner = record.getModuleOwner(); + record.setModuleOwner(userNameMap.get(moduleOwner)); + String designEngineer = record.getDesignEngineer(); + record.setDesignEngineer(userNameMap.get(designEngineer)); + } + return pageList; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java index f1899d67..9d3e7096 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java @@ -21,5 +21,6 @@ public class MessageTemplateCodeCommon { public static final String STANDARD_CHANGE_REFERENCE = "standard_change_reference"; // 【法规变更】引用标准变更 public static final String STANDARD_CONSULTATION = "standard_consultation"; // 【征求意见结果提醒】 public static final String PROJECT_ASSESS_COMPLETE = "project_assess_complete"; // 【项目合规评估完成提醒】 + public static final String PROJECT_STANDARD_COMPLETE = "project_standard_complete"; // 【法规合规评估完成提醒】 public static final String URGING = "urging"; // 催办 } diff --git a/laws-modules/src/main/resources/bpmn/法规合规评估流程.bpmn b/laws-modules/src/main/resources/bpmn/法规合规评估流程.bpmn index 53f84afc..fbe102c6 100644 --- a/laws-modules/src/main/resources/bpmn/法规合规评估流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/法规合规评估流程.bpmn @@ -288,7 +288,7 @@ Flow_03v0fem Flow_1gw9i5e - + Flow_0c3ic1y Flow_19ehxvl @@ -473,18 +473,6 @@ - - - - - - - - - - - - @@ -502,28 +490,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -531,12 +497,6 @@ - - - - - - @@ -550,6 +510,12 @@ + + + + + + @@ -557,10 +523,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -575,28 +565,91 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -636,10 +689,6 @@ - - - - @@ -655,81 +704,20 @@ - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -752,49 +740,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -807,6 +752,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -818,18 +819,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - @@ -905,77 +956,16 @@ - - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -990,6 +980,13 @@ + + + + + + + @@ -998,6 +995,10 @@ + + + + @@ -1016,6 +1017,18 @@ + + + + + + + + + + + + @@ -1027,6 +1040,10 @@ + + + + @@ -1034,26 +1051,10 @@ - - - - - - - - - - - - - - - - diff --git a/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn b/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn index e8688aa8..927e2bfe 100644 --- a/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn +++ b/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn @@ -288,7 +288,7 @@ Flow_03v0fem Flow_1gw9i5e - + Flow_0c3ic1y Flow_19ehxvl @@ -473,18 +473,6 @@ - - - - - - - - - - - - @@ -502,28 +490,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -531,12 +497,6 @@ - - - - - - @@ -550,6 +510,12 @@ + + + + + + @@ -557,10 +523,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -575,28 +565,91 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -636,10 +689,6 @@ - - - - @@ -655,81 +704,20 @@ - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -752,49 +740,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -807,6 +752,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -818,18 +819,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - @@ -905,77 +956,16 @@ - - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -990,6 +980,13 @@ + + + + + + + @@ -998,6 +995,10 @@ + + + + @@ -1016,6 +1017,18 @@ + + + + + + + + + + + + @@ -1027,6 +1040,10 @@ + + + + @@ -1034,26 +1051,10 @@ - - - - - - - - - - - - - - - -