From e6c00560514116161a352d6736088473719696b7 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Sat, 24 Jul 2021 18:05:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E7=94=9F=E6=88=90=E5=85=AC?= =?UTF-8?q?=E5=BC=80=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=EF=BC=9B=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E9=A9=B3=E5=9B=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 6 +- .../business_slrs/dao/SarPublicIdea.java | 27 +++ .../MinisterAndDockerSignAfter.java | 15 ++ .../ResponUserSignAfter.java | 2 +- .../StartSurveyAfter.java | 22 +++ .../SummarySurveyBefore.java | 4 +- .../ydw/bat/wkflow/util/http/PageInfo.java | 168 ++++++++++++++++++ .../bat/wkflow/util/http/ResponseMessage.java | 58 ++++++ .../util/http/ResponseMessageCodeEnum.java | 20 +++ .../com/ydw/bat/wkflow/util/http/Result.java | 42 +++++ 10 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java create mode 100644 src/main/java/com/ydw/bat/wkflow/util/http/PageInfo.java create mode 100644 src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessage.java create mode 100644 src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessageCodeEnum.java create mode 100644 src/main/java/com/ydw/bat/wkflow/util/http/Result.java 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 aeafdc97..e3680dcc 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 @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.tmsps.fk.common.wrapper.Wrapper; import com.ydw.bat.wkflow.business_main.datas.dto.*; import com.ydw.bat.wkflow.business_main.datas.entity.*; +import com.ydw.bat.wkflow.business_slrs.dao.SarPublicIdea; import feign.Headers; import org.apache.ibatis.annotations.Param; import org.springframework.cloud.openfeign.FeignClient; @@ -17,7 +18,7 @@ import java.util.Map; import java.util.Set; @Component -@FeignClient(value = "FotonLAWSSystem454",path="/api",url="") +@FeignClient(value = "FotonLAWSSystem-zj",path="/api",url="") @RequestMapping("/") public interface LawsUserInfoService { @@ -101,6 +102,9 @@ public interface LawsUserInfoService { @RequestMapping(value = "sarLawsDetailedList/sar-laws-detailed-list/getStandById",method = RequestMethod.POST) public SarLawsDetailedList getStandById(@RequestParam("id") String id); + @PostMapping("/slrs/sar-public-idea/addSarPublicIdea") + public com.ydw.bat.wkflow.util.http.ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea); + diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java new file mode 100644 index 00000000..22705aa0 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java @@ -0,0 +1,27 @@ +package com.ydw.bat.wkflow.business_slrs.dao; + +import lombok.Builder; +import lombok.Data; + +import java.util.Date; + +@Data +@Builder +public class SarPublicIdea{ + + private String id; + + private String category; + + private String cid; + + private String cname; + + private Date startTime; + + private Date endTime; + + private String categoryFlag; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java index a69a84bf..658f6e3a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java @@ -36,6 +36,21 @@ public class MinisterAndDockerSignAfter implements TaskListener { if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if("1".equals(object.getString("actionFlag"))){ delegateTask.setVariable("actionFlag",1); + + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("标准法规工程师汇总填写处理意见"); + busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class)); + + QueryWrapper qw = new QueryWrapper(); + qw.isNull("task_id"); + List list = busBean.list(qw); + if(list == null || list.isEmpty()){ + busBean.save(busProcessNewNext); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java index 8636fe24..f7d7776b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java @@ -115,7 +115,7 @@ public class ResponUserSignAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("标准法规工程师调研汇总"); + busProcessNewNext.setTaskInfo("标准法规工程师汇总填写处理意见"); busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class)); busBean.save(busProcessNewNext); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java index 4ed6bed6..ebdc7ecc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java @@ -2,13 +2,17 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess; 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; 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_slrs.dao.SarPublicIdea; import com.ydw.bat.wkflow.util.SpringContextUtil; +import com.ydw.bat.wkflow.util.http.ResponseMessage; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -16,8 +20,12 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; public class StartSurveyAfter implements TaskListener { + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + @Override public void notify(DelegateTask delegateTask) { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); @@ -113,5 +121,19 @@ public class StartSurveyAfter implements TaskListener { busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class)); busBean.save(busProcessNewNext); } + + //发起公开征求意见 + SarPublicIdea sarPublicIdea = SarPublicIdea.builder() + .id(UUID.randomUUID().toString()) + .category("标准") + .cid(object.getString("cid")) + .cname(object.getString("cname")) + .startTime(new Date()) + .endTime(new Date()) + .build(); + ResponseMessage result = lawsUserInfoService.addSarPublicIdea(sarPublicIdea); + if(!result.isOk()){ + throw new ActivitiException("发起公开征求意见失败"); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java index 2a601fc4..d2715bed 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java @@ -23,7 +23,7 @@ public class SummarySurveyBefore implements TaskListener { if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); - JSONObject obj= JSON.parseObject(one1.getMesg()); + /*JSONObject obj= JSON.parseObject(one1.getMesg()); //看全局变量里有没有存Summary,有的话就直接走，没的话就就初始化 JSONArray summaryList=JSON.parseArray(delegateTask.getVariable("summaryList",String.class)); @@ -57,7 +57,7 @@ public class SummarySurveyBefore implements TaskListener { obj.put("summaryList",summaryList); delegateTask.setVariable("summaryList",summaryList.toJSONString()); - one1.setMesg(obj.toJSONString()); + one1.setMesg(obj.toJSONString());*/ one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/util/http/PageInfo.java b/src/main/java/com/ydw/bat/wkflow/util/http/PageInfo.java new file mode 100644 index 00000000..0dbd9f38 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/util/http/PageInfo.java @@ -0,0 +1,168 @@ +package com.ydw.bat.wkflow.util.http; + +import org.apache.commons.lang3.StringUtils; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class PageInfo { + private Integer pageNo; + private Integer pageSize; + private Long count; + private Long pageCount; + private List list; + private List> title; + private Map ext; + private String orderBy; + + public PageInfo() { + this.pageNo = 1; + this.pageSize = 10; + this.list = new ArrayList(); + this.title = new ArrayList(); + this.ext = new HashMap(); + this.orderBy = ""; + this.pageSize = 1; + } + + public PageInfo(HttpServletRequest request) { + this.pageNo = 1; + this.pageSize = 10; + this.list = new ArrayList(); + this.title = new ArrayList(); + this.ext = new HashMap(); + this.orderBy = ""; + String no = request.getParameter("pageNo"); + if (StringUtils.isEmpty(no)) { + this.setPageNo(1); + } else if (StringUtils.isNumeric(no)) { + this.setPageNo(Integer.parseInt(no)); + } + + String size = request.getParameter("pageSize"); + if (StringUtils.isEmpty(size)) { + this.setPageSize(10); + } + + if (StringUtils.isNumeric(size)) { + this.setPageSize(Integer.parseInt(size)); + } + + String orderByParam = request.getParameter("orderBy"); + if (StringUtils.isNotBlank(orderByParam)) { + this.setOrderBy(orderByParam); + } + + } + + public PageInfo(Integer pageNo, Integer pageSize) { + this(pageNo, pageSize, 0L); + } + + public PageInfo(Integer pageNo, Integer pageSize, Long count) { + this(pageNo, pageSize, count, new ArrayList()); + } + + public PageInfo(Integer pageNo, Integer pageSize, Long count, List list) { + this.pageNo = 1; + this.pageSize = 10; + this.list = new ArrayList(); + this.title = new ArrayList(); + this.ext = new HashMap(); + this.orderBy = ""; + if (pageNo == null) { + pageNo = 1; + } + + if (pageSize == null) { + pageSize = 10; + } + + this.setCount(count); + this.setPageNo(Math.abs(pageNo)); + this.setPageSize(Math.abs(pageSize)); + this.setList(list); + } + + public Long getCount() { + return this.count; + } + + public void setCount(Long count) { + this.count = count; + if ((long) this.pageSize >= count) { + this.pageNo = 1; + } + + } + + public Integer getPageNo() { + return this.pageNo; + } + + public void setPageNo(Integer pageNo) { + this.pageNo = pageNo; + } + + public Integer getPageSize() { + return this.pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize <= 0 ? 10 : pageSize; + } + + public List getList() { + return this.list; + } + + public PageInfo setList(List list) { + this.list = list; + return this; + } + + public String getOrderBy() { + return this.orderBy; + } + + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + public Map getExt() { + return this.ext; + } + + public void setExt(Map ext) { + this.ext = ext; + } + + public Long getPageCount() { + if (this.count % (long) this.pageSize != 0L) { + this.pageCount = this.count / (long) this.pageSize + 1L; + } else { + this.pageCount = this.count / (long) this.pageSize; + } + + if (this.pageCount < 1L) { + this.pageCount = 1L; + } + + return this.pageCount; + } + + public void setPageCount(Long pageCount) { + this.pageCount = pageCount; + } + + public List> getTitle() { + return this.title; + } + + public void setTitle(List> title) { + this.title = title; + } +} \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessage.java b/src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessage.java new file mode 100644 index 00000000..5227ece8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessage.java @@ -0,0 +1,58 @@ +package com.ydw.bat.wkflow.util.http; + +public class ResponseMessage { + private String respCode; + private String respMsg; + private T data; + private boolean ok; + + public ResponseMessage() { + } + + public ResponseMessage(String respCode, String message) { + this.respCode = respCode; + this.respMsg = message; + } + + public ResponseMessage(String respCode, String message, boolean ok) { + this.respCode = respCode; + this.respMsg = message; + this.ok = ok; + } + + public ResponseMessage(String respCode, String message, boolean ok, T data) { + this.respCode = respCode; + this.respMsg = message; + this.ok = ok; + this.data = data; + } + + public String getRespCode() { + return this.respCode; + } + + public void setRespCode(String respCode) { + this.respCode = respCode; + } + + public String getMessage() { + return this.respMsg; + } + + public void setMessage(String message) { + this.respMsg = message; + } + + public T getData() { + return this.data; + } + + public void setData(T data) { + this.data = data; + } + + public boolean isOk() { + return this.ok; + } +} + diff --git a/src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessageCodeEnum.java b/src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessageCodeEnum.java new file mode 100644 index 00000000..3e9f5b73 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessageCodeEnum.java @@ -0,0 +1,20 @@ +package com.ydw.bat.wkflow.util.http; + +public enum ResponseMessageCodeEnum { + SUCCESS("0"), + ERROR("-1"), + VALID_ERROR("1000"), + SAVE_SUCCESS("r0001"), + UPDATE_SUCCESS("r0002"), + REMOVE_SUCCESS("r0003"); + + private String code; + + private ResponseMessageCodeEnum(String code) { + this.code = code; + } + + public String getCode() { + return this.code; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/util/http/Result.java b/src/main/java/com/ydw/bat/wkflow/util/http/Result.java new file mode 100644 index 00000000..b0851e47 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/util/http/Result.java @@ -0,0 +1,42 @@ +package com.ydw.bat.wkflow.util.http; + +public class Result { + public Result() { + } + + public static ResponseMessage success() { + return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS.getCode(), "", true); + } + + public static ResponseMessage success(String code, T t) { + return new ResponseMessage(code, "", true, t); + } + + public static ResponseMessage success(String code, String message) { + return new ResponseMessage(code, message); + } + + public static ResponseMessage success(String code, String message, T t) { + return new ResponseMessage(code, message, true, t); + } + + public static ResponseMessage success(T t) { + return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS.getCode(), "", true, t); + } + + public static ResponseMessage error() { + return error(""); + } + + public static ResponseMessage error(String message) { + return error(ResponseMessageCodeEnum.ERROR.getCode(), message); + } + + public static ResponseMessage error(String code, String message) { + return error(code, message, (Object)null); + } + + public static ResponseMessage error(String code, String message, T t) { + return new ResponseMessage(code, message, false, t); + } +} From 23718f148edd733adf8416382528df9916134ecb Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Wed, 28 Jul 2021 18:18:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update:=E4=BF=AE=E5=A4=8D=E4=BF=A9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardCommentProcess/StartSurveyAfter.java | 5 ++--- .../bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java index 4ed6bed6..f4b8c77a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java @@ -60,9 +60,8 @@ public class StartSurveyAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); -// object.getString("standName") - String standName = ""; - String prcName = standName+"标准征求意见流程"; + String standName = object.getString("cid"); + String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java index cf7a81f1..18eb1c05 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java @@ -66,9 +66,8 @@ public class StartSurveyAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); -// object.getString("standName") - String standName = ""; - String prcName = standName+"标准调研流程"; + String standName = object.getString("title"); + String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From c5539aabc1812988bf8e1ef9659f08cd490d938e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 29 Jul 2021 10:14:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/dto/PCA/PCAchildren.java | 8 ++ .../datas/dto/PCA/PCAdataList.java | 9 ++ .../PCAComplianceAssessmentAfter.java | 2 +- .../PCAbafgManagerApproveAfter.java | 13 +- .../PCAdlApproveAfter.java | 128 +++++++++++++++++- .../PCAffLiableDistributeAfter.java | 14 +- 6 files changed, 155 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java index 892291b0..0a66d9a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java @@ -22,4 +22,12 @@ public class PCAchildren { private String workPeople; private String workPeopleId; + private String noCompliance; + private String zcNoCompliance; + private String complianceReasons; + private String countermeasures; + private String zcCountermeasures; + private Date zcCompletionTime; + private Date completionTime; + private String zcComplianceReasons; } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java index 45e92196..e34a6510 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java @@ -33,4 +33,13 @@ public class PCAdataList { private String workPeopleId; private List children; + private String noCompliance; + private String zcNoCompliance; + private String complianceReasons; + private String countermeasures; + private String zcCountermeasures; + private Date zcCompletionTime; + private Date completionTime; + private String zcComplianceReasons; + } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index 758bd50e..82f72ed1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -11,6 +11,7 @@ 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.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -85,6 +86,5 @@ public class PCAComplianceAssessmentAfter implements TaskListener { busBean.save(busProcessNewNext); } } - } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java index 11846b65..1e85584d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java @@ -102,14 +102,16 @@ public class PCAbafgManagerApproveAfter implements TaskListener { } } }else { - List busProcessNews=busBean.findLastworkPeople("Projectcomplianceassessment6",delegateTask.getProcessInstanceId()); + List busProcessNews=busBean.findLastworkPeople("Projectcomplianceassessment10",delegateTask.getProcessInstanceId()); PCAtotal res = new PCAtotal(); for (BusProcessNew bus:busProcessNews) { PCAtotal pcAtotal=JSONObject.parseObject(bus.getMesg(),PCAtotal.class); - if (StringUtils.isNotEmpty(res.getBZFlag())){ - res.getDataList().addAll(pcAtotal.getDataList()); - }else { - BeanUtils.copyProperties(pcAtotal,res); + if ("1".equals(pcAtotal.getBZFlag())) { + if (StringUtils.isNotEmpty(res.getBZFlag())) { + res.getDataList().addAll(pcAtotal.getDataList()); + } else { + BeanUtils.copyProperties(pcAtotal, res); + } } } if (nextUserList != null && !nextUserList.isEmpty()) { @@ -126,5 +128,6 @@ public class PCAbafgManagerApproveAfter implements TaskListener { } } } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index d848255d..164b8c7e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -4,6 +4,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; 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.dto.PCA.PCAchildren; import com.ydw.bat.wkflow.business_main.datas.dto.PCA.PCAtotal; import com.ydw.bat.wkflow.business_main.datas.dto.SarStandUnqualified; import com.ydw.bat.wkflow.business_main.datas.dto.SarStandardComplianceProductAssess; @@ -41,16 +42,130 @@ public class PCAdlApproveAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - //后续节点所需要的数据 List nextUserList=new ArrayList<>(); - PCAtotal res =JSONObject.parseObject(datas.getFormValsJson(),PCAtotal.class); - //不一致项 存储集合 - List standUnqualifieds=new ArrayList<>(); - //评估结果存储集合 - List sarStandardComplianceProductAssesses=new ArrayList<>(); + if ("1".equals(object.get("dlFlag"))) { + //后续节点所需要的数据 + PCAtotal res = JSONObject.parseObject(datas.getFormValsJson(), PCAtotal.class); + //不一致项 存储集合 + List standUnqualifieds = new ArrayList<>(); + //评估结果存储集合 + List sarStandardComplianceProductAssesses = new ArrayList<>(); + + res.getDataList().forEach(pcAdataList -> { + //标准一级别 + if (null != pcAdataList.getNoCompliance()) { + SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); + //少一个standId 不合格原因 在研在产！ + sarStandUnqualified.setStandId(pcAdataList.getStandId()); + sarStandUnqualified.setStandName(pcAdataList.getStandName()); + sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); + sarStandUnqualified.setCloseState(1); + sarStandUnqualified.setCreateTime(new Date()); + sarStandUnqualified.setProductName(res.getProjectName()); + sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); + sarStandUnqualified.setProductType("research"); + sarStandUnqualified.setReason(pcAdataList.getNoCompliance()); + sarStandUnqualified.setPlanCloseTime(pcAdataList.getCompletionTime()); + standUnqualifieds.add(sarStandUnqualified); + } + + if (null != pcAdataList.getZcNoCompliance()) { + SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); + //少一个standId 不合格原因 在研在产！ + sarStandUnqualified.setStandId(pcAdataList.getStandId()); + sarStandUnqualified.setStandName(pcAdataList.getStandName()); + sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); + sarStandUnqualified.setCloseState(1); + sarStandUnqualified.setCreateTime(new Date()); + sarStandUnqualified.setProductName(res.getProjectName()); + sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); + sarStandUnqualified.setReason(pcAdataList.getZcNoCompliance()); + sarStandUnqualified.setProductType("product"); + sarStandUnqualified.setPlanCloseTime(pcAdataList.getZcCompletionTime()); + standUnqualifieds.add(sarStandUnqualified); + } + //合估评规 结果！ + SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess(); +// sarStandard.setProductLineId(o.getProductLine()); + sarStandard.setStandName(pcAdataList.getStandName()); + sarStandard.setStandNumber(pcAdataList.getStandId()); + //111 + sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime()); + sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures()); + sarStandard.setProductionCompliance(pcAdataList.getZcNoCompliance()); + sarStandard.setResearchCompletionTime(pcAdataList.getCompletionTime()); + sarStandard.setResearchCountermeasures(pcAdataList.getCountermeasures()); + sarStandard.setResearchNonCompliance(pcAdataList.getNoCompliance()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); +// simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ"))) + sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj()); + sarStandardComplianceProductAssesses.add(sarStandard); + //遍历条目 + for (PCAchildren pcAchildren : pcAdataList.getChildren()) { + if (null != pcAchildren.getNoCompliance()) { + SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); + //少一个standId 不合格原因 在研在产！ + sarStandUnqualified.setStandId(pcAchildren.getStandId()); + sarStandUnqualified.setStandName(pcAdataList.getStandName()); + sarStandUnqualified.setItemsNum(pcAchildren.getItemsNum()); + sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); + sarStandUnqualified.setItemsName(pcAchildren.getItemsName()); + sarStandUnqualified.setCloseState(1); + sarStandUnqualified.setCreateTime(new Date()); + sarStandUnqualified.setProductName(res.getProjectName()); + sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); + sarStandUnqualified.setProductType("research"); + sarStandUnqualified.setReason(pcAchildren.getNoCompliance()); + sarStandUnqualified.setPlanCloseTime(pcAchildren.getCompletionTime()); + standUnqualifieds.add(sarStandUnqualified); + } + + if (null != pcAdataList.getZcNoCompliance()) { + SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); + //少一个standId 不合格原因 在研在产！ + sarStandUnqualified.setStandId(pcAchildren.getStandId()); + sarStandUnqualified.setStandName(pcAdataList.getStandName()); + sarStandUnqualified.setItemsNum(pcAchildren.getItemsNum()); + sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); + sarStandUnqualified.setItemsName(pcAchildren.getItemsName()); + sarStandUnqualified.setCloseState(1); + sarStandUnqualified.setCreateTime(new Date()); + sarStandUnqualified.setProductName(res.getProjectName()); + sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); + sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm()); + sarStandUnqualified.setReason(pcAchildren.getZcNoCompliance()); + sarStandUnqualified.setProductType("product"); + sarStandUnqualified.setPlanCloseTime(pcAchildren.getZcCompletionTime()); + standUnqualifieds.add(sarStandUnqualified); + } +//合估评规 结果！ + SarStandardComplianceProductAssess sarStandardChild = new SarStandardComplianceProductAssess(); + // sarStandard.setProductLineId(o.getProductLine()); + sarStandardChild.setStandName(pcAdataList.getStandName()); + sarStandardChild.setStandNumber(pcAdataList.getStandId()); + sarStandardChild.setProductionCompletionTime(pcAchildren.getZcCompletionTime()); + sarStandardChild.setProductionCountermeasures(pcAchildren.getZcCountermeasures()); + sarStandardChild.setProductionCompliance(pcAchildren.getZcNoCompliance()); + sarStandardChild.setResearchCompletionTime(pcAchildren.getCompletionTime()); + sarStandardChild.setResearchCountermeasures(pcAchildren.getCountermeasures()); + sarStandardChild.setResearchNonCompliance(pcAchildren.getNoCompliance()); + sarStandardChild.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); + sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj()); + sarStandardComplianceProductAssesses.add(sarStandardChild); + } + }); + //数据入库！！！！ + lawsUserInfoService.addsarStandUnqualified(standUnqualifieds); + lawsUserInfoService.addProduct(sarStandardComplianceProductAssesses); + delegateTask.setVariable("dlFlag","1"); + }else { + delegateTask.setVariable("dlFlag","2"); + nextUserList.add(String.valueOf(delegateTask.getVariable("sum"))); + } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser",String.class); @@ -67,7 +182,6 @@ public class PCAdlApproveAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见1 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index d4533217..6ecd025b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -17,6 +17,7 @@ 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.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.springframework.beans.BeanUtils; @@ -48,6 +49,8 @@ public class PCAffLiableDistributeAfter implements TaskListener { //准备标准数据 Map mapData=new HashMap<>(); pcAtotal.getDataList().forEach(pcAdataList -> { + List pcAchildren=new ArrayList<>(); + pcAdataList.setChildren(pcAchildren); mapData.put(pcAdataList.getStandId(),pcAdataList); }); Map map=new HashMap<>(); @@ -61,9 +64,6 @@ public class PCAffLiableDistributeAfter implements TaskListener { flag++; } } - if (flag==0){ - map.get(o.getWorkPeopleId()).getDataList().add(mapData.get(o.getKey())); - } }else { PCAtotal pcs=new PCAtotal(); BeanUtils.copyProperties(pcAtotal,pcs); @@ -72,7 +72,10 @@ public class PCAffLiableDistributeAfter implements TaskListener { list.add(o); pcs.setChildren(list); List list2=new ArrayList<>(); - list2.add(mapData.get(o.getKey())); + PCAdataList adataLists=new PCAdataList(); + BeanUtils.copyProperties(mapData.get(o.getKey()),adataLists); + adataLists.setChildren(list); + list2.add(adataLists); pcs.setDataList(list2); map.put(o.getWorkPeopleId(),pcs); } @@ -104,7 +107,7 @@ public class PCAffLiableDistributeAfter implements TaskListener { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(JsonUtil.toJson(map.get(userId))); + busProcessNewNext.setMesg(String.valueOf(JSONObject.toJSON(map.get(userId)))); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); @@ -112,6 +115,5 @@ public class PCAffLiableDistributeAfter implements TaskListener { busBean.save(busProcessNewNext); } } - } } From 7651245585750da7c77058e125e25074d9c7647c Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Thu, 29 Jul 2021 16:49:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StartSurveyAfter.java | 5 ++- .../SummarySurveyBefore.java | 36 +++++++++++++++++-- .../StandardSurvey/StartSurveyAfter.java | 5 ++- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java index ebdc7ecc..bdef2d09 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java @@ -68,9 +68,8 @@ public class StartSurveyAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); -// object.getString("standName") - String standName = ""; - String prcName = standName+"标准征求意见流程"; + String standName = object.getString("cname"); + String prcName = standName+"-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java index d2715bed..62cff04f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java @@ -22,6 +22,39 @@ public class SummarySurveyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + String mesg = one1.getMesg(); + JSONObject obj = JSON.parseObject(mesg); + JSONArray array = JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class)); + if(!one1.getMesg().contains("summaryList")){ + JSONArray summaryList=new JSONArray(); + + for (Object o : array) { + JSONObject object=(JSONObject)o; + JSONArray infoList=object.getObject("info",JSONArray.class); + + for (Object o1 : infoList) { + JSONObject summaryEntity=new JSONObject(); + JSONObject info=(JSONObject)o1;//info 具体反馈的信息 + + summaryEntity.put("responUser",object.getString("id")); + summaryEntity.put("responUserName",object.getString("name")); + summaryEntity.put("department",object.getString("department")); + summaryEntity.put("dockUser",object.getString("dockUser")); + summaryEntity.put("chapterNumber",info.getString("chapterNumber"));//章节编号 + summaryEntity.put("chapterName",info.getString("chapterName"));//章节名称 + summaryEntity.put("commentText",info.getString("commentText"));//修改意见内容 + summaryEntity.put("state",null);//修改意见内容 + summaryEntity.put("stateInfo",null);//修改意见内容 + + summaryList.add(summaryEntity); + } + } + obj.put("summaryList",summaryList); + one1.setMesg(obj.toJSONString()); + } + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); /*JSONObject obj= JSON.parseObject(one1.getMesg()); @@ -58,9 +91,6 @@ public class SummarySurveyBefore implements TaskListener { delegateTask.setVariable("summaryList",summaryList.toJSONString()); one1.setMesg(obj.toJSONString());*/ - one1.setTaskId(delegateTask.getId()); - one1.setTaskInfo(delegateTask.getName()); - busBean.saveOrUpdate(one1); } } } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java index cf7a81f1..4e6cadcc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java @@ -66,9 +66,8 @@ public class StartSurveyAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); -// object.getString("standName") - String standName = ""; - String prcName = standName+"标准调研流程"; + String standName = object.getString("standName"); + String prcName = "标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);