From 4484a9abdbb429e61247c8d8dfe9f9a96e734fda Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 26 Jan 2024 09:56:18 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81?= =?UTF-8?q?OA=E7=9A=84BIZTRANSACTIONID=E5=80=BC=E4=B8=BASPRS+=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WebServiceOAServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index cbf4e8c1..f1f788a8 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -241,7 +241,8 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { JsonSend jsonSend = new JsonSend(); HEAD head = new HEAD(); head.setACCOUNT("OA"); - head.setBIZTRANSACTIONID("SYC_161320210206133219"); +// head.setBIZTRANSACTIONID("SYC_161320210206133219"); + head.setBIZTRANSACTIONID("SPRS" + System.currentTimeMillis()); head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("TEST_oa201611241710"); @@ -330,7 +331,8 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { JsonSend jsonSend = new JsonSend(); HEAD head = new HEAD(); head.setACCOUNT("OA"); - head.setBIZTRANSACTIONID("SYC_161320210206133219"); +// head.setBIZTRANSACTIONID("SYC_161320210206133219"); + head.setBIZTRANSACTIONID("SPRS" + System.currentTimeMillis()); head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("oa201611241710"); @@ -382,7 +384,8 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { JsonSend jsonSend = new JsonSend(); HEAD head = new HEAD(); head.setACCOUNT("OA"); - head.setBIZTRANSACTIONID("SYC_161320210206133219"); +// head.setBIZTRANSACTIONID("SYC_161320210206133219"); + head.setBIZTRANSACTIONID("SPRS" + System.currentTimeMillis()); head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("oa201611241710"); @@ -502,7 +505,8 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { JsonSend jsonSend = new JsonSend(); HEAD head = new HEAD(); head.setACCOUNT("OA"); - head.setBIZTRANSACTIONID("SYC_161320210206133219"); +// head.setBIZTRANSACTIONID("SYC_161320210206133219"); + head.setBIZTRANSACTIONID("SPRS" + System.currentTimeMillis()); head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("oa201611241710"); From b6af89cd8ead9c2a1f5853f426aa78341fe07797 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 26 Jan 2024 10:06:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?Revert=20"fix:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=91=E9=80=81OA=E7=9A=84BIZTRANSACTIONID=E5=80=BC=E4=B8=BA?= =?UTF-8?q?SPRS+=E6=97=B6=E9=97=B4=E6=88=B3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4484a9abdbb429e61247c8d8dfe9f9a96e734fda. --- .../service/impl/WebServiceOAServiceImpl.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index f1f788a8..cbf4e8c1 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -241,8 +241,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { JsonSend jsonSend = new JsonSend(); HEAD head = new HEAD(); head.setACCOUNT("OA"); -// head.setBIZTRANSACTIONID("SYC_161320210206133219"); - head.setBIZTRANSACTIONID("SPRS" + System.currentTimeMillis()); + head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("TEST_oa201611241710"); @@ -331,8 +330,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { JsonSend jsonSend = new JsonSend(); HEAD head = new HEAD(); head.setACCOUNT("OA"); -// head.setBIZTRANSACTIONID("SYC_161320210206133219"); - head.setBIZTRANSACTIONID("SPRS" + System.currentTimeMillis()); + head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("oa201611241710"); @@ -384,8 +382,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { JsonSend jsonSend = new JsonSend(); HEAD head = new HEAD(); head.setACCOUNT("OA"); -// head.setBIZTRANSACTIONID("SYC_161320210206133219"); - head.setBIZTRANSACTIONID("SPRS" + System.currentTimeMillis()); + head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("oa201611241710"); @@ -505,8 +502,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { JsonSend jsonSend = new JsonSend(); HEAD head = new HEAD(); head.setACCOUNT("OA"); -// head.setBIZTRANSACTIONID("SYC_161320210206133219"); - head.setBIZTRANSACTIONID("SPRS" + System.currentTimeMillis()); + head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("oa201611241710"); From b62ad5c7b642e5405824f0ce76668414e2f4370b Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 26 Jan 2024 18:02:44 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E6=A0=B9=E6=8D=AE=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BE=8BID=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_activiti/task/TodoTaskController.java | 10 ++++++++++ .../datas/service/IBusProcessNameService.java | 2 ++ .../service/impl/BusProcessNameServiceImpl.java | 12 ++++++++++++ 3 files changed, 24 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index bf106671..e1691b9c 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -3318,4 +3318,14 @@ public class TodoTaskController extends BaseAction { return processNew; } + + @ApiOperation(value = "根据流程实例ID查询流程编号") + @GetMapping("/getProcessNumByPrcId") + Wrapper getProcessNumByPrcId(@RequestParam("prcId") String prcId) { + String processNum = iBusProcessNameService.getProcessNumByPrcId(prcId); + if (StringUtils.isBlank(processNum)) { + return WrapMapper.error("未找到流程编号"); + } + return WrapMapper.ok(processNum); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java index e599d138..f24d787b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java @@ -26,4 +26,6 @@ public interface IBusProcessNameService extends IService { String delDB(List id); BusProcessName selectById(String id); + + String getProcessNumByPrcId(String prcId); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java index 9943b9f3..55a4e34b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNameMapper; @@ -49,4 +50,15 @@ public class BusProcessNameServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BusProcessName::getPrcId,prcId); + List busProcessNameList = list(wrapper); + if (busProcessNameList.size()>0){ + return busProcessNameList.get(0).getPrcNum(); + } else { + return null; + } + } } From 9f72feb910b0a74415992f396a83438b9f82ed54 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 29 Jan 2024 14:54:06 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E3=80=8A=E6=B5=81=E7=A8=8B=E4=B8=AD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E6=94=BF=E7=AD=96=E5=90=8D=E7=A7=B0=E3=80=8B?= =?UTF-8?q?-=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolicySolicitOpinionProcess1After.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java index 4b3fb251..54ccf9d2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java @@ -43,16 +43,16 @@ public class PolicySolicitOpinionProcess1After implements TaskListener { String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); Object lawsName = jsonForm.get("lawsName"); - Object lawsNumber = jsonForm.get("lawsNumber"); + Object lawsNo = jsonForm.get("lawsNo"); String lawsInfoName = ""; - if(lawsName != null && lawsNumber != null){ - String name = lawsName.toString()+"-"; - String number = lawsNumber.toString()+"-"; + if(lawsName != null && lawsNo != null){ + String name = "《" + lawsName +"-"; + String number = lawsNo +"》-"; if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ - lawsInfoName = number+name; + lawsInfoName = number + name; } } - String prcName = lawsInfoName+"政策征求意见流程"; + String prcName = lawsInfoName + "征求意见"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From 5025679ead22486e2634cd6d6d091ec6a69f7b38 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 29 Jan 2024 15:04:10 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E3=80=8A=E6=B5=81=E7=A8=8B=E4=B8=AD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E6=94=BF=E7=AD=96=E5=90=8D=E7=A7=B0=E3=80=8B?= =?UTF-8?q?-=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolicySolicitOpinionProcess1After.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java index 54ccf9d2..e6afbb2e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java @@ -46,8 +46,8 @@ public class PolicySolicitOpinionProcess1After implements TaskListener { Object lawsNo = jsonForm.get("lawsNo"); String lawsInfoName = ""; if(lawsName != null && lawsNo != null){ - String name = "《" + lawsName +"-"; - String number = lawsNo +"》-"; + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ lawsInfoName = number + name; } From c164653767492575fed424c975356f76f47037db Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 4 Feb 2024 17:26:47 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E7=9A=84=E4=BF=AE=E6=94=B9=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E5=90=8E=E7=9A=84=E8=8A=82=E7=82=B9=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E5=90=8E=E5=88=B0=E7=AE=A1=E7=90=86=E5=91=98=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolicySolicitOpinionProcess11After.java | 7 +++++++ .../PolicySolicitOpinionProcess12After.java | 6 +++--- .../PolicySolicitOpinionProcess13After.java | 6 +++--- .../PolicySolicitOpinionProcess14After.java | 9 ++++++--- .../PolicySolicitOpinionProcess15After.java | 9 ++++++--- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java index 4f8e9749..44f7fa15 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java @@ -7,6 +7,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_main.datas.service.IPolicySolicitOpinionEOService; import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum; import org.activiti.engine.delegate.DelegateTask; @@ -23,6 +24,7 @@ public class PolicySolicitOpinionProcess11After implements TaskListener { public void notify(DelegateTask delegateTask) { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IPolicySolicitOpinionEOService policySolicitOpinionEOService = SpringContextUtil.getBean(IPolicySolicitOpinionEOService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -49,6 +51,11 @@ public class PolicySolicitOpinionProcess11After implements TaskListener { } busBean.saveBatch(addBusProcessNewList); + // 保存管理员填写的征求意见信息 + object.put("currentUserId",delegateTask.getAssignee()); + object.put("prcId",delegateTask.getProcessInstanceId()); + policySolicitOpinionEOService.batchInsert(object); + // 配置多实例 delegateTask.setVariable("shr2UserIdList", nextUserList); delegateTask.setVariable("shr2UserCount", nextUserList.size()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java index 9faa0407..84b47983 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java @@ -81,7 +81,7 @@ public class PolicySolicitOpinionProcess12After implements TaskListener { } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -89,10 +89,10 @@ public class PolicySolicitOpinionProcess12After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("djrUserId", glyUserId); delegateTask.setVariable("hqrUserIdList", new ArrayList()); delegateTask.setVariable("shr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java index ae6be652..ac33a438 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java @@ -67,7 +67,7 @@ public class PolicySolicitOpinionProcess13After implements TaskListener { } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -75,10 +75,10 @@ public class PolicySolicitOpinionProcess13After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("hqrUserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java index 789af733..954137d4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java @@ -14,6 +14,9 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; +/** + * 审定后 + */ public class PolicySolicitOpinionProcess14After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -51,7 +54,7 @@ public class PolicySolicitOpinionProcess14After implements TaskListener { delegateTask.setVariable("pzr2UserId", pzr2UserId); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -59,10 +62,10 @@ public class PolicySolicitOpinionProcess14After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("sdr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java index 2494f284..1da9b690 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 批准后 + */ public class PolicySolicitOpinionProcess15After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -53,7 +56,7 @@ public class PolicySolicitOpinionProcess15After implements TaskListener { delegateTask.setVariable("csrUserIdList", nextUserList); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -61,10 +64,10 @@ public class PolicySolicitOpinionProcess15After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); } // 存储当前节点意见 From 4f9824103a2f22a65f922f85d4040798b71cc619 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 5 Feb 2024 16:56:22 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=A0=87=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=80=A7=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=20=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E8=8A=82=E7=82=B9=E9=A9=B3=E5=9B=9E=E5=90=8E?= =?UTF-8?q?=E5=88=B0=E7=AE=A1=E7=90=86=E5=91=98=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolicyComplianceProgramReviewProcess11After.java | 3 +++ .../PolicyComplianceProgramReviewProcess12After.java | 9 ++++++--- .../PolicyComplianceProgramReviewProcess13After.java | 9 ++++++--- .../PolicyComplianceProgramReviewProcess14After.java | 9 ++++++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java index 0d50758d..2ecd318b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java @@ -17,6 +17,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 管理员节点后置处理 + */ public class PolicyComplianceProgramReviewProcess11After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java index 2ef78d28..bb298150 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java @@ -20,6 +20,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +/** + * 审核后 + */ public class PolicyComplianceProgramReviewProcess12After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -71,7 +74,7 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -79,10 +82,10 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("shr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java index 03a129a7..cb5bf693 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 审定后 + */ public class PolicyComplianceProgramReviewProcess13After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -55,7 +58,7 @@ public class PolicyComplianceProgramReviewProcess13After implements TaskListener delegateTask.setVariable("pzr2UserId", pzr2UserId); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -63,10 +66,10 @@ public class PolicyComplianceProgramReviewProcess13After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("pzr1UserId", glyUserId); delegateTask.setVariable("sdr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java index 43a1a32d..c35c3005 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 批准后 + */ public class PolicyComplianceProgramReviewProcess14After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -54,7 +57,7 @@ public class PolicyComplianceProgramReviewProcess14After implements TaskListener delegateTask.setVariable("csrUserIdList", nextUserList); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -62,10 +65,10 @@ public class PolicyComplianceProgramReviewProcess14After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); } // 存储当前节点意见 From d89aea75598fc622f9f8fd5eae6d9a56e44d4323 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 5 Feb 2024 17:01:28 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=A0=87=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=80=A7=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B5=81=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95=E4=B8=AD=E7=9A=84=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_activiti/task/TodoTaskController.java | 9 +++++++++ .../bat/wkflow/business_auth/LawsUserInfoService.java | 9 +++++++++ .../PolicyComplianceProgramReviewProcess15After.java | 9 +++++++++ .../PolicyComplianceProgramReviewProcess1After.java | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index e1691b9c..3da58153 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -2970,6 +2970,15 @@ public class TodoTaskController extends BaseAction { if(!list2.isEmpty() && "发布".equals(list2.get(0).getName())){ lawsUserInfoService.modSnByProcess(list2.get(0).getId()); } + } else if ("34".equals(busProcessName.getPrcType())) { + // 重点认证标准/政策合规性项目审查流程撤回，如果是从标准跟踪清单下发的流程 则将检查单状态改为未下发 + String mes = busProcessName.getMes(); + JSONObject jsonObject = JSONObject.parseObject(mes); + JSONObject formJson = jsonObject.getJSONObject("form"); + String checklistId = formJson.getString("checklistId"); + if (StringUtils.isNotBlank(checklistId)) { + lawsUserInfoService.processStatusChange(checklistId, 0); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 599ab5e8..c2f2e281 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -227,4 +227,13 @@ public interface LawsUserInfoService { @GetMapping("lawss/activiti/selectOnlineFile") ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName,@RequestParam("key") String key); + + /** + * 流程状态变更， 用于流程结束或流程撤回后的状态变更 + * @param trackingChecklistId 跟踪清单ID + * @param processStatus 流程状态， 0 未下发，1 进行中，2 已完成 + * @return + */ + @GetMapping("standardTrackingCheckList/processStatusChange") + ResponseMessage processStatusChange(@RequestParam("trackingChecklistId") String trackingChecklistId,@RequestParam("processStatus") Integer processStatus); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java index 6fdd7be9..932b8cfa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -29,6 +30,7 @@ public class PolicyComplianceProgramReviewProcess15After implements TaskListener IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); TaskTodoService taskTodoService = SpringContextUtil.getBean(TaskTodoService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -91,5 +93,12 @@ public class PolicyComplianceProgramReviewProcess15After implements TaskListener busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busBean.save(busProcessNew); + + // 抄送完成后修改标准跟踪清单中状态 + // 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态，修改为 已完成 + String checklistId = jsonForm.getString("checklistId"); + if (StringUtils.isNotBlank(checklistId)) { + lawsUserInfoService.processStatusChange(checklistId, 2); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java index 5455b731..30302e68 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -26,6 +27,7 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -70,6 +72,13 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener busProcessNew.setTaskInfo(delegateTask.getName()); busBean.save(busProcessNew); + // 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态，修改为 进行中 + String checklistId = jsonForm.getString("checklistId"); + if (StringUtils.isNotBlank(checklistId)) { + lawsUserInfoService.processStatusChange(checklistId, 1); + } + + if (CollectionUtils.isNotEmpty(nextUserList)) { List addBusProcessNewList = new ArrayList<>(); for (String nextUser : nextUserList) {