From 6361f566026966f99ad118dafbb228f59d27b4a0 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 21 Dec 2021 17:02:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 4 + .../datas/dto/WG/WgDeptShow.java | 71 +++++++++++++++ .../datas/dto/WG/WgMeetingInfo.java | 73 +++++++++++++++ .../dto/WG/WgMeetingUserRelationShow.java | 33 +++++++ .../datas/dto/WG/WgNetInfoDTO.java | 61 +++++++++++++ .../business_main/datas/dto/WG/WgPayInfo.java | 68 ++++++++++++++ .../datas/dto/WG/WgStandorpolicyInfo.java | 79 +++++++++++++++++ .../datas/dto/WG/WgWorkGroupShowDTO.java | 88 +++++++++++++++++++ .../itemlistvalidationprocess/Step1After.java | 14 +++ .../itemlistvalidationprocess/Step3After.java | 13 +++ .../bzApproveAfter.java | 14 +++ .../confirmAfter.java | 15 ++++ .../itemlistvalidationprocessStartAfter.java | 14 +++ .../DirectorChooseAfter.java | 8 +- .../EngineerReviseDoneAfter.java | 78 ++++++++++++++-- .../WriteMaterialAfter.java | 2 - .../WriteMaterialBefore.java | 5 -- .../SRPManagerApproveAfter.java | 1 + 18 files changed, 626 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgDeptShow.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgMeetingInfo.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgMeetingUserRelationShow.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgNetInfoDTO.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgPayInfo.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgStandorpolicyInfo.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgWorkGroupShowDTO.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 506885ee..792fdce9 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 @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.business_auth; import com.ydw.bat.wkflow.business_main.datas.dto.*; +import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgWorkGroupShowDTO; import com.ydw.bat.wkflow.business_main.datas.entity.*; import com.ydw.bat.wkflow.business_slrs.dao.*; import org.springframework.cloud.openfeign.FeignClient; @@ -166,5 +167,8 @@ public interface LawsUserInfoService { @PostMapping("/sarStandUnqualified/sar-stand-unqualified/updateBatch") public ResponseMessage updateBatch(@RequestBody List sarStandUnqualified); + @PostMapping("/wg_work_group/updateData") + public ResponseMessage wg_work_group_update(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgDeptShow.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgDeptShow.java new file mode 100644 index 00000000..950ed285 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgDeptShow.java @@ -0,0 +1,71 @@ +package com.ydw.bat.wkflow.business_main.datas.dto.WG; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

+ * 集团参与情况 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgDept对象", description="集团参与情况") +public class WgDeptShow { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "我司在工作组排名顺序") + @TableField("dept_order") + private String deptOrder; + + @ApiModelProperty(value = "我司人员") + @TableField("dept_people_id") + private String deptPeopleId; + + @ApiModelProperty(value = "身份") + @TableField("identity") + private String identity; + + @ApiModelProperty(value = "资料") + @TableField("joinfile") + private String joinfile; + + @ApiModelProperty(value = "中文名") + private String name; + + @ApiModelProperty(value = "单位名称") + private String unit; + + @ApiModelProperty(value = "单位") + private String unitId; + + @ApiModelProperty(value = "电话") + private String phone; + + @ApiModelProperty(value = "邮箱") + private String email; + + @ApiModelProperty(value = "部门Id") + private String deptId; + + @ApiModelProperty(value = "部门名称") + private String deptName; + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgMeetingInfo.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgMeetingInfo.java new file mode 100644 index 00000000..3399d31b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgMeetingInfo.java @@ -0,0 +1,73 @@ +package com.ydw.bat.wkflow.business_main.datas.dto.WG; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; + +/** + *

+ * 参会记录及资料 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgMeetingInfo对象", description="参会记录及资料") +@TableName("wg_meeting_info") +public class WgMeetingInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "参会时间") + @TableField("meeting_time") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date meetingTime; + + @ApiModelProperty(value = "会议名称") + @TableField("meeting_name") + private String meetingName; + + + @ApiModelProperty(value = "会议报告") + @TableField("meeting_report") + private String meetingReport; + + @ApiModelProperty(value = "会议资料") + @TableField("joinfile") + private String joinfile; + + @ApiModelProperty(value = "前端id") + @TableField("join_id") + private String joinId; + + @ApiModelProperty(value = "人员信息") + @TableField(exist = false) + private List meetingPeople; + + @TableField(exist = false) + private List joinMeetingPeopleInfo; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgMeetingUserRelationShow.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgMeetingUserRelationShow.java new file mode 100644 index 00000000..b7e6dae9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgMeetingUserRelationShow.java @@ -0,0 +1,33 @@ +package com.ydw.bat.wkflow.business_main.datas.dto.WG; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-11-09 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgMeetingUserRelation对象", description="") +public class WgMeetingUserRelationShow { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "会议id") + private String meetingId; + + @ApiModelProperty(value = "人员id") + private String userId; + + @ApiModelProperty(value = "人员名称") + private String name; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgNetInfoDTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgNetInfoDTO.java new file mode 100644 index 00000000..9dbef079 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgNetInfoDTO.java @@ -0,0 +1,61 @@ +package com.ydw.bat.wkflow.business_main.datas.dto.WG; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

+ * 工作组秘书联系方式 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgNetInfo对象", description="工作组秘书联系方式") +@TableName("wg_net_info") +public class WgNetInfoDTO { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "人员id") + @TableField("net_id") + private String netId; + + + @ApiModelProperty(value = "前端id") + @TableField("join_id") + private String joinId; + + @ApiModelProperty(value = "中文名") + private String name; + + @ApiModelProperty(value = "单位名称") + private String unit; + + @ApiModelProperty(value = "单位") + private String unitId; + + @ApiModelProperty(value = "电话") + private String phone; + + @ApiModelProperty(value = "邮箱") + private String email; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgPayInfo.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgPayInfo.java new file mode 100644 index 00000000..b127ec5a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgPayInfo.java @@ -0,0 +1,68 @@ +package com.ydw.bat.wkflow.business_main.datas.dto.WG; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

+ * 支付信息 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgPayInfo对象", description="支付信息") +@TableName("wg_pay_info") +public class WgPayInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "价格") + @TableField("price") + private String price; + + @ApiModelProperty(value = "年份") + @TableField("year") + private String year; + + @ApiModelProperty(value = "支付状态（0:未支付,1:已支付）") + @TableField("status") + private String status; + + @ApiModelProperty(value = "是否计划内(0:计划内,1:计划外)") + @TableField("inplan") + private String inplan; + + @ApiModelProperty(value = "支付方式") + @TableField("pay_way") + private String payWay; + + @ApiModelProperty(value = "支付资料") + @TableField("joinfile") + private String joinfile; + + @ApiModelProperty(value = "费用列支") + @TableField("pay_info") + private String payInfo; + + @ApiModelProperty(value = "前端id") + @TableField("join_id") + private String joinId; + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgStandorpolicyInfo.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgStandorpolicyInfo.java new file mode 100644 index 00000000..b2979a29 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgStandorpolicyInfo.java @@ -0,0 +1,79 @@ +package com.ydw.bat.wkflow.business_main.datas.dto.WG; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

+ * 标准/政策 -信息 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgStandorpolicyInfo对象", description="标准/政策 -信息") +@TableName("wg_standorpolicy_info") +public class WgStandorpolicyInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "关联标准政策id") + @TableField("stand_id") + private String standId; + + @ApiModelProperty(value = "政策/标准 类别") + @TableField(exist = false) + private String categary; + + @ApiModelProperty(value = "政策/标准 编号") + @TableField(exist = false) + private String number; + + @ApiModelProperty(value = "政策/标准 年份") + @TableField(exist = false) + private String year; + + @ApiModelProperty(value = "政策标准 名称") + @TableField(exist = false) + private String name; + + @ApiModelProperty(value = "政策/标准 英文名称") + @TableField(exist = false) + private String usname; + + @ApiModelProperty(value = "文本状态") + @TableField(exist = false) + private String status; + + @ApiModelProperty(value = "参与制定情况") + @TableField(exist = false) + private String joinDevelop; + + @ApiModelProperty(value = "相关材料") + @TableField(exist = false) + private String netDatum; + + @ApiModelProperty(value = "相关材料") + @TableField(exist = false) + private String dataType; + + + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgWorkGroupShowDTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgWorkGroupShowDTO.java new file mode 100644 index 00000000..972a24af --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/WgWorkGroupShowDTO.java @@ -0,0 +1,88 @@ +package com.ydw.bat.wkflow.business_main.datas.dto.WG; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; + +/** + *

+ * 工作组主表 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgWorkGroup对象", description="工作组主表") +public class WgWorkGroupShowDTO { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "工作组id") + private String id; + + @ApiModelProperty(value = "父级id") + private String pid; + + @ApiModelProperty(value = "编号") + private String number; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "性质（0:标委会,1:分标委,2:工作组,3:政策）") + private String nature; + + @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)") + private String status; + + @ApiModelProperty(value = "换届时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date changeTime; + + @ApiModelProperty(value = "标准化工作领域") + private String standerArea; + + @ApiModelProperty(value = "备注") + private String mark; + + @ApiModelProperty(value = "0:标准化流程 1:政策课题组") + private String types; + + private String level; + + //支付信息 + List wgPayInfos; + + private String wgPayInfosDel; + + //标准政策 + List wgStandorpolicyInfos; + + //集团参与情况 + List wgDepts; + + private String wgDeptsDel; + + //秘书联系方式 + List wgNetInfos; + + private String wgNetInfosDel; + + //参会记录及资料 + List wgMeetingInfos; + + private String wgMeetingInfosDel; + + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java index 228a9f92..491542c9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java @@ -62,6 +62,20 @@ public class Step1After implements TaskListener { busProcessNameService.saveOrUpdate(one1); } + //存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ 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 f6393bd3..dd5c96e5 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 @@ -55,6 +55,19 @@ public class Step3After implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } + //存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java index 90577c95..01d708bf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java @@ -78,6 +78,20 @@ public class bzApproveAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } + //存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java index 71d9bc47..6247069e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java @@ -102,6 +102,21 @@ public class confirmAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } + + //存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java index 90719b02..6de9daa1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java @@ -54,6 +54,20 @@ public class itemlistvalidationprocessStartAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } + //存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index b0a5235b..ce8be6c1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -16,6 +16,7 @@ import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -57,7 +58,12 @@ public class DirectorChooseAfter implements TaskListener { if("1".equals(object.getString("passFlag"))) { prcName = prcName + "入会代表填写入会信息表"; - nextUserList.add(object.getString("memberId")); + JSONObject object1=object.getJSONObject("rh_pageData"); + if (object1.getString("comityOpRoleId").contains(",")){ + nextUserList.addAll(new ArrayList<>(Arrays.asList(object1.getString("comityOpRoleId").split(",")))); + }else { + nextUserList.add(object1.getString("comityOpRoleId")); + } if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); middle.addAll(nextUserList); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index 003abca2..d04cdcd8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -1,27 +1,35 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.tmsps.fk.common.util.JsonUtil; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgDeptShow; +import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgNetInfoDTO; +import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgWorkGroupShowDTO; 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.WgDept; import com.ydw.bat.wkflow.util.SpringContextUtil; +import lombok.SneakyThrows; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; +import java.rmi.activation.ActivationException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * EngineerReviseDone - 标准法规工程师汇总修订 */ public class EngineerReviseDoneAfter implements TaskListener { + @SneakyThrows @Override public void notify(DelegateTask delegateTask) { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); @@ -30,16 +38,72 @@ public class EngineerReviseDoneAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService infoService=SpringContextUtil.getBean(LawsUserInfoService.class); + //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); - delegateTask.setVariable("objectJson",object); + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); String prcName = "标准化活动入会流程-"; -// prcName = "标准化活动入会流程-" + "会议结束"; + //入库 + JSONObject object1 = object.getJSONObject("rh_pageData"); + WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO(); + if (StringUtils.isNotEmpty(object1.getString("comityName"))) { + wgWorkGroupShowDTO.setId(object1.getString("comityName")); + wgWorkGroupShowDTO.setLevel("1"); + wgWorkGroupShowDTO.setNature("1"); + if (StringUtils.isNotEmpty(object1.getString("comityNameOne"))) { + wgWorkGroupShowDTO.setId(object1.getString("comityNameOne")); + wgWorkGroupShowDTO.setLevel("2"); + wgWorkGroupShowDTO.setNature("2"); + if (StringUtils.isNotEmpty(object1.getString("comityNameTwo"))) { + wgWorkGroupShowDTO.setId(object1.getString("comityNameTwo")); + wgWorkGroupShowDTO.setLevel("3"); + wgWorkGroupShowDTO.setNature("3"); + } + } + } + wgWorkGroupShowDTO.setTypes("0"); + wgWorkGroupShowDTO.setStatus("1"); + JSONArray jsonArray=object1.getJSONArray("comityTel"); + List wgNetInfoDTOS=new ArrayList<>(); + if (!jsonArray.isEmpty()){ + for (Object o : jsonArray) { + JSONObject object2=JSONObject.parseObject(o.toString()); + WgNetInfoDTO wgNetInfoDTO=new WgNetInfoDTO(); + wgNetInfoDTO.setId(String.valueOf(UUID.randomUUID())); + wgNetInfoDTO.setWgId(wgWorkGroupShowDTO.getId()); + wgNetInfoDTO.setJoinId(String.valueOf(UUID.randomUUID())); + wgNetInfoDTO.setNetId(object2.getString("tel_nameId")); + wgNetInfoDTO.setPhone(object2.getString("tel_phone")); + wgNetInfoDTO.setEmail(object2.getString("tel_mail")); + wgNetInfoDTOS.add(wgNetInfoDTO); + } + } + wgWorkGroupShowDTO.setWgNetInfos(wgNetInfoDTOS); + + JSONArray jsonArray1=object1.getJSONArray("myPartRole"); + List wgDepts=new ArrayList<>(); + if (!jsonArray1.isEmpty()){ + for (Object o : jsonArray1) { + JSONObject jsonObject=JSONObject.parseObject(o.toString()); + WgDeptShow wgDept=new WgDeptShow(); + wgDept.setId(String.valueOf(UUID.randomUUID())); + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + wgDept.setDeptPeopleId(jsonObject.getString("fillPeopleId")); + wgDept.setIdentity(jsonObject.getString("fillPost")); + wgDept.setEmail(jsonObject.getString("fillMail")); + wgDept.setPhone(jsonObject.getString("fillTel")); + wgDept.setJoinfile(JsonUtil.toJson(jsonObject.get("fillFile"))); + wgDepts.add(wgDept); + } + } + wgWorkGroupShowDTO.setWgDepts(wgDepts); + infoService.wg_work_group_update(wgWorkGroupShowDTO); prcName = prcName + "流程结束"; //截止时间 流程描述 创建人 @@ -77,7 +141,7 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } - }else { + } else { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index dac7d739..a3a35365 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -2,7 +2,6 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; 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; @@ -30,7 +29,6 @@ public class WriteMaterialAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java index c56f7d72..5960d0ea 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -1,10 +1,5 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; -import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; -import com.ydw.bat.wkflow.business_mq.service.CreateMQService; -import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java index ef4148f9..081c751a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java @@ -85,6 +85,7 @@ public class SRPManagerApproveAfter implements TaskListener{ detailed.setInforlist2(zccTime.substring(0,zccTime.length()-1)); detailed.setInforlist3(xcxTime.substring(0,xcxTime.length()-1)); detailed.setDetailedListState("1"); + detailed.setReNewPeople(delegateTask.getVariable("createUser",String.class)); Date date=new Date(); SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); detailed.setDetailedListVision(simpleDateFormat.format(date));