diff --git a/db/流程图导入后初始sql.sql b/db/流程图导入后初始sql.sql index 61150944..ddb05925 100644 --- a/db/流程图导入后初始sql.sql +++ b/db/流程图导入后初始sql.sql @@ -57,6 +57,11 @@ where process_definition_id like 'standard-assessment:%'; # 标准法规征求意见流程结束 # 项目合规评估流程开始 +# 更新是否可见 +update process_node +set is_view = 0 +where process_definition_id like 'project-assessment:%' + and xml_node_id in ('mkfzrxg'); # 更新是否可跳过 update process_node set is_skip = 1 diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java b/laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java index 175f0df7..64849721 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java @@ -60,7 +60,8 @@ public class CsrfFilter implements Filter { || url.contains("view") || url.contains("doc.html") || url.contains("onlyOffice") - || url.contains("/srms/")){ + || url.contains("/srms/") + || url.contains("downloadWithoutToken")){ chain.doFilter(request, response); }else{ String log = ""; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java index f1545789..ee1d2c88 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java @@ -59,6 +59,8 @@ public class ActivitiController { @Resource private HistoryService historyService; @Resource + private RuntimeService runtimeService; + @Resource private TaskService taskService; @Resource private ProcessNodeService processNodeService; @@ -105,7 +107,7 @@ public class ActivitiController { map1.put("流程实例id：", processInstanceId); map1.put("当前活动Id：", processInstance.getActivityId()); - String mainDrafter = map.get("mainDrafter").toString(); + //String mainDrafter = map.get("mainDrafter").toString(); return Result.OK(map1); } @@ -173,6 +175,13 @@ public class ActivitiController { return Result.OK(); } + @GetMapping("/deleteProcessInstance") + @ApiOperation(value = "删除流程实例", notes = "删除流程实例") + public Result deleteProcessInstance(@RequestParam(value = "id", required = false) String id) { + runtimeService.deleteProcessInstance(id,"删除"); + return Result.OK(); + } + @GetMapping("/deleteDeployment") @ApiOperation(value = "删除已部署的流程定义", notes = "删除已部署的流程定义") public Result deleteDeployment(@RequestParam(value = "id", required = false) String id) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index 46b5b482..d35ed225 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -128,7 +128,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { wrapper.eq(ProcessNode::getNodeName,name); wrapper.eq(ProcessNode::getIsView, YesOrNoEnum.YES.getValue()); int count = processNodeService.count(wrapper); - if (count == 0){ + if (count == 0 || "123".equals(assignee)){ return; } //新增待审批记录 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java index dcc1cd09..886d9428 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java @@ -12,6 +12,7 @@ public class ProcessProjectAssessCommon { public static final String DESIGN_ENGINEER_LIST = "designEngineerList"; public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize"; public static final String PASS = "pass"; + public static final String SKIP = "skip"; public static final String EXECUTION_ID = "executionId"; //法规工程师发起 public static final String FGGCSFQ = "fggcsfq"; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index fd60ab4a..4f9b6abf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -911,5 +911,15 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); + variables.put(ProcessProjectAssessCommon.SKIP, true); + taskService.complete(delegateTask.getId(), variables); + } + }else { + runtimeService.setVariable(delegateTask.getExecutionId(),ProcessProjectAssessCommon.SKIP,false); + } } } 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 92e1c3cd..a1596149 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 @@ -522,6 +522,12 @@ public class ProcessProjectStandardService extends ServiceImpl { - @Autowired - private ILawsProblemLibraryService lawsProblemLibraryService; - @AutoLog(value = "问答库-分页列表查询") - @ApiOperation(value="问答库-分页列表查询", notes="问答库-问题-分页列表查询") - @GetMapping(value = "/page") - @RequiresPermissions("businessSupport:questionAnswer:search") - public Result> queryPageList(LawsProblemLibrary lawsProblemLibrary, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = lawsProblemLibraryService.queryPage(lawsProblemLibrary, pageNo, pageSize, req); - return Result.OK(pageList); - } + @Autowired + private ILawsProblemLibraryService lawsProblemLibraryService; - @AutoLog(value = "问答库-提出问题") - @ApiOperation(value="问答库-提出问题", notes="问答库-提出问题") - @PostMapping(value = "/addProblem") - @RequiresPermissions("businessSupport:questionAnswer:quiz") - public Result addProblem(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { - lawsProblemLibraryService.addProblem(lawsProblemLibrary); - return Result.OK(ResultCommon.OK); - } + @AutoLog(value = "问答库-分页列表查询") + @ApiOperation(value = "问答库-分页列表查询", notes = "问答库-问题-分页列表查询") + @GetMapping(value = "/page") + @RequiresPermissions("businessSupport:questionAnswer:search") + public Result> queryPageList(LawsProblemLibrary lawsProblemLibrary, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = lawsProblemLibraryService.queryPage(lawsProblemLibrary, pageNo, pageSize, req); + return Result.OK(pageList); + } - @AutoLog(value = "国内标准-提出问题") - @ApiOperation(value="国内标准-提出问题", notes="国内标准-提出问题") - @PostMapping(value = "/addProblem/GB") - @RequiresPermissions("domesticStandard:submitQuestion") - public Result addProblemGB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { - lawsProblemLibrary.setType("1"); - lawsProblemLibraryService.addProblem(lawsProblemLibrary); - return Result.OK(ResultCommon.OK); - } + @AutoLog(value = "问答库-提出问题") + @ApiOperation(value = "问答库-提出问题", notes = "问答库-提出问题") + @PostMapping(value = "/addProblem") + @RequiresPermissions("businessSupport:questionAnswer:quiz") + public Result addProblem(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { + lawsProblemLibraryService.addProblem(lawsProblemLibrary); + return Result.OK(ResultCommon.OK); + } - @AutoLog(value = "海外标准-提出问题") - @ApiOperation(value="海外标准-提出问题", notes="海外标准-提出问题") - @PostMapping(value = "/addProblem/FB") - @RequiresPermissions("overseasStandard:submitQuestion") - public Result addProblemFB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { - lawsProblemLibrary.setType("2"); - lawsProblemLibraryService.addProblem(lawsProblemLibrary); - return Result.OK(ResultCommon.OK); - } + @AutoLog(value = "国内标准-提出问题") + @ApiOperation(value = "国内标准-提出问题", notes = "国内标准-提出问题") + @PostMapping(value = "/addProblem/GB") + @RequiresPermissions("domesticStandard:submitQuestion") + public Result addProblemGB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { + lawsProblemLibrary.setType("1"); + lawsProblemLibraryService.addProblem(lawsProblemLibrary); + return Result.OK(ResultCommon.OK); + } - @AutoLog(value = "企业标准-提出问题") - @ApiOperation(value="企业标准-提出问题", notes="企业标准-提出问题") - @PostMapping(value = "/addProblem/QB") - @RequiresPermissions("enterpriseStandard:detail:submitQuestion") - public Result addProblemQB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { - lawsProblemLibrary.setType("3"); - lawsProblemLibraryService.addProblem(lawsProblemLibrary); - return Result.OK(ResultCommon.OK); - } + @AutoLog(value = "海外标准-提出问题") + @ApiOperation(value = "海外标准-提出问题", notes = "海外标准-提出问题") + @PostMapping(value = "/addProblem/FB") + @RequiresPermissions("overseasStandard:submitQuestion") + public Result addProblemFB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { + lawsProblemLibrary.setType("2"); + lawsProblemLibraryService.addProblem(lawsProblemLibrary); + return Result.OK(ResultCommon.OK); + } - @AutoLog(value = "问答库-回答问题") - @ApiOperation(value="问答库-回答问题", notes="问答库-回答问题") - @PostMapping(value = "/addAnswer") - @RequiresPermissions("quiz:detail:answerSubmit") - public Result addAnswer(@Validated @RequestBody LawsAnswerLibrary lawsAnswerLibrary) { - lawsProblemLibraryService.addAnswer(lawsAnswerLibrary); - return Result.OK(ResultCommon.OK); - } + @AutoLog(value = "企业标准-提出问题") + @ApiOperation(value = "企业标准-提出问题", notes = "企业标准-提出问题") + @PostMapping(value = "/addProblem/QB") + @RequiresPermissions("enterpriseStandard:detail:submitQuestion") + public Result addProblemQB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { + lawsProblemLibrary.setType("3"); + lawsProblemLibraryService.addProblem(lawsProblemLibrary); + return Result.OK(ResultCommon.OK); + } - @AutoLog(value = "问答库-通过id查询") - @ApiOperation(value="问答库-通过id查询", notes="问答库-通过id查询") - @GetMapping(value = "/queryById") - @Translation - @RequiresPermissions("businessSupport:questionAnswer:detail") - public Result queryById(@RequestParam(name="id") String id) { - LawsProblemLibrary lawsProblemLibrary = lawsProblemLibraryService.queryById(id); - return Result.OK(lawsProblemLibrary); - } + @AutoLog(value = "问答库-回答问题") + @ApiOperation(value = "问答库-回答问题", notes = "问答库-回答问题") + @PostMapping(value = "/addAnswer") + @RequiresPermissions("quiz:detail:answerSubmit") + public Result addAnswer(@Validated @RequestBody LawsAnswerLibrary lawsAnswerLibrary) { + lawsProblemLibraryService.addAnswer(lawsAnswerLibrary); + return Result.OK(ResultCommon.OK); + } - @AutoLog(value = "问答库-通过id删除问题") - @ApiOperation(value="问答库-通过id删除问题", notes="问答库-通过id删除问题") - @PostMapping(value = "/deleteProblem") - @RequiresPermissions("businessSupport:questionAnswer:delete") - public Result deleteProblem(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error(MessageUtils.getMessage(ResultCommon.SELECT_DATA)); - } - lawsProblemLibraryService.deleteProblem(map.get("id")); - return Result.OK(ResultCommon.OK); - } + @AutoLog(value = "问答库-通过id查询") + @ApiOperation(value = "问答库-通过id查询", notes = "问答库-通过id查询") + @GetMapping(value = "/queryById") + @Translation + @RequiresPermissions("businessSupport:questionAnswer:detail") + public Result queryById(@RequestParam(name = "id") String id) { + LawsProblemLibrary lawsProblemLibrary = lawsProblemLibraryService.queryById(id); + return Result.OK(lawsProblemLibrary); + } - @AutoLog(value = "问答库-通过id删除回答") - @ApiOperation(value="问答库-通过id删除回答", notes="问答库-通过id删除回答") - @PostMapping(value = "/deleteAnswer") - @RequiresPermissions("quiz:detail:deleteAnswer") - public Result deleteAnswer(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error(MessageUtils.getMessage(ResultCommon.SELECT_DATA)); - } - lawsProblemLibraryService.deleteAnswer(map.get("id")); - return Result.OK(ResultCommon.OK); - } + @AutoLog(value = "问答库-通过id删除问题") + @ApiOperation(value = "问答库-通过id删除问题", notes = "问答库-通过id删除问题") + @PostMapping(value = "/deleteProblem") + @RequiresPermissions("businessSupport:questionAnswer:delete") + public Result deleteProblem(@RequestBody Map map) { + if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { + return Result.error(MessageUtils.getMessage(ResultCommon.SELECT_DATA)); + } + lawsProblemLibraryService.deleteProblem(map.get("id")); + return Result.OK(ResultCommon.OK); + } - @AutoLog(value = "问答库-是否置顶") - @ApiOperation(value="问答库-是否置顶", notes="问答库-是否置顶") - @GetMapping(value = "/isTop") - @RequiresPermissions("quiz:detail:topOrCancel") - public Result isTop(@RequestParam(name="id") String id) { - lawsProblemLibraryService.isTop(id); - return Result.OK(ResultCommon.OK); - } + @AutoLog(value = "问答库-通过id删除回答") + @ApiOperation(value = "问答库-通过id删除回答", notes = "问答库-通过id删除回答") + @PostMapping(value = "/deleteAnswer") + @RequiresPermissions("quiz:detail:deleteAnswer") + public Result deleteAnswer(@RequestBody Map map) { + if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { + return Result.error(MessageUtils.getMessage(ResultCommon.SELECT_DATA)); + } + lawsProblemLibraryService.deleteAnswer(map.get("id")); + return Result.OK(ResultCommon.OK); + } + + @AutoLog(value = "问答库-是否置顶") + @ApiOperation(value = "问答库-是否置顶", notes = "问答库-是否置顶") + @GetMapping(value = "/isTop") + @RequiresPermissions("quiz:detail:topOrCancel") + public Result isTop(@RequestParam(name = "id") String id) { + lawsProblemLibraryService.isTop(id); + return Result.OK(ResultCommon.OK); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java index 886b9217..499bbfb2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.library.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -16,6 +17,7 @@ import com.jero.modules.laws.library.entity.LawsProblemLibrary; import com.jero.modules.laws.library.mapper.LawsProblemLibraryMapper; import com.jero.modules.laws.library.service.ILawsAnswerLibraryService; import com.jero.modules.laws.library.service.ILawsProblemLibraryService; +import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; @@ -25,6 +27,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; @@ -36,7 +39,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; import javax.annotation.Resource; +import javax.management.relation.Role; import javax.servlet.http.HttpServletRequest; + import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -44,7 +49,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; /** * @Description: 问答库-问题 * @Author: jero-boot - * @Date: 2023-09-28 + * @Date: 2023-09-28 * @Version: V1.0 */ @Service @@ -62,6 +67,12 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl queryPage(LawsProblemLibrary lawsProblemLibrary, Integer pageNo, Integer pageSize, HttpServletRequest req) { @@ -115,6 +126,12 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl userRoleList = userService.getRole(currentUser.getUsername()); + LawsAnswerLibrary answer = lawsAnswerLibraryService.getById(id); + LawsProblemLibrary problem = getById(answer.getProblemId()); + // 如果是管理员权限 则跳过验证 + List adminRoleList = Arrays.asList(adminRoleCode.split(",")); + // 如果不是管理员权限 且不是问题创建者 且不是回答创建者 则没有权限 + if (adminRoleList.stream().noneMatch(userRoleList::contains)) { + if (!currentUser.getUsername().equals(problem.getCreateBy())) { + throw new JeroBootException(ResultCommon.NO_PERMISSION); + } + } lawsAnswerLibraryService.removeById(id); } @@ -204,9 +240,22 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl userRoleList = userService.getRole(currentUser.getUsername()); + // 如果是管理员权限 则跳过验证 + List adminRoleList = Arrays.asList(adminRoleCode.split(",")); + // 如果不是管理员权限 且不是问题创建者 且不是回答创建者 则没有权限 + if (adminRoleList.stream().noneMatch(userRoleList::contains)) { + LawsProblemLibrary problem = getById(lawsAnswerLibrary.getProblemId()); + if (!currentUser.getUsername().equals(problem.getCreateBy())) { + throw new JeroBootException(ResultCommon.NO_PERMISSION); + } + } + if (0 == lawsAnswerLibrary.getIsTop()) { lawsAnswerLibrary.setIsTop(1); // 发送消息 diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java index e49d0f85..5f4b070c 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java @@ -158,7 +158,9 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl ${moduleOwnerListSize > 0} - - Flow_04bioxt - Flow_0q2chl1 - Flow_1rrn9dm - - - ${notInvolvedModuleOwnerListSize > 0} - - - ${moduleOwnerListSize > 0} - + + ${pass} @@ -129,11 +120,6 @@ ${!pass} - - Flow_11i64js - Flow_1jjyqj0 - Flow_1wdzyax - Flow_1wdzyax Flow_0q2chl1 @@ -148,7 +134,7 @@ Flow_0n3x332 - Flow_1mwm3jy + Flow_1f6uwa2 Flow_1mwm3jy @@ -185,7 +171,10 @@ Flow_1u1h3jz - + + + ${!skip} + ${designEngineerListSize == 0} @@ -195,11 +184,23 @@ ${!pass} - ${pass} + + Flow_1f6uwa2 + Flow_1wjpfr4 + Flow_1mwm3jy + + + + Flow_1wjpfr4 + + + ${skip} + + Flow_1jjyqj0 @@ -208,15 +209,14 @@ ${nrOfInstances == nrOfCompletedInstances} - Flow_18i416j + Flow_0z02blx - Flow_1al6zeq - Flow_1m13a5m + Flow_0qoyqbk Flow_11c0pso ${nrOfInstances == nrOfCompletedInstances} @@ -250,10 +250,25 @@ - Flow_18i416j - Flow_1m13a5m + Flow_0z02blx + Flow_1i2eq8b - + + + Flow_1i2eq8b + Flow_18wkchm + Flow_0qoyqbk + + + + Flow_18wkchm + + + ${skip} + + + ${!skip} + Flow_132fp4x @@ -268,6 +283,16 @@ Flow_0obo4r2 Flow_10o9sl2 + + Flow_11i64js + Flow_1wdzyax + Flow_1jjyqj0 + + + Flow_0q2chl1 + Flow_04bioxt + Flow_1rrn9dm + @@ -335,7 +360,7 @@ Flow_0j9t3br - Flow_1y4773i + Flow_14vzop0 Flow_1wjzl0u ${nrOfInstances == nrOfCompletedInstances} @@ -356,9 +381,23 @@ Flow_1lw0nd8 - Flow_1y4773i + Flow_0xcpnrt - + + Flow_0xcpnrt + Flow_0zm7wyc + Flow_14vzop0 + + + + Flow_0zm7wyc + + + ${skip} + + + ${!skip} + @@ -383,13 +422,13 @@ Flow_0sdhvpq - Flow_09obdrn + Flow_06tovlr Flow_0uq7eff - Flow_09obdrn + Flow_0veoc18 Flow_0uq7eff Flow_0stb0ce @@ -420,7 +459,6 @@ Flow_1sx8sgp - ${designEngineerListSize == 0} @@ -435,6 +473,21 @@ ${pass} + + Flow_06tovlr + Flow_0veoc18 + Flow_1o6vmld + + + + ${!skip} + + + Flow_1o6vmld + + + ${skip} + Flow_0rkq2tw @@ -546,7 +599,7 @@ Flow_0pc4bzx - Flow_11r05ia + Flow_1xw5o1x Flow_1im30fq ${nrOfInstances == nrOfCompletedInstances} @@ -558,7 +611,7 @@ Flow_0nzw80j - Flow_11r05ia + Flow_1k84u1n @@ -569,7 +622,21 @@ ${pass} - + + Flow_1k84u1n + Flow_1yxa2g2 + Flow_1xw5o1x + + + + Flow_1yxa2g2 + + + ${skip} + + + ${!skip} + Flow_0gtzh06 @@ -585,13 +652,13 @@ Flow_02naor5 - Flow_16y47ea + Flow_0zu6owj Flow_1gwfkl5 - Flow_16y47ea + Flow_1kr2i1f Flow_1gwfkl5 Flow_0jmj18j @@ -622,7 +689,6 @@ Flow_1tge35x - ${designEngineerListSize == 0} @@ -637,6 +703,21 @@ ${pass} + + Flow_0zu6owj + Flow_1kr2i1f + Flow_102whmg + + + + ${!skip} + + + Flow_102whmg + + + ${skip} + @@ -750,933 +831,1051 @@ - + - - - - - - - - - - - - - - - - - - - - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - + + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - + + + + + + + + + + - - + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - + - + - + - + - + - + - - - - + + + + + + - - - - + + + + - + - - - - - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - + + - - + + - + + + + + + + + - - - + + - - - + + - - - - - + + + + + - - - - - - + + + - - - + + + - + - - + + - + - - + + - + + + + + + + + - - + + - - + + + + + + + + + + + - - + + + - + - - - - - - - - - - + - + - + - + - + - + - + - + + + + + + + - - + + - - + + - - - - + + + + - + - - + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - - - + + + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + - - + + - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + + + + + + + - - + + - - + + - - - - + + + + - + - - + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - + - + - + - + - + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - - - + + + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + - - - + + - - - + + - - - - - - + + + - - - + + + - - - - - - - - - - - + + + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - + - - - - + + + + - - - - + + + + + + - + - + - - - + + + + + + + + + + + diff --git a/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn b/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn index 56c72915..c833cc25 100644 --- a/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn +++ b/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn @@ -107,21 +107,12 @@ ${moduleOwnerListSize > 0} - - Flow_04bioxt - Flow_0q2chl1 - Flow_1rrn9dm - - - ${notInvolvedModuleOwnerListSize > 0} - - - ${moduleOwnerListSize > 0} - + + ${pass} @@ -129,11 +120,6 @@ ${!pass} - - Flow_11i64js - Flow_1jjyqj0 - Flow_1wdzyax - Flow_1wdzyax Flow_0q2chl1 @@ -148,7 +134,7 @@ Flow_0n3x332 - Flow_1mwm3jy + Flow_1f6uwa2 Flow_1mwm3jy @@ -185,7 +171,10 @@ Flow_1u1h3jz - + + + ${!skip} + ${designEngineerListSize == 0} @@ -195,11 +184,23 @@ ${!pass} - ${pass} + + Flow_1f6uwa2 + Flow_1wjpfr4 + Flow_1mwm3jy + + + + Flow_1wjpfr4 + + + ${skip} + + Flow_1jjyqj0 @@ -208,15 +209,14 @@ ${nrOfInstances == nrOfCompletedInstances} - Flow_18i416j + Flow_0z02blx - Flow_1al6zeq - Flow_1m13a5m + Flow_0qoyqbk Flow_11c0pso ${nrOfInstances == nrOfCompletedInstances} @@ -250,10 +250,25 @@ - Flow_18i416j - Flow_1m13a5m + Flow_0z02blx + Flow_1i2eq8b - + + + Flow_1i2eq8b + Flow_18wkchm + Flow_0qoyqbk + + + + Flow_18wkchm + + + ${skip} + + + ${!skip} + Flow_132fp4x @@ -268,6 +283,16 @@ Flow_0obo4r2 Flow_10o9sl2 + + Flow_11i64js + Flow_1wdzyax + Flow_1jjyqj0 + + + Flow_0q2chl1 + Flow_04bioxt + Flow_1rrn9dm + @@ -335,7 +360,7 @@ Flow_0j9t3br - Flow_1y4773i + Flow_14vzop0 Flow_1wjzl0u ${nrOfInstances == nrOfCompletedInstances} @@ -356,9 +381,23 @@ Flow_1lw0nd8 - Flow_1y4773i + Flow_0xcpnrt - + + Flow_0xcpnrt + Flow_0zm7wyc + Flow_14vzop0 + + + + Flow_0zm7wyc + + + ${skip} + + + ${!skip} + @@ -383,13 +422,13 @@ Flow_0sdhvpq - Flow_09obdrn + Flow_06tovlr Flow_0uq7eff - Flow_09obdrn + Flow_0veoc18 Flow_0uq7eff Flow_0stb0ce @@ -420,7 +459,6 @@ Flow_1sx8sgp - ${designEngineerListSize == 0} @@ -435,6 +473,21 @@ ${pass} + + Flow_06tovlr + Flow_0veoc18 + Flow_1o6vmld + + + + ${!skip} + + + Flow_1o6vmld + + + ${skip} + Flow_0rkq2tw @@ -546,7 +599,7 @@ Flow_0pc4bzx - Flow_11r05ia + Flow_1xw5o1x Flow_1im30fq ${nrOfInstances == nrOfCompletedInstances} @@ -558,7 +611,7 @@ Flow_0nzw80j - Flow_11r05ia + Flow_1k84u1n @@ -569,7 +622,21 @@ ${pass} - + + Flow_1k84u1n + Flow_1yxa2g2 + Flow_1xw5o1x + + + + Flow_1yxa2g2 + + + ${skip} + + + ${!skip} + Flow_0gtzh06 @@ -585,13 +652,13 @@ Flow_02naor5 - Flow_16y47ea + Flow_0zu6owj Flow_1gwfkl5 - Flow_16y47ea + Flow_1kr2i1f Flow_1gwfkl5 Flow_0jmj18j @@ -622,7 +689,6 @@ Flow_1tge35x - ${designEngineerListSize == 0} @@ -637,6 +703,21 @@ ${pass} + + Flow_0zu6owj + Flow_1kr2i1f + Flow_102whmg + + + + ${!skip} + + + Flow_102whmg + + + ${skip} + @@ -750,933 +831,1051 @@ - + - - - - - - - - - - - - - - - - - - - - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - + + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - + + + + + + + + + + - - + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - + - + - + - + - + - + - - - - + + + + + + - - - - + + + + - + - - - - - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - + + - - + + - + + + + + + + + - - - + + - - - + + - - - - - + + + + + - - - - - - + + + - - - + + + - + - - + + - + - - + + - + + + + + + + + - - + + - - + + + + + + + + + + + - - + + + - + - - - - - - - - - - + - + - + - + - + - + - + - + + + + + + + - - + + - - + + - - - - + + + + - + - - + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - - - + + + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + - - + + - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + + + + + + + - - + + - - + + - - - - + + + + - + - - + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - + - + - + - + - + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - - - + + + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + - - - + + - - - + + - - - - - - + + + - - - + + + - - - - - - - - - - - + + + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - + - - - - + + + + - - - - + + + + + + - + - + - - - + + + + + + + + + + +