From 4bf161ed3038251437c81d5fc1e268bf7f46b912 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 5 Aug 2022 18:37:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84=E3=80=82=20?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B9=E5=BC=8F=EF=BC=88=E5=90=8E=E7=AB=AF=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E5=A4=84=E7=90=86=E6=89=B9=E9=87=8F=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 4 ++-- .../service/IProjectLawsInventoryEOService.java | 2 +- .../impl/ProjectLawsInventoryEOServiceImpl.java | 11 ++++++++--- .../wkflow/controller/workFlowController.java | 15 +++++++++++++-- .../wkflow/feginClient/WorkFlowFeignClient.java | 12 ++++++++++-- .../feginClient/impl/WorkFlowFeignClientImpl.java | 14 ++++++++++++-- 6 files changed, 46 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 3e3cb5a99..289f60ec9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -377,8 +377,8 @@ public class ProjectLawsInventoryEOController extends JeroController change(@RequestParam Map params) { + @PostMapping(value = "/change") + public Result change(@RequestBody JSONObject params) { return this.projectLawsInventoryEOService.change(params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 675dda5e0..fde39e439 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -122,7 +122,7 @@ public interface IProjectLawsInventoryEOService extends IService list, LoginUser currentUser, int isProjectRole, String cut); - Result change(Map parmas); + Result change(JSONObject parmas); /** * 下载pdf报告 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 6c9a1a3f1..91fbcc37e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -4182,8 +4182,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl change(Map parmas) { - String ids = parmas.get("ids").toString(); + public Result change(JSONObject parmas) { + String ids = parmas.getString("ids"); if(StringUtils.isNotEmpty(ids)){ List idList = Arrays.asList(ids.split(",")); String projectLawsInventoryIds = ids; @@ -4199,6 +4199,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); @@ -4275,7 +4280,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); + JSONObject params = new JSONObject(); params.put("projectLawsInventoryIds",projectLawsInventoryIds); params.put("pIds",pIds); //根据流程实例id 、 法规清单id 删除相关流程。 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index b39663dc2..f3abd5757 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -54,8 +54,10 @@ public class workFlowController { jsonObject.put("loginUserId", currentUser.getId()); jsonObject.put("loginUserName", currentUser.getUsername()); if(StringUtils.equals(type,FlowTypeEnum.RWQRLC.getValue())){ - jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id - return this.activiti_define_start(jsonObject); + /*jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id + return this.activiti_define_start(jsonObject);*/ + jsonObject.put("processDefinitionKey", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); + return this.startTaskToConfirmProcess(jsonObject); }else if(StringUtils.equals(type,FlowTypeEnum.SJFHXSHLC.getValue())){ jsonObject.put("id", FlowTypeEnum.SJFHXSHLC.getProcessDefinitionKey()); initConditionAssessmentEO(jsonObject); @@ -203,4 +205,13 @@ public class workFlowController { public Result startLawsTechnologyEvaluationProcess(@RequestBody JSONObject jsonObject){ return workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject); } + + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + public Result startTaskToConfirmProcess(@RequestBody JSONObject jsonObject){ + return workFlowFeignClient.startTaskToConfirmProcess(jsonObject); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 1c48c7d24..401da0f62 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -84,8 +84,8 @@ public interface WorkFlowFeignClient { * @param params * @return */ - @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByProjectLawsInventoryIds",method = RequestMethod.GET) - Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestParam Map params); + @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByProjectLawsInventoryIds",method = RequestMethod.POST,headers = {"content-type=application/json"}) + Result deleteProcessInstanceByProjectLawsInventoryIds(String params); /** * 流程实例明细列表 @@ -146,6 +146,14 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"}) Result startLawsTechnologyEvaluationProcess(String jsonObject); + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + @RequestMapping(value = "/bat-wkflow/startTaskToConfirmProcess",method = RequestMethod.POST,headers = {"content-type=application/json"}) + Result startTaskToConfirmProcess(String jsonObject); + @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET) Result completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index 78da46005..707089e60 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -101,8 +101,8 @@ public class WorkFlowFeignClientImpl{ * @param params * @return */ - public Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestParam Map params){ - return workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params); + public Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestBody JSONObject params){ + return workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params.toString()); } /** @@ -167,4 +167,14 @@ public class WorkFlowFeignClientImpl{ Result stringWrapper = workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject.toString()); return Result.OK(stringWrapper.getResult()); } + + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + public Result startTaskToConfirmProcess(@RequestBody net.sf.json.JSONObject jsonObject){ + Result stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString()); + return Result.OK(stringWrapper.getResult()); + } }