From 8c7a33803302a8a397eb8410711400280881db22 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 13 Nov 2021 19:55:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?zcr:=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20+=20=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 145 ++++++++++++++++-- .../bat/wkflow/wgdEntity/WgdAssocCost.java | 50 ++++++ .../bat/wkflow/wgdEntity/WgdAssocInfo.java | 141 +++++++++++++++++ .../bat/wkflow/wgdEntity/WgdCommiInfo.java | 74 +++++++++ .../bat/wkflow/wgdEntity/WgdExReviseCost.java | 44 ++++++ .../ydw/bat/wkflow/wgdEntity/WgdMeetCost.java | 48 ++++++ 6 files changed, 491 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java create mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java create mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java create mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java create mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.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 fb88fef0..af854350 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,8 @@ package com.ydw.bat.wkflow.business_auth; 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.*; +import com.ydw.bat.wkflow.wgdEntity.*; +import io.swagger.annotations.ApiModelProperty; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Component; @@ -120,24 +122,145 @@ public interface LawsUserInfoService { public String batchInsert(@RequestBody List standProjectRelationDtos); - - + /** + * 日历显示会议日程--流程结束生成会议 （标准化活动，政策课题组） + * @param sapMeeting (id, title, type, ...) type: 1,标准化活动;2,政策课题组 + * @return 插入成功标志位 int + */ @PostMapping("/sapMeetInfo/addMeeting") public int addMeeting(@RequestBody SapMeeting sapMeeting); - @GetMapping("/sapMeetInfo/getMeetingsByMonth") - public List getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date); - + /** + * 日历显示会议日程--按年,月查找当月会议列表 （标准化活动，政策课题组） + * @param date 日期; type: 1,标准化活动;2,政策课题组 + * @return 当月会议列表 List + */ @GetMapping("/sapMeetInfo/getMeetingsByMonthType") public List getMeetingsByMonthType(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type); - @GetMapping("/sapMeetInfo/getMeetingsByDate") - public List getMeetingsByDate(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type); - @GetMapping("/sapMeetInfo/getOneById") - public SapMeeting getOneById(@RequestParam("id") String id); + /** + * 工作组数据信息统计接口-协会费用信息统计 + */ + //获取所有 + @GetMapping("wgdCensusZ/wgd-assoc-cost/getAllAssocCosts") + public List getAllWgdAssocCosts(); + //多条件查询 + @PostMapping("wgdCensusZ/wgd-assoc-cost/queryAllAssocCosts") + public List queryAllAssocCosts(WgdAssocCost wgdAssocCost); + //获取单个详情 + @GetMapping("wgdCensusZ/wgd-assoc-cost/getAssocCostById") + public WgdAssocCost getWgdAssocCostById(String id); + //编辑 + @PostMapping("wgdCensusZ/wgd-assoc-cost/modAssocCost") + int updateWgdAssocCost(WgdAssocCost wgdAssocCost); + //添加 + @PostMapping("wgdCensusZ/wgd-assoc-cost/addAssocCost") + int insertWgdAssocCost(WgdAssocCost wgdAssocCost); + //删除单个 + @GetMapping("wgdCensusZ/wgd-assoc-cost/delAssocCost") + int deleteWgdAssocCost(String id); + //批量删除 + @GetMapping("wgdCensusZ/wgd-assoc-cost/delAssocCosts") + int deleteWgdAssocCosts(String ids); + + /** + * 工作组数据信息统计接口-协会信息数据统计 + */ + @GetMapping("wgdCensusZ/wgd-assoc-info/getAllAssocInfos") + public List getAllWgdAssocInfos(); + + @PostMapping("wgdCensusZ/wgd-assoc-info/queryAllAssocInfos") + public List queryAllWgdAssocInfos(WgdAssocInfo WgdAssocInfo); + + @GetMapping("wgdCensusZ/wgd-assoc-info/getAssocInfoById") + public WgdAssocInfo getWgdAssocInfoById(String id); + + @PostMapping("wgdCensusZ/wgd-assoc-info/modAssocInfo") + int updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo); + + @PostMapping("wgdCensusZ/wgd-assoc-info/addAssocInfo") + int insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo); + + @GetMapping("wgdCensusZ/wgd-assoc-info/delAssocInfo") + int deleteWgdAssocInfo(String id); + + @GetMapping("wgdCensusZ/wgd-assoc-info/delAssocInfos") + int deleteWgdAssocInfos(String ids); + + /** + * 工作组数据信息统计接口-委员信息数据统计 + */ + + @GetMapping("wgdCensusZ/wgd-commi-info/getAllCommiInfos") + public List getAllWgdCommiInfos(); + + @PostMapping("wgdCensusZ/wgd-commi-info/queryAllCommiInfos") + public List queryAllWgdCommiInfos(WgdCommiInfo WgdCommiInfo); + + @GetMapping("wgdCensusZ/wgd-commi-info/getCommiInfoById") + public WgdCommiInfo getWgdCommiInfoById(String id); + + @PostMapping("wgdCensusZ/wgd-commi-info/modCommiInfo") + int updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo); + + @PostMapping("wgdCensusZ/wgd-commi-info/addCommiInfo") + int insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo); + + @GetMapping("wgdCensusZ/wgd-commi-info/delCommiInfo") + int deleteWgdCommiInfo(String id); + + @GetMapping("wgdCensusZ/wgd-commi-info/delCommiInfos") + int deleteWgdCommiInfos(String ids); + + /** + * 工作组数据信息统计接口-参与外部标准制修订费用统计 + */ + + @GetMapping("wgdCensusZ/wgd-ex-revise-cost/getAllExReviseCosts") + public List getAllWgdExReviseCosts(); + + @PostMapping("wgdCensusZ/wgd-ex-revise-cost/queryAllExReviseCosts") + public List queryAllWgdExReviseCosts(WgdExReviseCost WgdExReviseCost); + + @GetMapping("wgdCensusZ/wgd-ex-revise-cost/getExReviseCostById") + public WgdExReviseCost getWgdExReviseCostById(String id); + + @PostMapping("wgdCensusZ/wgd-ex-revise-cost/modExReviseCost") + int updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost); + + @PostMapping("wgdCensusZ/wgd-ex-revise-cost/addExReviseCost") + int insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost); + + @GetMapping("wgdCensusZ/wgd-ex-revise-cost/delExReviseCost") + int deleteWgdExReviseCost(String id); + + @GetMapping("wgdCensusZ/wgd-ex-revise-cost/delExReviseCosts") + int deleteWgdExReviseCosts(String ids); + + /** + * 工作组数据信息统计接口-参会费用信息统计 + */ + @GetMapping("wgdCensusZ/wgd-meet-cost/getAllMeetCosts") + public List getAllWgdMeetCosts(); + + @PostMapping("wgdCensusZ/wgd-meet-cost/queryAllMeetCosts") + public List queryAllWgdMeetCosts(WgdMeetCost WgdMeetCost); + + @GetMapping("wgdCensusZ/wgd-meet-cost/getMeetCostById") + public WgdMeetCost getWgdMeetCostById(String id); + + @PostMapping("wgdCensusZ/wgd-meet-cost/modMeetCost") + int updateWgdMeetCost(WgdMeetCost WgdMeetCost); + + @PostMapping("wgdCensusZ/wgd-meet-cost/addMeetCost") + int insertWgdMeetCost(WgdMeetCost WgdMeetCost); + + @GetMapping("wgdCensusZ/wgd-meet-cost/delMeetCost") + int deleteWgdMeetCost(String id); + + @GetMapping("wgdCensusZ/wgd-meet-cost/delMeetCosts") + int deleteWgdMeetCosts(String ids); - @PostMapping("/sapMeetInfo/getDateMeeting") - public int getDateMeeting(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("id") String id,@RequestParam("type") int type); } diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java new file mode 100644 index 00000000..a17eb25c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java @@ -0,0 +1,50 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + *

+ * 协会费用信息统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdAssocCost对象", description="协会费用信息统计") +public class WgdAssocCost{ + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会费标准") + private BigDecimal payStandard; + + @ApiModelProperty(value = "实际发生") + private BigDecimal payReality; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + @ApiModelProperty(value = "每年缴费情况") + private String annualPayment; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java new file mode 100644 index 00000000..2884fcf8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java @@ -0,0 +1,141 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * 协会信息数据统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计") +public class WgdAssocInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会员角色") + private String role; + + @ApiModelProperty(value = "参与人") + private String attend; + + @ApiModelProperty(value = "标准") + private String standard; + + @ApiModelProperty(value = "标准负责人") + private String charge; + + @ApiModelProperty(value = "责任领导") + private String leader; + + @ApiModelProperty(value = "初始入会时间") + private LocalDateTime iniTime; + + @ApiModelProperty(value = "本届入会时间") + private LocalDateTime curTime; + + @ApiModelProperty(value = "费用标准") + private BigDecimal costStandard; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + @ApiModelProperty(value = "上次缴纳时间") + private LocalDateTime lastPayTime; + + @ApiModelProperty(value = "缴费年限") + private String payPeriod; + + @ApiModelProperty(value = "经办人") + private String handler; + + @ApiModelProperty(value = "部门") + private String department; + + @ApiModelProperty(value = "协会性质") + private String asProper; + + @ApiModelProperty(value = "协会状态") + private String asStatus; + + @ApiModelProperty(value = "协会联络人") + private String asContact; + + @ApiModelProperty(value = "协会联络人电话") + private String tel; + + @ApiModelProperty(value = "协会联络人邮箱") + private String mail; + + @ApiModelProperty(value = "2017缴费") + private BigDecimal p17; + + @ApiModelProperty(value = "2018缴费") + private BigDecimal p18; + + @ApiModelProperty(value = "2019缴费") + private BigDecimal p19; + + @ApiModelProperty(value = "2020缴费") + private BigDecimal p20; + + @ApiModelProperty(value = "2021缴费") + private BigDecimal p21; + + @ApiModelProperty(value = "2022缴费") + private BigDecimal p22; + + @ApiModelProperty(value = "2023缴费") + private BigDecimal p23; + + @ApiModelProperty(value = "2024缴费") + private BigDecimal p24; + + @ApiModelProperty(value = "2025缴费") + private BigDecimal p25; + + @ApiModelProperty(value = "2026缴费") + private BigDecimal p26; + + @ApiModelProperty(value = "2027缴费") + private BigDecimal p27; + + @ApiModelProperty(value = "2028缴费") + private BigDecimal p28; + + @ApiModelProperty(value = "2029缴费") + private BigDecimal p29; + + @ApiModelProperty(value = "2030缴费") + private BigDecimal p30; + + @ApiModelProperty(value = "2031缴费") + private BigDecimal p31; + + @ApiModelProperty(value = "2032缴费") + private BigDecimal p32; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java new file mode 100644 index 00000000..e8a3bdbc --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java @@ -0,0 +1,74 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + *

+ * 委员信息数据统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计") +public class WgdCommiInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "提报单位名称") + private String unit; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会员角色") + private String role; + + @ApiModelProperty(value = "参与人") + private String attend; + + @ApiModelProperty(value = "本届入会时间") + private LocalDateTime curTime; + + @ApiModelProperty(value = "职务") + private String job; + + @ApiModelProperty(value = "所在部门") + private String department; + + @ApiModelProperty(value = "联系方式") + private String tel; + + @ApiModelProperty(value = "任期") + private String term; + + @ApiModelProperty(value = "证书") + private String certificate; + + @ApiModelProperty(value = "账号") + private String account; + + @ApiModelProperty(value = "密码") + private String password; + + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java new file mode 100644 index 00000000..80e75016 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java @@ -0,0 +1,44 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + *

+ * 参与外部标准制修订费用统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计") +public class WgdExReviseCost { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "类型") + private String type; + + @ApiModelProperty(value = "项目编号") + private String proId; + + @ApiModelProperty(value = "项目名称") + private String proName; + + @ApiModelProperty(value = "费用列支项") + private String costOutlay; + + @ApiModelProperty(value = "费用支出") + private BigDecimal cost; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java new file mode 100644 index 00000000..c43f104f --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java @@ -0,0 +1,48 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * 参会费用信息统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdMeetCost对象", description="参会费用信息统计") +public class WgdMeetCost { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "主办单位") + private String unit; + + @ApiModelProperty(value = "会议名称") + private String meetName; + + @ApiModelProperty(value = "会议时间") + private LocalDateTime meetTime; + + @ApiModelProperty(value = "会费标准") + private BigDecimal payStandard; + + @ApiModelProperty(value = "实际发生") + private BigDecimal payReality; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + +} From 98a3da39f98433a4869f36919e801b95583c9f77 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 14 Nov 2021 14:40:09 +0800 Subject: [PATCH 2/7] =?UTF-8?q?zcr:=E6=97=A5=E5=8E=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=97=A5=E7=A8=8B--=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E7=94=9F=E6=88=90=E4=BC=9A=E8=AE=AE=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 139 +----------------- 1 file changed, 1 insertion(+), 138 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 af854350..3e0586ff 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,14 +4,10 @@ package com.ydw.bat.wkflow.business_auth; 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.*; -import com.ydw.bat.wkflow.wgdEntity.*; -import io.swagger.annotations.ApiModelProperty; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -125,142 +121,9 @@ public interface LawsUserInfoService { /** * 日历显示会议日程--流程结束生成会议 （标准化活动，政策课题组） * @param sapMeeting (id, title, type, ...) type: 1,标准化活动;2,政策课题组 - * @return 插入成功标志位 int + * @return 是否插入成功 int */ @PostMapping("/sapMeetInfo/addMeeting") public int addMeeting(@RequestBody SapMeeting sapMeeting); - /** - * 日历显示会议日程--按年,月查找当月会议列表 （标准化活动，政策课题组） - * @param date 日期; type: 1,标准化活动;2,政策课题组 - * @return 当月会议列表 List - */ - @GetMapping("/sapMeetInfo/getMeetingsByMonthType") - public List getMeetingsByMonthType(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type); - - - /** - * 工作组数据信息统计接口-协会费用信息统计 - */ - //获取所有 - @GetMapping("wgdCensusZ/wgd-assoc-cost/getAllAssocCosts") - public List getAllWgdAssocCosts(); - //多条件查询 - @PostMapping("wgdCensusZ/wgd-assoc-cost/queryAllAssocCosts") - public List queryAllAssocCosts(WgdAssocCost wgdAssocCost); - //获取单个详情 - @GetMapping("wgdCensusZ/wgd-assoc-cost/getAssocCostById") - public WgdAssocCost getWgdAssocCostById(String id); - //编辑 - @PostMapping("wgdCensusZ/wgd-assoc-cost/modAssocCost") - int updateWgdAssocCost(WgdAssocCost wgdAssocCost); - //添加 - @PostMapping("wgdCensusZ/wgd-assoc-cost/addAssocCost") - int insertWgdAssocCost(WgdAssocCost wgdAssocCost); - //删除单个 - @GetMapping("wgdCensusZ/wgd-assoc-cost/delAssocCost") - int deleteWgdAssocCost(String id); - //批量删除 - @GetMapping("wgdCensusZ/wgd-assoc-cost/delAssocCosts") - int deleteWgdAssocCosts(String ids); - - /** - * 工作组数据信息统计接口-协会信息数据统计 - */ - @GetMapping("wgdCensusZ/wgd-assoc-info/getAllAssocInfos") - public List getAllWgdAssocInfos(); - - @PostMapping("wgdCensusZ/wgd-assoc-info/queryAllAssocInfos") - public List queryAllWgdAssocInfos(WgdAssocInfo WgdAssocInfo); - - @GetMapping("wgdCensusZ/wgd-assoc-info/getAssocInfoById") - public WgdAssocInfo getWgdAssocInfoById(String id); - - @PostMapping("wgdCensusZ/wgd-assoc-info/modAssocInfo") - int updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo); - - @PostMapping("wgdCensusZ/wgd-assoc-info/addAssocInfo") - int insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo); - - @GetMapping("wgdCensusZ/wgd-assoc-info/delAssocInfo") - int deleteWgdAssocInfo(String id); - - @GetMapping("wgdCensusZ/wgd-assoc-info/delAssocInfos") - int deleteWgdAssocInfos(String ids); - - /** - * 工作组数据信息统计接口-委员信息数据统计 - */ - - @GetMapping("wgdCensusZ/wgd-commi-info/getAllCommiInfos") - public List getAllWgdCommiInfos(); - - @PostMapping("wgdCensusZ/wgd-commi-info/queryAllCommiInfos") - public List queryAllWgdCommiInfos(WgdCommiInfo WgdCommiInfo); - - @GetMapping("wgdCensusZ/wgd-commi-info/getCommiInfoById") - public WgdCommiInfo getWgdCommiInfoById(String id); - - @PostMapping("wgdCensusZ/wgd-commi-info/modCommiInfo") - int updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo); - - @PostMapping("wgdCensusZ/wgd-commi-info/addCommiInfo") - int insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo); - - @GetMapping("wgdCensusZ/wgd-commi-info/delCommiInfo") - int deleteWgdCommiInfo(String id); - - @GetMapping("wgdCensusZ/wgd-commi-info/delCommiInfos") - int deleteWgdCommiInfos(String ids); - - /** - * 工作组数据信息统计接口-参与外部标准制修订费用统计 - */ - - @GetMapping("wgdCensusZ/wgd-ex-revise-cost/getAllExReviseCosts") - public List getAllWgdExReviseCosts(); - - @PostMapping("wgdCensusZ/wgd-ex-revise-cost/queryAllExReviseCosts") - public List queryAllWgdExReviseCosts(WgdExReviseCost WgdExReviseCost); - - @GetMapping("wgdCensusZ/wgd-ex-revise-cost/getExReviseCostById") - public WgdExReviseCost getWgdExReviseCostById(String id); - - @PostMapping("wgdCensusZ/wgd-ex-revise-cost/modExReviseCost") - int updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost); - - @PostMapping("wgdCensusZ/wgd-ex-revise-cost/addExReviseCost") - int insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost); - - @GetMapping("wgdCensusZ/wgd-ex-revise-cost/delExReviseCost") - int deleteWgdExReviseCost(String id); - - @GetMapping("wgdCensusZ/wgd-ex-revise-cost/delExReviseCosts") - int deleteWgdExReviseCosts(String ids); - - /** - * 工作组数据信息统计接口-参会费用信息统计 - */ - @GetMapping("wgdCensusZ/wgd-meet-cost/getAllMeetCosts") - public List getAllWgdMeetCosts(); - - @PostMapping("wgdCensusZ/wgd-meet-cost/queryAllMeetCosts") - public List queryAllWgdMeetCosts(WgdMeetCost WgdMeetCost); - - @GetMapping("wgdCensusZ/wgd-meet-cost/getMeetCostById") - public WgdMeetCost getWgdMeetCostById(String id); - - @PostMapping("wgdCensusZ/wgd-meet-cost/modMeetCost") - int updateWgdMeetCost(WgdMeetCost WgdMeetCost); - - @PostMapping("wgdCensusZ/wgd-meet-cost/addMeetCost") - int insertWgdMeetCost(WgdMeetCost WgdMeetCost); - - @GetMapping("wgdCensusZ/wgd-meet-cost/delMeetCost") - int deleteWgdMeetCost(String id); - - @GetMapping("wgdCensusZ/wgd-meet-cost/delMeetCosts") - int deleteWgdMeetCosts(String ids); - - } From 7b91e2613c514b608d281d59a2f8c3e9c836a2cd Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 14 Nov 2021 14:40:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?zcr:=E6=97=A5=E5=8E=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=97=A5=E7=A8=8B--=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E7=94=9F=E6=88=90=E4=BC=9A=E8=AE=AE=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/wgdEntity/WgdAssocCost.java | 50 ------- .../bat/wkflow/wgdEntity/WgdAssocInfo.java | 141 ------------------ .../bat/wkflow/wgdEntity/WgdCommiInfo.java | 74 --------- .../bat/wkflow/wgdEntity/WgdExReviseCost.java | 44 ------ .../ydw/bat/wkflow/wgdEntity/WgdMeetCost.java | 48 ------ 5 files changed, 357 deletions(-) delete mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java delete mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java delete mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java delete mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java delete mode 100644 src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java deleted file mode 100644 index a17eb25c..00000000 --- a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ydw.bat.wkflow.wgdEntity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - *

- * 协会费用信息统计 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Data -@Accessors(chain = true) -@ApiModel(value="WgdAssocCost对象", description="协会费用信息统计") -public class WgdAssocCost{ - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - private String id; - - @ApiModelProperty(value = "协会名称-标委会") - private String scName; - - @ApiModelProperty(value = "协会名称-分标委") - private String sscName; - - @ApiModelProperty(value = "协会名称-工作组") - private String wgName; - - @ApiModelProperty(value = "会费标准") - private BigDecimal payStandard; - - @ApiModelProperty(value = "实际发生") - private BigDecimal payReality; - - @ApiModelProperty(value = "费用列支") - private String costOutlay; - - @ApiModelProperty(value = "每年缴费情况") - private String annualPayment; - - -} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java deleted file mode 100644 index 2884fcf8..00000000 --- a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.ydw.bat.wkflow.wgdEntity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - *

- * 协会信息数据统计 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Data -@Accessors(chain = true) -@ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计") -public class WgdAssocInfo { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - private String id; - - @ApiModelProperty(value = "协会名称-标委会") - private String scName; - - @ApiModelProperty(value = "协会名称-分标委") - private String sscName; - - @ApiModelProperty(value = "协会名称-工作组") - private String wgName; - - @ApiModelProperty(value = "会员角色") - private String role; - - @ApiModelProperty(value = "参与人") - private String attend; - - @ApiModelProperty(value = "标准") - private String standard; - - @ApiModelProperty(value = "标准负责人") - private String charge; - - @ApiModelProperty(value = "责任领导") - private String leader; - - @ApiModelProperty(value = "初始入会时间") - private LocalDateTime iniTime; - - @ApiModelProperty(value = "本届入会时间") - private LocalDateTime curTime; - - @ApiModelProperty(value = "费用标准") - private BigDecimal costStandard; - - @ApiModelProperty(value = "费用列支") - private String costOutlay; - - @ApiModelProperty(value = "上次缴纳时间") - private LocalDateTime lastPayTime; - - @ApiModelProperty(value = "缴费年限") - private String payPeriod; - - @ApiModelProperty(value = "经办人") - private String handler; - - @ApiModelProperty(value = "部门") - private String department; - - @ApiModelProperty(value = "协会性质") - private String asProper; - - @ApiModelProperty(value = "协会状态") - private String asStatus; - - @ApiModelProperty(value = "协会联络人") - private String asContact; - - @ApiModelProperty(value = "协会联络人电话") - private String tel; - - @ApiModelProperty(value = "协会联络人邮箱") - private String mail; - - @ApiModelProperty(value = "2017缴费") - private BigDecimal p17; - - @ApiModelProperty(value = "2018缴费") - private BigDecimal p18; - - @ApiModelProperty(value = "2019缴费") - private BigDecimal p19; - - @ApiModelProperty(value = "2020缴费") - private BigDecimal p20; - - @ApiModelProperty(value = "2021缴费") - private BigDecimal p21; - - @ApiModelProperty(value = "2022缴费") - private BigDecimal p22; - - @ApiModelProperty(value = "2023缴费") - private BigDecimal p23; - - @ApiModelProperty(value = "2024缴费") - private BigDecimal p24; - - @ApiModelProperty(value = "2025缴费") - private BigDecimal p25; - - @ApiModelProperty(value = "2026缴费") - private BigDecimal p26; - - @ApiModelProperty(value = "2027缴费") - private BigDecimal p27; - - @ApiModelProperty(value = "2028缴费") - private BigDecimal p28; - - @ApiModelProperty(value = "2029缴费") - private BigDecimal p29; - - @ApiModelProperty(value = "2030缴费") - private BigDecimal p30; - - @ApiModelProperty(value = "2031缴费") - private BigDecimal p31; - - @ApiModelProperty(value = "2032缴费") - private BigDecimal p32; - - -} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java deleted file mode 100644 index e8a3bdbc..00000000 --- a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.ydw.bat.wkflow.wgdEntity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; - -/** - *

- * 委员信息数据统计 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Data -@Accessors(chain = true) -@ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计") -public class WgdCommiInfo { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - private String id; - - @ApiModelProperty(value = "提报单位名称") - private String unit; - - @ApiModelProperty(value = "协会名称-标委会") - private String scName; - - @ApiModelProperty(value = "协会名称-分标委") - private String sscName; - - @ApiModelProperty(value = "协会名称-工作组") - private String wgName; - - @ApiModelProperty(value = "会员角色") - private String role; - - @ApiModelProperty(value = "参与人") - private String attend; - - @ApiModelProperty(value = "本届入会时间") - private LocalDateTime curTime; - - @ApiModelProperty(value = "职务") - private String job; - - @ApiModelProperty(value = "所在部门") - private String department; - - @ApiModelProperty(value = "联系方式") - private String tel; - - @ApiModelProperty(value = "任期") - private String term; - - @ApiModelProperty(value = "证书") - private String certificate; - - @ApiModelProperty(value = "账号") - private String account; - - @ApiModelProperty(value = "密码") - private String password; - - @ApiModelProperty(value = "备注") - private String remark; - - -} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java deleted file mode 100644 index 80e75016..00000000 --- a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ydw.bat.wkflow.wgdEntity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - *

- * 参与外部标准制修订费用统计 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Data -@Accessors(chain = true) -@ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计") -public class WgdExReviseCost { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - private String id; - - @ApiModelProperty(value = "类型") - private String type; - - @ApiModelProperty(value = "项目编号") - private String proId; - - @ApiModelProperty(value = "项目名称") - private String proName; - - @ApiModelProperty(value = "费用列支项") - private String costOutlay; - - @ApiModelProperty(value = "费用支出") - private BigDecimal cost; - - -} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java deleted file mode 100644 index c43f104f..00000000 --- a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ydw.bat.wkflow.wgdEntity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - *

- * 参会费用信息统计 - *

- * - * @author zcr - * @since 2021-11-12 - */ -@Data -@Accessors(chain = true) -@ApiModel(value="WgdMeetCost对象", description="参会费用信息统计") -public class WgdMeetCost { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - private String id; - - @ApiModelProperty(value = "主办单位") - private String unit; - - @ApiModelProperty(value = "会议名称") - private String meetName; - - @ApiModelProperty(value = "会议时间") - private LocalDateTime meetTime; - - @ApiModelProperty(value = "会费标准") - private BigDecimal payStandard; - - @ApiModelProperty(value = "实际发生") - private BigDecimal payReality; - - @ApiModelProperty(value = "费用列支") - private String costOutlay; - - -} From 1ae1e2e160a0bc80bc0f126871694f531369152c Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 17 Nov 2021 17:14:53 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E6=97=A5=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PresidentApprovalAfter.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index b5010546..68775625 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; @@ -9,6 +10,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_slrs.dao.SapMeeting; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -18,6 +20,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; public class PresidentApprovalAfter implements TaskListener { @Override @@ -27,6 +30,8 @@ public class PresidentApprovalAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + //存储会议信息 + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -96,6 +101,20 @@ public class PresidentApprovalAfter implements TaskListener { busBean.save(busProcessNewNext); } }else { + String title = object.getString("title"); + JSONArray files = object.getJSONArray("modelList");//附件json数组 + JSONArray attends = object.getJSONArray("data2"); + String content = object.getString("content"); + + SapMeeting sapMeeting= new SapMeeting(); + sapMeeting.setTitle(title); + sapMeeting.setDate(object.getDate("time2")); + sapMeeting.setType(2); + sapMeeting.setId(UUID.randomUUID().toString()); + sapMeeting.setAttend(attends.toJSONString()); + sapMeeting.setFiles(files.toJSONString()); + sapMeeting.setContent(content); + BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -104,6 +123,7 @@ public class PresidentApprovalAfter implements TaskListener { busProcessNewNext.setTaskInfo("政策课题组参会流程-流程结束"); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); + lawsUserInfoService.addMeeting(sapMeeting); } } } From ac92d728cdddc8176825e87dde0384da6d6c374f Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Sun, 5 Dec 2021 10:02:43 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 3 +- .../ApprovalAfter.java | 36 ++++++++++++++++++- .../PresidentApprovalAfter.java | 32 +++++++++++++++++ .../PGREPresidentApprovalAfter.java | 32 +++++++++++++++++ 4 files changed, 101 insertions(+), 2 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 07a67b75..92183ee3 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 @@ -122,7 +122,8 @@ public interface LawsUserInfoService { @PostMapping("/sarStandProjectLibrary/batchInsert") public String batchInsert(@RequestBody List standProjectRelationDtos); - + @PostMapping("/WgDept/saveBatch") + public String wgDeptSaveBatch(@RequestBody List wgDepts); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java index eae189eb..8824cc97 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; @@ -9,6 +10,10 @@ 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.SarFileSplitInfoEO; +import com.ydw.bat.wkflow.business_slrs.dao.SarInterpretationNationalStandard; +import com.ydw.bat.wkflow.business_slrs.dao.SarStandItems; +import com.ydw.bat.wkflow.business_slrs.dao.WgDept; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -28,7 +33,7 @@ public class ApprovalAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - + LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -46,6 +51,35 @@ public class ApprovalAfter implements TaskListener { if("1".equals(object.getString("shyFlag"))){ delegateTask.setVariable("shyFlag", "1"); + JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList")); + List wgDept=new ArrayList<>(); + jsonArray.forEach(o -> { + JSONObject os=JSONObject.parseObject(o.toString()); + WgDept wgDept1=new WgDept(); + wgDept1.setWgId(object.getString("standId")); + wgDept1.setDeptOrder(os.getString("itemsNum")); + wgDept1.setDeptPeopleId(os.getString("itemsName")); + wgDept1.setIdentity(os.getString("responsibleUnitShow")); + wgDept1.setJoinfile(os.getString("zxUserIdName")); + wgDept1.setJoinId(os.getString("itermsConditions")); + wgDept.add(wgDept1); + }); + + JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class)); + jsonArray1.forEach(obj ->{ + JSONObject object1 = JSONObject.parseObject(obj.toString()); + WgDept wgDept1=new WgDept(); + wgDept1.setWgId(object.getString("standId")); + wgDept1.setDeptOrder(object1.getString("itemsNum")); + wgDept1.setDeptPeopleId(object1.getString("itemsName")); + wgDept1.setIdentity(object1.getString("responsibleUnitShow")); + wgDept1.setJoinfile(object1.getString("zx![](C:/Users/liao/AppData/Local/Temp/LogiUI/Pak/img/device.png)UserIdName")); + wgDept1.setJoinId(object1.getString("itermsConditions")); + wgDept.add(wgDept1); + }); + + lawsUserInfoService.wgDeptSaveBatch(wgDept); + prcName = "政策课题组会后流程"; }else{ delegateTask.setVariable("shyFlag", "0"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index b5010546..b902abb5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; @@ -9,6 +10,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_slrs.dao.WgDept; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -28,6 +30,7 @@ public class PresidentApprovalAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -44,6 +47,35 @@ public class PresidentApprovalAfter implements TaskListener { if("1".equals(object.getString("gsfz"))){ delegateTask.setVariable("gsfz", "1"); + JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList")); + List wgDept=new ArrayList<>(); + jsonArray.forEach(o -> { + JSONObject os=JSONObject.parseObject(o.toString()); + WgDept wgDept1=new WgDept(); + wgDept1.setWgId(object.getString("standId")); + wgDept1.setDeptOrder(os.getString("itemsNum")); + wgDept1.setDeptPeopleId(os.getString("itemsName")); + wgDept1.setIdentity(os.getString("responsibleUnitShow")); + wgDept1.setJoinfile(os.getString("zxUserIdName")); + wgDept1.setJoinId(os.getString("itermsConditions")); + wgDept.add(wgDept1); + }); + + JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class)); + jsonArray1.forEach(obj ->{ + JSONObject object1 = JSONObject.parseObject(obj.toString()); + WgDept wgDept1=new WgDept(); + wgDept1.setWgId(object.getString("standId")); + wgDept1.setDeptOrder(object1.getString("itemsNum")); + wgDept1.setDeptPeopleId(object1.getString("itemsName")); + wgDept1.setIdentity(object1.getString("responsibleUnitShow")); + wgDept1.setJoinfile(object1.getString("zxUserIdName")); + wgDept1.setJoinId(object1.getString("itermsConditions")); + wgDept.add(wgDept1); + }); + + lawsUserInfoService.wgDeptSaveBatch(wgDept); + prcName = "政策课题组参会流程"; }else{ delegateTask.setVariable("gsfz", "0"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index dcf8ac40..891d79ae 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; @@ -11,6 +12,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_slrs.dao.WgDept; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; @@ -51,6 +53,36 @@ public class PGREPresidentApprovalAfter implements TaskListener { if ("1".equals(object.getString("gsfz"))) { delegateTask.setVariable("gsfz", "1"); + + JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList")); + List wgDept=new ArrayList<>(); + jsonArray.forEach(o -> { + JSONObject os=JSONObject.parseObject(o.toString()); + WgDept wgDept1=new WgDept(); + wgDept1.setWgId(object.getString("standId")); + wgDept1.setDeptOrder(os.getString("itemsNum")); + wgDept1.setDeptPeopleId(os.getString("itemsName")); + wgDept1.setIdentity(os.getString("responsibleUnitShow")); + wgDept1.setJoinfile(os.getString("zxUserIdName")); + wgDept1.setJoinId(os.getString("itermsConditions")); + wgDept.add(wgDept1); + }); + + JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class)); + jsonArray1.forEach(obj ->{ + JSONObject object1 = JSONObject.parseObject(obj.toString()); + WgDept wgDept1=new WgDept(); + wgDept1.setWgId(object.getString("standId")); + wgDept1.setDeptOrder(object1.getString("itemsNum")); + wgDept1.setDeptPeopleId(object1.getString("itemsName")); + wgDept1.setIdentity(object1.getString("responsibleUnitShow")); + wgDept1.setJoinfile(object1.getString("zxUserIdName")); + wgDept1.setJoinId(object1.getString("itermsConditions")); + wgDept.add(wgDept1); + }); + + lawsUserInfoService.wgDeptSaveBatch(wgDept); + prcName = "政策课题组入会流程"; } else { delegateTask.setVariable("gsfz", "0"); From 37031fb9c46285ad086962e3e79a0249bd7e09e9 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Wed, 8 Dec 2021 15:06:02 +0800 Subject: [PATCH 6/7] feat: There is no way the --- .../bat/wkflow/business_slrs/dao/WgDept.java | 46 +++++++ .../lawsLibrary/LawsManagerApproveAfter.java | 90 +++++++++++++ .../lawsLibrary/LawsManagerApproveBefore.java | 38 ++++++ .../DistributionAfter.java | 117 ++++++++++++++++ .../DockerReviewAfter.java | 103 ++++++++++++++ .../EngineerReviewAfter.java | 126 ++++++++++++++++++ .../EngineerRevisionAfter.java | 101 ++++++++++++++ .../EngineerRevisionBefore.java | 51 +++++++ .../FillCommentAfter.java | 102 ++++++++++++++ .../MinisterReviewAfter.java | 105 +++++++++++++++ .../ViceDirectorAfter.java | 105 +++++++++++++++ 11 files changed, 984 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_slrs/dao/WgDept.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/WgDept.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/WgDept.java new file mode 100644 index 00000000..0b09de7e --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/WgDept.java @@ -0,0 +1,46 @@ +package com.ydw.bat.wkflow.business_slrs.dao; + +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; + +@Data +@Accessors(chain = true) +@ApiModel(value="WgDept对象", description="集团参与情况") +public class WgDept { + 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 = "前端id") + @TableField("join_id") + private String joinId; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java new file mode 100644 index 00000000..6d9e8ec5 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.lawsLibrary; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * 经理人审批后 + */ +public class LawsManagerApproveAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + + String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String prcName = "政策入库流程"; + if ("1".equalsIgnoreCase(approvalOpinion)) { + delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId")); + + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("applyUpdUserId")); + busProcessNew.setPrcName(prcName); + busBean.save(busProcessNew); + + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("jlFlag", 1); + } else { + delegateTask.setVariable("jlFlag", 0); + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + } + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + //one2.setPrcName("入库流程结束"); + one2.setOverTime(OVERTIME); + one2.setPrcType("1"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java new file mode 100644 index 00000000..e845d073 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java @@ -0,0 +1,38 @@ +package com.ydw.bat.wkflow.listener.lawsLibrary; + +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; + +import java.util.List; + +/** + * 经理人审批前 + */ +public class LawsManagerApproveBefore implements TaskListener{ + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("zcrkStep2?prcType=laws1"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java new file mode 100644 index 00000000..ea7e09be --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java @@ -0,0 +1,117 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 任务下发 + */ +public class DistributionAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + 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); + + List nextUserList = new ArrayList(); + Map departmentMap = new HashMap<>(); //用户--用户所属部门 + + + if(StringUtils.isNotBlank(object.getString("responUserList"))){ + nextUserList= Arrays.asList(object.getString("responUserList").split(",")); + + JSONArray mapArray = object.getJSONArray("responUserAndInstitutionNameMap"); + for (Object jsonMap : mapArray) { + departmentMap.putAll(JSONObject.parseObject(jsonMap.toString(), Map.class)); + + } + // 配置多实例 + delegateTask.setVariable("commentUserList",nextUserList); + delegateTask.addCandidateUsers(nextUserList); + } + + + JSONArray commentCollectionList=delegateTask.getVariable("commentCollectionList",JSONArray.class); + if (commentCollectionList==null) commentCollectionList=new JSONArray(); + delegateTask.setVariable("commentCollectionList",commentCollectionList); + + + + + //截止时间 流程描述 创建人 + 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 = "政策征求意见流程-工程师填写意见"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setOverTime(OVERTIME); + one1.setPrcType("laws2"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + //标记此用户是事业部还是产品规划部 + JSONObject repositoryObject =object; + repositoryObject.put("department",departmentMap.get(nextUser)); + + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(repositoryObject.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java new file mode 100644 index 00000000..96f93b90 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java @@ -0,0 +1,103 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +/** + * 对接人审核 + */ +public class DockerReviewAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + 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); + + List nextUserList = new ArrayList(); + if("0".equals(object.getString("actionFlag"))){ + String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId"); + if(StringUtils.isNotBlank(lawsProveEngineer)){ + delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer); + delegateTask.setVariable("responseDockerVerify",0); + + nextUserList= Arrays.asList(lawsProveEngineer.split(",")); + delegateTask.addCandidateUsers(nextUserList); + } + }else { + delegateTask.setVariable("responseDockerVerify",1); + } + + + //截止时间 流程描述 创建人 + 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 = "政策征求意见流程-法规工程师单条审核"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws2"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("法规工程师修订征求意见"); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java new file mode 100644 index 00000000..331be057 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java @@ -0,0 +1,126 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 工程师审核 + */ +public class EngineerReviewAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + 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); + + List nextUserList = new ArrayList(); + + if ("0".equals( object.getString("actionFlag"))){ + JSONObject form = JSONObject.parseObject(object.getString("form")); + String lawsProveEngineer = JSONObject.parseObject(form.getString("form")).getString("lawsProveEngineerId"); + if(StringUtils.isNotBlank(lawsProveEngineer)){ + + JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class); + if (commentCollectionList==null) { + commentCollectionList=new JSONArray(); + } + commentCollectionList.addAll(object.getJSONArray("info")); + delegateTask.setVariable("commentCollectionList",commentCollectionList); + + + delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer); + delegateTask.setVariable("lawsProveEngineerVerify",0); + + + nextUserList= Arrays.asList(lawsProveEngineer.split(",")); + delegateTask.addCandidateUsers(nextUserList); + } + } + + + + //截止时间 流程描述 创建人 + 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 = "政策征求意见流程-法规工程师汇总修订"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws2"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + + /** + * 当子任务结束时存储 + */ + Integer commentCount=delegateTask.getVariable("commentCount",Integer.class); + if(commentCount==null)commentCount=0; + commentCount++; + delegateTask.setVariable("count",commentCount); + + Collection commentUserList=delegateTask.getVariable("commentUserList",Collection.class); + if(commentCount>=commentUserList.size()){ + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + } + + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java new file mode 100644 index 00000000..768b0e5c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java @@ -0,0 +1,101 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * 工程师修订 + */ +public class EngineerRevisionAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + 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); + + List nextUserList = new ArrayList(); + + JSONObject form = JSONObject.parseObject(object.getString("form")); + String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId"); + if(StringUtils.isNotBlank(lawsProveMinister)){ + + delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister); + nextUserList= Arrays.asList(lawsProveMinister.split(",")); + delegateTask.addCandidateUsers(nextUserList); + } + + + //截止时间 流程描述 创建人 + 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 = "政策征求意见流程-法规认证部长审核"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws2"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java new file mode 100644 index 00000000..c0b22a0a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionBefore.java @@ -0,0 +1,51 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +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; + +import java.util.List; +/** + * 工程师修订 + */ +public class EngineerRevisionBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + + /** + * 汇总已审批通过的意见 + */ + String msg = one1.getMesg(); + JSONObject msgJsonBoj = JSON.parseObject(msg); + JSONArray commentCollectionList=delegateTask.getVariable("commentCollectionList",JSONArray.class); + msgJsonBoj.put("info",commentCollectionList); + one1.setMesg(msgJsonBoj.toJSONString()); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=laws2"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java new file mode 100644 index 00000000..c774bc6a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java @@ -0,0 +1,102 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +/** + * 工程师填写意见 + */ +public class FillCommentAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + String responseDocker = JSONObject.parseObject(object.getString("form")).getString("responseDockerId"); + + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(responseDocker)){ + + + + delegateTask.setVariable("responseDockerId",responseDocker); + nextUserList= Arrays.asList(responseDocker.split(",")); + delegateTask.addCandidateUsers(nextUserList); + } + + + //截止时间 流程描述 创建人 + 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 = "政策征求意见流程-责任对接人审核"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws2"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java new file mode 100644 index 00000000..36345396 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java @@ -0,0 +1,105 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +/** + * 部长审核 + */ +public class MinisterReviewAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + 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); + + List nextUserList = new ArrayList(); + + if ("0".equals(object.getString("actionFlag"))){ + + JSONObject form = JSONObject.parseObject(object.getString("form")); + String lawsProveViceChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveViceChiefId"); + if(StringUtils.isNotBlank(lawsProveViceChief)){ + + delegateTask.setVariable("lawsProveMinisterVerify",0); + delegateTask.setVariable("lawsProveViceChiefId",lawsProveViceChief); + nextUserList= Arrays.asList(lawsProveViceChief.split(",")); + delegateTask.addCandidateUsers(nextUserList); + } + } + + + + //截止时间 流程描述 创建人 + 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 = "政策征求意见流程-法规认证副总监审核"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws2"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java new file mode 100644 index 00000000..ffd0a1ba --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java @@ -0,0 +1,105 @@ +package com.ydw.bat.wkflow.listener.policyCommentProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +/** + * 副总监审核 + */ +public class ViceDirectorAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + 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); + + List nextUserList = new ArrayList(); + + if ("0".equals(object.getString("actionFlag"))){ + + + JSONObject form = JSONObject.parseObject(object.getString("form")); + String lawsProveChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveChiefId"); + if(StringUtils.isNotBlank(lawsProveChief)){ + + delegateTask.setVariable("lawsProveViceChiefVerify",0); + delegateTask.setVariable("lawsProveChiefId",lawsProveChief); + nextUserList= Arrays.asList(lawsProveChief.split(",")); + delegateTask.addCandidateUsers(nextUserList); + } + } + + + //截止时间 流程描述 创建人 + 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 = "政策征求意见流程-法规认证总监审核"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws2"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} From d86953f011447f73a19448db9193077b77ae76cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=B6=85=E7=84=B6?= Date: Wed, 8 Dec 2021 15:39:29 +0800 Subject: [PATCH 7/7] rest --- .../business_auth/LawsUserInfoService.java | 5 +- .../wkflow/business_slrs/dao/SapMeeting.java | 45 ++++++++++ .../EngineerReviseDoneAfter.java | 82 +++++++++++++++++++ 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.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 c49ec118..06a70387 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 @@ -5,9 +5,11 @@ 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.*; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -126,7 +128,8 @@ public interface LawsUserInfoService { * @return 是否插入成功 int */ @PostMapping("/sapMeetInfo/addMeeting") - public int addMeeting(@RequestBody SapMeeting sapMeeting); + int addMeeting(@RequestBody SapMeeting sapMeeting); + @GetMapping("/sapMeetInfo/getMeetingsByMonth") public List getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date); diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java new file mode 100644 index 00000000..c98bbf51 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java @@ -0,0 +1,45 @@ +package com.ydw.bat.wkflow.business_slrs.dao; + +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.ToString; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + *

+ * 流程通过的 标准化活动会议信息表 +standard_activity_pass + + *

+ * + * @author super_liu + * @since 2021-11-09 + */ +@Data +@Accessors(chain = true) +@ToString +@ApiModel(value="SapMeeting对象", description="流程通过的 标准化活动会议信息表 standard_activity_pass") +public class SapMeeting { + + private static final long serialVersionUID = 1L; + + private String id;//主键-会议id + + private String title;//会议标题 + + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date date;//会议开始时间 + + private String content;//会议内容大纲 + + private int type;//标志位--1标准化活动会议,0政策组会议 + + private String attend;//参与人 {id,name} json + + private String files;//附件 json + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index c71ef580..f763ef5b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; @@ -9,6 +10,9 @@ 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.SapMeeting; +import com.ydw.bat.wkflow.entity.WgMeetingInfo; +import com.ydw.bat.wkflow.entity.WgPayInfo; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -55,6 +59,57 @@ public class EngineerReviseDoneAfter implements TaskListener { prcName = "标准化活动参会流程"; + + JSONObject pageData = object.getJSONObject("ch_pageData"); + JSONArray mt = pageData.getJSONArray("meetingTable");//议题1;议题2;议题3;--会议报告 + StringBuilder report = new StringBuilder(); + for(Object table : mt){ + JSONObject t = (JSONObject) table; + if(t.getString("meetingTheme") != null){ + if(report.length() > 0){ + report.append(";").append(t.getString("meetingTheme")); + }else{ + report.append(t.getString("meetingTheme")); + } + } + } +// WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); +// JSONArray mp = pageData.getJSONArray("myPartRole");//参会人员; +// for(Object o : mp){ +// JSONObject t = (JSONObject) o; +// wgMeetingUserRelation.setUserId(t.getString("fillPeopleId")); +// } + + //入库操作 +// WgMeetingInfo wgMeetingInfo = new WgMeetingInfo();//会议信息 +// wgMeetingInfo.setWgId(object.getString("wgId"));//工作组id +// wgMeetingInfo.setMeetingTime(pageData.getDate("meetingStartTime"));//参会时间 +// wgMeetingInfo.setMeetingName(pageData.getString("meetingName"));//会议名称 +//// wgMeetingInfo.setMeetingPeople();//会议人员 +//// wgMeetingInfo.setJoinMeetingPeopleInfo();//会议人员名称 +// +//// wgMeetingInfo.setMeetingReport(object.getString("commentText"));//会议报告 +// wgMeetingInfo.setMeetingReport(report.toString());//会议报告 +//// wgMeetingInfo.setJoinfile(pageData.getString("uploadFile"));//会议资料 +// wgMeetingInfo.setJoinfile(pageData.getJSONArray("fileTextList").toJSONString());//会议资料 +// wgMeetingInfo.setJoinId(object.getString("joinId"));//前端id +// +// WgPayInfo wgPayInfo = new WgPayInfo(); //会议费用 +// wgPayInfo.setWgId(object.getString("wgId"));//工作组id +//// wgPayInfo.setPrice();//价格 +//// wgPayInfo.setYear();//年份 +//// wgPayInfo.setStatus();//支付状态(0:未支付,1:已支付) +//// wgPayInfo.setInplan();//是否计划内(0:计划内,1:计划外) +//// wgPayInfo.setPayWay();//支付方式 +//// wgPayInfo.setJoinfile();//支付资料 +// wgPayInfo.setPayInfo(pageData.getString("feeKind"));//费用列支 +// wgPayInfo.setJoinId(object.getString("joinId"));//前端id +// +// lawsUserInfoService.saAddWgMeetInfo(wgMeetingInfo); +// lawsUserInfoService.saAddWgPay(wgPayInfo); + + + QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -81,6 +136,31 @@ public class EngineerReviseDoneAfter implements TaskListener { busBean.save(busProcessNewNext); } }else { + JSONObject json = object.getJSONObject("ch_pageData"); + JSONArray attends = json.getJSONArray("myPartRole"); + JSONArray files = json.getJSONArray("fileTextList"); + JSONArray tables = json.getJSONArray("meetingTable"); + StringBuilder contents = new StringBuilder(); + for(Object table : tables){ + JSONObject t = (JSONObject) table; + if(t.getString("meetingTheme") != null){ + if(contents.length() > 0){ + contents.append(";").append(t.getString("meetingTheme")); + }else{ + contents.append(t.getString("meetingTheme")); + } + } + } + + SapMeeting sapMeeting= new SapMeeting(); + sapMeeting.setTitle(json.getString("meetingName")); + sapMeeting.setDate(json.getDate("meetingStartTime")); + sapMeeting.setType(1); + sapMeeting.setId(UUID.randomUUID().toString()); + sapMeeting.setAttend(attends.toJSONString()); + sapMeeting.setFiles(files.toJSONString()); + sapMeeting.setContent(contents.toString()); + BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -89,6 +169,8 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); + lawsUserInfoService.addMeeting(sapMeeting); + } } }