From 3a12d2ad88b967b3b20653c9b1a742caf8d8c250 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 1 Sep 2022 16:11:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarInterpretationNationalStandard.java | 3 +++ .../wkflow/listener/standardRead/DeptApplayAfter.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java index c1361067..ed9c5c7a 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java @@ -89,5 +89,8 @@ public class SarInterpretationNationalStandard { @ApiModelProperty(value = "风险程度") private String riskDegree; + @ApiModelProperty(value = "流程编号") + private String prcNum; + } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 44687143..0638286d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -44,7 +44,13 @@ public class DeptApplayAfter implements TaskListener{ List nextUserList = new ArrayList(); - + QueryWrapper queryWrapperByPrcNum = new QueryWrapper(); + queryWrapperByPrcNum.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName onePrcNum = busProcessNameService.getOne(queryWrapperByPrcNum); + String prcNum = ""; + if (null != onePrcNum) { + prcNum = onePrcNum.getPrcNum(); + } String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读"; //部长进行审批（1：通过） @@ -53,6 +59,7 @@ public class DeptApplayAfter implements TaskListener{ JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList")); List sarStandItems=new ArrayList<>(); List standards=new ArrayList<>(); + String finalPrcNum = prcNum; jsonArray.forEach(o -> { JSONObject os=JSONObject.parseObject(o.toString()); //分解单数据 @@ -87,6 +94,7 @@ public class DeptApplayAfter implements TaskListener{ standard.setStandNumber(object.getString("itemsNum")); standard.setInterpretationTime(new Date()); standard.setRiskDegree("0"); + standard.setPrcNum(finalPrcNum); standards.add(standard); }); From 1465811effca0458da622a86bbffdd35e440109c Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Mon, 5 Sep 2022 11:13:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=9C=AA=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/business_auth/LawsUserInfoService.java | 4 ++-- .../listener/itemlistvalidationprocess/Step3After.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) 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 77d9021f..df21723e 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 @@ -20,9 +20,9 @@ import java.util.Map; import java.util.Set; @Component -//@FeignClient(value = "FotonLAWSSystem-qk",path="/api",url="") +@FeignClient(value = "FotonLAWSSystem",path="/api",url="") //线上部署用 -@FeignClient(value = "FotonLAWSSystem-test",path="/api",url="") +//@FeignClient(value = "FotonLAWSSystem-test",path="/api",url="") @RequestMapping("/") public interface LawsUserInfoService { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java index 73d6acb0..203c12c7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java @@ -15,6 +15,7 @@ import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.collections4.CollectionUtils; import java.rmi.activation.ActivationException; import java.text.SimpleDateFormat; @@ -47,7 +48,11 @@ public class Step3After implements TaskListener { standProjectRelationDto.setStandId(object1.getString("standId")); dtoList.add(standProjectRelationDto); }); - + if(CollectionUtils.isEmpty(dtoList)){ + StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto(); + standProjectRelationDto.setProjectId(object.getString("projectId")); + dtoList.add(standProjectRelationDto); + } lawsUserInfoService.batchInsert(dtoList); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());