diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 91f3d3a0..d1fed25b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -44,10 +44,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.tmsps.fk.common.base.action.BaseAction; import com.tmsps.fk.common.util.ChkUtil; @@ -2521,6 +2518,19 @@ public class TodoTaskController extends BaseAction { } + @ApiOperation(value = "删除草稿") + @PostMapping("/delCG") + public String delCG(@RequestParam("id") String id) { + List strings=new ArrayList<>(); + if (id.contains(",")){ + strings.addAll(new ArrayList<>(Arrays.asList(id.split(",")))); + }else { + strings.add(id); + } + return iBusProcessNameService.delDB(strings); + } + + // @ApiOperation(value = "查询流程信息", notes = "根据流程流程编号查询名称等信息") // @ApiImplicitParams({@ApiImplicitParam(name = "prcNum", value = "流程编号")}) // @PostMapping("/findProcessNameByPrcNum") 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 3e0586ff..c49ec118 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 @@ -118,6 +118,8 @@ public interface LawsUserInfoService { public String batchInsert(@RequestBody List standProjectRelationDtos); + @PostMapping("/WgDept/saveBatch") + public String wgDeptSaveBatch(@RequestBody List wgdepts); /** * 日历显示会议日程--流程结束生成会议 （标准化活动，政策课题组） * @param sapMeeting (id, title, type, ...) type: 1,标准化活动;2,政策课题组 @@ -126,4 +128,35 @@ public interface LawsUserInfoService { @PostMapping("/sapMeetInfo/addMeeting") public int addMeeting(@RequestBody SapMeeting sapMeeting); + @GetMapping("/sapMeetInfo/getMeetingsByMonth") + public List getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date); + + @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); + + @PostMapping("/sapMeetInfo/getDateMeeting") + public int getDateMeeting(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("id") String id,@RequestParam("type") int type); + + @PostMapping("/esRevisePlan/es-revise-plan/modPlanByWk") + public ResponseMessage modPlan(@RequestBody EsRevisePlanDTO esRevisePlan); + + @PostMapping("/esRevisePlan/es-revise-plan/addPlanByWk") + public ResponseMessage addPlan(@RequestBody EsRevisePlanDTO esRevisePlan); + + @GetMapping("/esRevisePlan/es-revise-plan/delPlanByWk") + public ResponseMessage delPlan(@RequestParam("id") String id); + + + @GetMapping("/lawss/sarBussionessStand/updateSarBussionessStand") + public ResponseMessage updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO); + + + + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index d0638029..e589fd93 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -54,13 +54,6 @@ public class BusProcessNewController extends BaseAction { return findtodotask; } - @ApiOperation(value = "每天十点需要启动 标准化活动参会流程") - @GetMapping("/everyDayTenOlockSAM") - public List everyDayTenOlockSAM() { - List findtodotask = iBusProcessNewService.everyDayTenOlockSAM(); - return findtodotask; - } - } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java index bae35d09..7d19fd9e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java @@ -28,6 +28,9 @@ public class SarStandUnqualified { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "产品线编号") + private String productId; + @ApiModelProperty(value = "标准ID") private String standId; diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java index 2b2c9488..adc70651 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java @@ -117,5 +117,17 @@ public class SarStandardComplianceProductAssess { @TableField("type") private String type; + @ApiModelProperty(value = "评估时间") + @TableField("evaluation_time") + private String evaluationTime; + + @ApiModelProperty(value = "评估人") + @TableField("evaluation_people") + private String evaluationPeople; + + @ApiModelProperty(value = "评估人") + @TableField("evaluation_people_name") + private String evaluationPeopleName; + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java new file mode 100644 index 00000000..f2eccd01 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java @@ -0,0 +1,71 @@ +package com.ydw.bat.wkflow.business_main.datas.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + *

+ * 企标制修订计划 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="EsRevisePlan对象", description="企标制修订计划") +public class EsRevisePlanDTO { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "企标名称") + private String esName; + + @ApiModelProperty(value = "计划状态") + private String planStatus; + + @ApiModelProperty(value = "制修订状态") + private String reviseStatus; + + @ApiModelProperty(value = "起草人") + private String drafter; + + @ApiModelProperty(value = "评审责任人") + private String resPerson; + + @ApiModelProperty(value = "工作组组长") + private String wgLeader; + + + @ApiModelProperty(value = "起草人姓名") + private String drafterName; + + @ApiModelProperty(value = "评审责任人姓名") + private String resPersonName; + + @ApiModelProperty(value = "工作组组长姓名") + private String wgLeaderName; + + @ApiModelProperty(value = "计划标准初稿完成时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date draftTime; + + @ApiModelProperty(value = "计划标准发布时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date releaseTime; + + @ApiModelProperty(value = "起草责任单位") + private String unit; + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStand.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStand.java new file mode 100644 index 00000000..53aa397c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStand.java @@ -0,0 +1,528 @@ +package com.ydw.bat.wkflow.business_main.datas.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.*; + +/** + *

+ * 企业标准信息表 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="SarBussionessStand对象", description="企业标准信息表") +public class SarBussionessStand { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "企标标准号") + @TableField("STAND_CODE") + private String standCode; + + @ApiModelProperty(value = "标准编号") + @TableField("STAND_NUMBER") + private String standNumber; + + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "标准英文名称") + @TableField("STAND_EN_NAME") + private String standEnName; + + @ApiModelProperty(value = "发布日期") + @TableField("ISSUE_TIME") + private String issueTime; + + @ApiModelProperty(value = "实施日期") + @TableField("PUT_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTime; + + @ApiModelProperty(value = "代替标准号") + @TableField("REPLACE_STAND_NUM") + private String replaceStandNum; + + @ApiModelProperty(value = "被代替标准号") + @TableField("REPLACED_STAND_NUM") + private String replacedStandNum; + + @ApiModelProperty(value = "标准状态") + @TableField("STAND_STATUS") + private String standStatus; + + @ApiModelProperty(value = "适用国家/地区") + @TableField("APPLY_COUNTRY") + private String applyCountry; + + @ApiModelProperty(value = "标准性质") + @TableField("STAND_NATURE") + private String standNature; + + @ApiModelProperty(value = "标准类别") + @TableField("STAND_SORT") + private String standSort; + + @ApiModelProperty(value = "标准年份") + @TableField("STAND_YEAR") + private String standYear; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + // 新添加字段 + @ApiModelProperty(value = "文本状态") + @TableField("TEXT_STATUS_BUSS") + private String textStatusBuss; + + + // 非表字段 + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String firstPutTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTimeShow; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTimeShow; + + @TableField(exist = false) + private String issueTimeStr; + + @TableField(exist = false) + private String putTimeStr; + + //目录ID 非标准信息表中的字段 + @TableField(exist = false) + private String menuId; + + @TableField(exist = false) + private String menuParentId; + + @TableField(exist = false) + private String standStatusShow; // 标准状态下拉框 --单选 + + @TableField(exist = false) + private String standNatrueShow; + + @TableField(exist = false) + private String standSortShow; + + @TableField(exist = false) + private String applyCountryShow; + + @TableField(exist = false) + private List standFileList = new ArrayList(); + + @TableField(exist = false) + private List opinionFilesList = new ArrayList(); + + @TableField(exist = false) + private List relevanceFileList = new ArrayList(); + + @TableField(exist = false) + private String collectId; + + //文件的类型 + @TableField(exist = false) + private String standFileClassify; + + //文件的下载id + @TableField(exist = false) + private String attId; + + //记录是否修改了替代文件号 + @TableField(exist = false) + private int upReplaceNumFlag; + //记录是否修改了文件号 + @TableField(exist = false) + private int upNumFlag; + // 数据库新加的字段 + + @TableField(exist = false) + private String remark;//备注 + + @TableField(exist = false) + private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 + + @TableField(exist = false) + private Map attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染 + + @TableField(exist = false) + private String sarStandAttrEOStr; //新增修改时属性表信息 + + @TableField(exist = false) + private String fileIds; //全部文件ID + + @TableField(exist = false) + private List attrInfoList = new ArrayList<>(); + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getStandCode() { + return standCode; + } + + public void setStandCode(String standCode) { + this.standCode = standCode; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getStandEnName() { + return standEnName; + } + + public void setStandEnName(String standEnName) { + this.standEnName = standEnName; + } + + public String getIssueTime() { + return issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getPutTime() { + return putTime; + } + + public void setPutTime(String putTime) { + this.putTime = putTime; + } + + public String getReplaceStandNum() { + return replaceStandNum; + } + + public void setReplaceStandNum(String replaceStandNum) { + this.replaceStandNum = replaceStandNum; + } + + public String getReplacedStandNum() { + return replacedStandNum; + } + + public void setReplacedStandNum(String replacedStandNum) { + this.replacedStandNum = replacedStandNum; + } + + public String getStandStatus() { + return standStatus; + } + + public void setStandStatus(String standStatus) { + this.standStatus = standStatus; + } + + public String getApplyCountry() { + return applyCountry; + } + + public void setApplyCountry(String applyCountry) { + this.applyCountry = applyCountry; + } + + public String getStandNature() { + return standNature; + } + + public void setStandNature(String standNature) { + this.standNature = standNature; + } + + public String getStandSort() { + return standSort; + } + + public void setStandSort(String standSort) { + this.standSort = standSort; + } + + public String getStandYear() { + return standYear; + } + + public void setStandYear(String standYear) { + this.standYear = standYear; + } + + public Integer getValidFlag() { + return validFlag; + } + + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public String getTextStatusBuss() { + return textStatusBuss; + } + + public void setTextStatusBuss(String textStatusBuss) { + this.textStatusBuss = textStatusBuss; + } + + public String getFirstPutTime() { + return firstPutTime; + } + + public void setFirstPutTime(String firstPutTime) { + this.firstPutTime = firstPutTime; + } + + public String getPutTimeShow() { + return putTimeShow; + } + + public void setPutTimeShow(String putTimeShow) { + this.putTimeShow = putTimeShow; + } + + public String getIssueTimeShow() { + return issueTimeShow; + } + + public void setIssueTimeShow(String issueTimeShow) { + this.issueTimeShow = issueTimeShow; + } + + public String getIssueTimeStr() { + return issueTimeStr; + } + + public void setIssueTimeStr(String issueTimeStr) { + this.issueTimeStr = issueTimeStr; + } + + public String getPutTimeStr() { + return putTimeStr; + } + + public void setPutTimeStr(String putTimeStr) { + this.putTimeStr = putTimeStr; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getMenuParentId() { + return menuParentId; + } + + public void setMenuParentId(String menuParentId) { + this.menuParentId = menuParentId; + } + + public String getStandStatusShow() { + return standStatusShow; + } + + public void setStandStatusShow(String standStatusShow) { + this.standStatusShow = standStatusShow; + } + + public String getStandNatrueShow() { + return standNatrueShow; + } + + public void setStandNatrueShow(String standNatrueShow) { + this.standNatrueShow = standNatrueShow; + } + + public String getStandSortShow() { + return standSortShow; + } + + public void setStandSortShow(String standSortShow) { + this.standSortShow = standSortShow; + } + + public String getApplyCountryShow() { + return applyCountryShow; + } + + public void setApplyCountryShow(String applyCountryShow) { + this.applyCountryShow = applyCountryShow; + } + + public List getStandFileList() { + return standFileList; + } + + public void setStandFileList(List standFileList) { + this.standFileList = standFileList; + } + + public List getOpinionFilesList() { + return opinionFilesList; + } + + public void setOpinionFilesList(List opinionFilesList) { + this.opinionFilesList = opinionFilesList; + } + + public List getRelevanceFileList() { + return relevanceFileList; + } + + public void setRelevanceFileList(List relevanceFileList) { + this.relevanceFileList = relevanceFileList; + } + + public String getCollectId() { + return collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public String getStandFileClassify() { + return standFileClassify; + } + + public void setStandFileClassify(String standFileClassify) { + this.standFileClassify = standFileClassify; + } + + public String getAttId() { + return attId; + } + + public void setAttId(String attId) { + this.attId = attId; + } + + public int getUpReplaceNumFlag() { + return upReplaceNumFlag; + } + + public void setUpReplaceNumFlag(int upReplaceNumFlag) { + this.upReplaceNumFlag = upReplaceNumFlag; + } + + public int getUpNumFlag() { + return upNumFlag; + } + + public void setUpNumFlag(int upNumFlag) { + this.upNumFlag = upNumFlag; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Map getAttrInfoMap() { + return attrInfoMap; + } + + public void setAttrInfoMap(Map attrInfoMap) { + this.attrInfoMap = attrInfoMap; + } + + public Map getAttrInfoCaseMap() { + return attrInfoCaseMap; + } + + public void setAttrInfoCaseMap(Map attrInfoCaseMap) { + this.attrInfoCaseMap = attrInfoCaseMap; + } + + public String getSarStandAttrEOStr() { + return sarStandAttrEOStr; + } + + public void setSarStandAttrEOStr(String sarStandAttrEOStr) { + this.sarStandAttrEOStr = sarStandAttrEOStr; + } + + public String getFileIds() { + return fileIds; + } + + public void setFileIds(String fileIds) { + this.fileIds = fileIds; + } + + public List getAttrInfoList() { + return attrInfoList; + } + + public void setAttrInfoList(List attrInfoList) { + this.attrInfoList = attrInfoList; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java index 9743050e..d2cd2539 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java @@ -32,6 +32,4 @@ public interface BusProcessNewMapper extends BaseMapper { List everyDayTenOlock(); - List everyDayTenOlockSAM(); - } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java index 2f931d6c..4f4d534e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java @@ -21,4 +21,7 @@ public interface IBusProcessNameService extends IService { //新查询代办接口 初步测试中 List todoTask(TaskCommonQuery taskCommonQuery); + + + String delDB(List id); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index d9607774..9a8a641d 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -35,6 +35,4 @@ public interface IBusProcessNewService extends IService { List everyDayTenOlock(); - List everyDayTenOlockSAM(); - } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java index cc8ee279..ec1737e9 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java @@ -34,4 +34,13 @@ public class BusProcessNameServiceImpl extends ServiceImpl id) { + if (busProcessNameMapper.deleteBatchIds(id)>0) { + return "success"; + }else { + return "error"; + } + } + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index 78d5e51c..6cfec6b9 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -83,9 +83,4 @@ public class BusProcessNewServiceImpl extends ServiceImpl everyDayTenOlock() { return baseMapper.everyDayTenOlock(); } - - @Override - public List everyDayTenOlockSAM() { - return baseMapper.everyDayTenOlockSAM(); - } } 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 deleted file mode 100644 index 47d271d2..00000000 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ydw.bat.wkflow.business_slrs.dao; - -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -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) -@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/business_slrs/dao/SarInterpretationNationalStandard.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java index 111bfc02..c1361067 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java @@ -82,7 +82,7 @@ public class SarInterpretationNationalStandard { @ApiModelProperty(value = "评估时间") @TableField("INTERPRETATION_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private Date interpretationTime; 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/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index 86eb7402..93773ca4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -19,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; public class PCAComplianceAssessmentAfter implements TaskListener { @@ -41,8 +42,33 @@ public class PCAComplianceAssessmentAfter implements TaskListener { List nextUserList=new ArrayList<>(); JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); JSONObject jsonObject=JSONObject.parseObject(jsonArray.get(0).toString()); - nextUserList.add(jsonObject.getString("liablePeopleId")); - delegateTask.setVariable("ffUserId",jsonObject.getString("liablePeopleId")); + //新去除数据之后的结果 + JSONArray newRes=new JSONArray(); + for (Object json:jsonArray) { + JSONObject jsonObject1=JSONObject.parseObject(json.toString()); + JSONArray remove=new JSONArray(); + for (Object os:jsonObject1.getJSONArray("children")) { + JSONObject jsonObject2=JSONObject.parseObject(os.toString()); + if ("".equals(jsonObject2.get("complianceReasons"))&&"".equals(jsonObject2.get("noCompliance")) + && "".equals(jsonObject2.get("countermeasures")) && null==jsonObject2.get("completionTime")){ + remove.add(jsonObject2); + } + } + jsonObject1.getJSONArray("children").removeAll(remove); + if (jsonObject1.getJSONArray("children").size()==0 && "".equals(jsonObject1.get("complianceReasons"))&&"".equals(jsonObject1.get("noCompliance")) + && "".equals(jsonObject1.get("countermeasures")) && null==jsonObject1.get("completionTime")){ + + }else { + newRes.add(jsonObject1); + } + } + String uuid= String.valueOf(UUID.randomUUID()); + delegateTask.setVariable(uuid,jsonArray); + object.put("dataList",newRes); + object.put("key",uuid); + JSONObject res=JSONObject.parseObject(jsonArray.get(0).toString()); + nextUserList.add(res.getString("liablePeopleId")); + delegateTask.setVariable("ffUserId",res.getString("liablePeopleId")); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser",String.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java index 7f261fa7..37a1c914 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java @@ -4,6 +4,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.tmsps.fk.common.util.JsonUtil; +import com.ydw.bat.wkflow.business_main.datas.dto.DataList; import com.ydw.bat.wkflow.business_main.datas.dto.PCA.PCAtotal; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; @@ -53,6 +54,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener { delegateTask.setVariable("pass", "1"); } } else { + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("bzFlag", "2"); } @@ -101,8 +103,10 @@ public class PCAbafgManagerApproveAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskId("996"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(userId); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index 0efa199b..fd5cc25f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -55,7 +55,7 @@ public class PCAdlApproveAfter implements TaskListener { List standUnqualifieds = new ArrayList<>(); //评估结果存储集合 List sarStandardComplianceProductAssesses = new ArrayList<>(); - + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); res.getDataList().forEach(pcAdataList -> { //标准一级别 if (null != pcAdataList.getNoCompliance()) { @@ -73,6 +73,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setReason(pcAdataList.getNoCompliance()); sarStandUnqualified.setPlanCloseTime(pcAdataList.getCompletionTime()); sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class)); + sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); } @@ -91,6 +92,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setReason(pcAdataList.getZcNoCompliance()); sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(pcAdataList.getZcCompletionTime()); + sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); } @@ -119,8 +121,9 @@ public class PCAdlApproveAfter implements TaskListener { sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); sarStandard.setClauseName(pcAdataList.getItemsName()); sarStandard.setStandardItem(pcAdataList.getItemNum()); - - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + sarStandard.setEvaluationTime(simpleDateFormat.format(new Date())); + sarStandard.setEvaluationPeopleName(pcAdataList.getWorkPeople()); + sarStandard.setEvaluationPeople(pcAdataList.getWorkPeople()); sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); // simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ"))) sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj()); @@ -145,6 +148,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(pcAchildren.getNoCompliance()); sarStandUnqualified.setPlanCloseTime(pcAchildren.getCompletionTime()); + sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); } @@ -166,6 +170,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setReason(pcAchildren.getZcNoCompliance()); sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(pcAchildren.getZcCompletionTime()); + sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class)); standUnqualifieds.add(sarStandUnqualified); } //合估评规 结果！ @@ -191,6 +196,9 @@ public class PCAdlApproveAfter implements TaskListener { sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj()); sarStandardChild.setClauseName(pcAchildren.getItemsName()); sarStandardChild.setStandardItem(pcAchildren.getItemsNum()); + sarStandardChild.setEvaluationTime(simpleDateFormat.format(new Date())); + sarStandardChild.setEvaluationPeopleName(pcAchildren.getWorkPeople()); + sarStandardChild.setEvaluationPeople(pcAchildren.getWorkPeople()); sarStandardComplianceProductAssesses.add(sarStandardChild); } }); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java index a5fd1ad4..fee4756e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java @@ -1,8 +1,10 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; +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.dto.DataList; 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; @@ -42,6 +44,7 @@ public class PCAffLiableApproveAfter implements TaskListener { delegateTask.setVariable("JGManager", delegateTask.getVariable("JGUserId")); delegateTask.setVariable("ffFlag", "1"); }else { + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("ffFlag", "2"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index 963d8c5c..f160367a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -43,62 +43,120 @@ public class PCAffLiableDistributeAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - PCAtotal pcAtotal=JSONObject.parseObject(datas.getFormValsJson(),PCAtotal.class); + PCAtotal pcAtotal = JSONObject.parseObject(datas.getFormValsJson(), PCAtotal.class); //后续节点所需要的数据 - List nextUserList=new ArrayList<>(); + List nextUserList = new ArrayList<>(); //猜测写代码 //准备标准数据 - Map mapData=new HashMap<>(); + Map map = new HashMap<>(); + + Map mapData = new HashMap<>(); pcAtotal.getDataList().forEach(pcAdataList -> { - List pcAchildren=new ArrayList<>(); + List pcAchildren = new ArrayList<>(); pcAdataList.setChildren(pcAchildren); - mapData.put(pcAdataList.getStandId(),pcAdataList); + mapData.put(pcAdataList.getStandId(), pcAdataList); }); - Map map=new HashMap<>(); - //获取被分发的条款 + + //获取被分发的条款----人员多选修改 pcAtotal.getChildren().forEach(o -> { - if (null!=map.get(o.getWorkPeopleId())){ - map.get(o.getWorkPeopleId()).getChildren().add(o); - int flag=0; - for (PCAdataList ps: map.get(o.getWorkPeopleId()).getDataList()) { - if (ps.getStandId().equals(mapData.get(o.getKey()).getStandId())){ - ps.getChildren().add(o); - flag++; + if (null!=o && null != o.getWorkPeopleId()) { + List ids = new ArrayList(Arrays.asList(o.getWorkPeopleId().split(","))); + List names = new ArrayList(Arrays.asList(o.getWorkPeople().split(","))); + int i = 0; + for (String id : ids) { + //重组数据 + PCAchildren middle = new PCAchildren(); + BeanUtils.copyProperties(o, middle); + middle.setWorkPeopleId(id); + middle.setWorkPeople(names.get(i)); + if (null != map.get(id)) { + map.get(id).getChildren().add(middle); + int flag = 0; + for (PCAdataList ps : map.get(id).getDataList()) { + if (ps.getStandId().equals(mapData.get(middle.getKey()).getStandId())) { + ps.getChildren().add(middle); + flag++; + } + } + if (flag == 0) { + map.get(id).getDataList().add(mapData.get(middle.getKey())); + mapData.get(middle.getKey()).getChildren().add(middle); + } + } else { + PCAtotal pcs = new PCAtotal(); + BeanUtils.copyProperties(pcAtotal, pcs); + //建立空的子 为了后面遍历 + List list = new ArrayList<>(); + List list1 = new ArrayList<>(); + list.add(middle); + list1.add(middle); + pcs.setChildren(list); + List list2 = new ArrayList<>(); + PCAdataList adataLists = new PCAdataList(); + BeanUtils.copyProperties(mapData.get(middle.getKey()), adataLists); + adataLists.setWorkPeopleId(id); + adataLists.setWorkPeople(names.get(i)); + adataLists.setChildren(list1); + list2.add(adataLists); + pcs.setDataList(list2); + map.put(id, pcs); } + i++; } - if (flag==0){ - map.get(o.getWorkPeopleId()).getDataList().add(mapData.get(o.getKey())); - mapData.get(o.getKey()).getChildren().add(o); + } + }); + mapData.keySet().forEach(s -> { + if (null != mapData.get(s).getWorkPeopleId()) { + List peos = new ArrayList<>(Arrays.asList(mapData.get(s).getWorkPeopleId().split(","))); + List names = new ArrayList<>(Arrays.asList(mapData.get(s).getWorkPeople().split(","))); + int count=0; + for (String i : peos) { + if (null==map.get(i)){ + PCAtotal pcs = new PCAtotal(); + BeanUtils.copyProperties(pcAtotal, pcs); + //建立空的子 为了后面遍历 + List list = new ArrayList<>(); + List list2 = new ArrayList<>(); + PCAdataList pcAdataList = new PCAdataList(); + BeanUtils.copyProperties(mapData.get(s),pcAdataList); + pcAdataList.setChildren(list); + pcAdataList.setWorkPeopleId(i); + pcAdataList.setWorkPeople(names.get(count)); + list2.add(pcAdataList); + pcs.setDataList(list2); + map.put(i,pcs); + }else { + boolean flag=true; + for (PCAdataList pc:map.get(i).getDataList()) { + if (pc.getStandId().equals(mapData.get(s).getStandId())){ + flag=false; + } + } + if (flag){ + List list = new ArrayList<>(); + PCAdataList pcAdataList = new PCAdataList(); + BeanUtils.copyProperties(mapData.get(s),pcAdataList); + pcAdataList.setChildren(list); + pcAdataList.setWorkPeopleId(i); + pcAdataList.setWorkPeople(names.get(count)); + map.get(i).getDataList().add(pcAdataList); + } + } + count++; } - }else { - PCAtotal pcs=new PCAtotal(); - BeanUtils.copyProperties(pcAtotal,pcs); - //建立空的子 为了后面遍历 - List list=new ArrayList<>(); - List list1=new ArrayList<>(); - list.add(o); - list1.add(o); - pcs.setChildren(list); - List list2=new ArrayList<>(); - PCAdataList adataLists=new PCAdataList(); - BeanUtils.copyProperties(mapData.get(o.getKey()),adataLists); - adataLists.setChildren(list1); - list2.add(adataLists); - pcs.setDataList(list2); - map.put(o.getWorkPeopleId(),pcs); } }); map.forEach((s, pcAtotal1) -> { - if (null!=s) { + if (null != s && !"".equals(s)) { nextUserList.add(s); } }); - delegateTask.setVariable("workPeoples",nextUserList); + delegateTask.setVariable("workPeoples", nextUserList); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = delegateTask.getVariable("prcCreateUser",String.class); - String username = delegateTask.getVariable("prcCreateUserName",String.class); - String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-合规性评估"; + String user = delegateTask.getVariable("prcCreateUser", String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-合规性评估"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -112,8 +170,8 @@ public class PCAffLiableDistributeAfter implements TaskListener { } // 存储当前节点意见 - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String userId : nextUserList){ + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String userId : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -126,5 +184,6 @@ public class PCAffLiableDistributeAfter implements TaskListener { busBean.save(busProcessNewNext); } } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java index 149e681e..4941983a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.dto.DataList; 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; @@ -43,6 +44,7 @@ public class PCAgcManagerApproveAfter implements TaskListener { delegateTask.setVariable("bzManager", delegateTask.getVariable("bzfgl")); delegateTask.setVariable("gcFlag","1"); }else { + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("gcFlag", "2"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java index 8c2f80f6..6352e441 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.dto.DataList; 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; @@ -44,6 +45,7 @@ public class PCAjgManagerApproveAfter implements TaskListener { delegateTask.setVariable("gcManager", delegateTask.getVariable("gcjl")); delegateTask.setVariable("jgFlag","1"); }else { + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("jgFlag", "2"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java index 3d99d30a..bc386aa2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -39,17 +39,12 @@ public class AutoStartAfter implements TaskListener { List nextUserList = new ArrayList(); String prcName ="标准化活动会后流程-"; - prcName = prcName + "参会人上传会议资料，填写标准及议题"; - if ("1".equals(object.getString("auto"))){ - delegateTask.setVariable("member", object.getString("member")); + if(StringUtils.isNotBlank(object.getString("member"))) { + prcName = prcName + "参会人上传会议资料，填写标准及议题"; nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", object.getString("member")); } - else { - if (StringUtils.isNotBlank(object.getString("memberId"))) { - delegateTask.setVariable("member", object.getString("memberId")); - nextUserList.add(object.getString("memberId")); - } - } + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java index 3e4ca1cb..6f0bf4f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -51,8 +51,6 @@ public class DirectorVerifyAfter implements TaskListener { if(StringUtils.isNotBlank(object.getString("member"))) { nextUserList.add(object.getString("member")); delegateTask.setVariable("member", object.getString("member")); - }else{ - nextUserList.add(delegateTask.getVariable("member",String.class)); } } 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 008f6c6a..c71ef580 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,7 +1,5 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; -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_auth.LawsUserInfoService; @@ -11,7 +9,6 @@ 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; @@ -20,7 +17,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.UUID; /** * EngineerReviseDone - 标准法规工程师汇总修订 @@ -31,10 +27,9 @@ public class EngineerReviseDoneAfter implements TaskListener { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); //流程节点信息 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); - //存储会议信息 - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //流程信息 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,9 +39,11 @@ public class EngineerReviseDoneAfter implements TaskListener { List nextUserList = new ArrayList(); String prcName = "标准化活动参会流程-"; +// prcName = "标准化活动参会流程-" + "会议结束"; prcName = prcName + "流程结束"; + //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -84,41 +81,14 @@ 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()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); - lawsUserInfoService.addMeeting(sapMeeting); - } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java index 1a26796a..afe97b04 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java @@ -10,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -42,7 +43,10 @@ public class ProcessStep2After implements TaskListener { } if (delegateTask.getVariable("count",Integer.class)==1){ //对数据进行处理 现阶段是数据貌似是只需要人和意见就可以了！！！！ - List busProcessNews = busBean.findLastworkPeople2("企标复审流程-起草人修改标准状态",delegateTask.getProcessInstanceId()); + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq("TASK_ID","6969696969696969"); + wrapper.eq("P_ID",delegateTask.getProcessInstanceId()); + List busProcessNews = busBean.list(wrapper); List stings=new ArrayList<>(); stings.add(object.getString("presentPeople")+"-"+object.getString("reviewComments")); busProcessNews.forEach(busProcessNew -> { @@ -60,7 +64,7 @@ public class ProcessStep2After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = "企标复审流程-起草人修改标准状态"; + String prcName = "企标废止流程-起草人修改标准状态"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java index 40b3c171..a843aa97 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java @@ -41,7 +41,7 @@ public class ProcessStep3After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = "企标复审流程-标准法规部部长审核"; + String prcName = "企标废止流程-标准法规部部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java index 69a5f231..982a7850 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java @@ -49,9 +49,9 @@ public class ProcessStep4After implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName=""; if ("0".equals(object.getString("bzFlag"))){ - prcName = "企标复审流程-审定责任人审定"; + prcName = "企标废止流程-审定责任人审定"; }else { - prcName = "企标复审流程-起草人修改标准状态"; + prcName = "企标废止流程-起草人修改标准状态"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java index 806d6533..0252988a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java @@ -49,9 +49,9 @@ public class ProcessStep5After implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; if ("0".equals(object.getString("sdFlag"))){ - prcName = "企标复审流程-批准负责人审批"; + prcName = "企标废止流程-批准负责人审批"; }else { - prcName = "企标复审流程-起草人修改标准状态"; + prcName = "企标废止流程-起草人修改标准状态"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java index b6596ff9..98b0d4cd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java @@ -2,13 +2,16 @@ package com.ydw.bat.wkflow.listener.aboliish; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.entity.SarBussionessStand; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -28,6 +31,7 @@ public class ProcessStep6After 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<>(); @@ -39,6 +43,13 @@ public class ProcessStep6After implements TaskListener { List nextUserList = new ArrayList(); if ("0".equals(object.getString("bafzFlag"))){ delegateTask.setVariable("bafzFlag","0"); + //入库"3lqnlgmgcn" + if ("废止".equals(object.getString("nextStatus"))) { + SarBussionessStand sarBussionessStand = new SarBussionessStand(); + sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus")); + sarBussionessStand.setId(object.getString("standId")); + lawsUserInfoService.updateSarBussionessStand(sarBussionessStand); + } }else { delegateTask.setVariable("bafzFlag","1"); nextUserList.add(delegateTask.getVariable("qcId",String.class)); @@ -49,9 +60,9 @@ public class ProcessStep6After implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; if ("0".equals(object.getString("sdFlag"))){ - prcName = "企标复审流程-批准负责人审批"; + prcName = "企标废止流程-批准负责人审批"; }else { - prcName = "企标复审流程-起草人修改标准状态"; + prcName = "企标废止流程-起草人修改标准状态"; } String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); QueryWrapper queryWrapper2 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java index 43b9f4d4..5cd49b81 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java @@ -54,18 +54,18 @@ public class BussLibrary10After implements TaskListener{ if(StringUtils.isNotBlank(approvalOpinion)){ if ("0".equalsIgnoreCase(approvalOpinion)) { - if(StringUtils.isNotBlank(object.getString("zrUserId"))){ + if(StringUtils.isNotBlank(object.getString("zhrUserId"))){ - delegateTask.setVariable("zrUserId",object.getString("zrUserId")); - nextUserList.add(object.getString("zrUserId")); + delegateTask.setVariable("zhrUserId",object.getString("zhrUserId")); + nextUserList.add(object.getString("zhrUserId")); BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); - delegateTask.setVariable("bzFlag", 0); + delegateTask.setVariable("fzrFlag", 0); }else { throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户"); } } else { - if(StringUtils.isNotBlank(object.getString("zqcUsrId"))) { + if(StringUtils.isNotBlank(object.getString("xdUserId"))) { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -73,13 +73,13 @@ public class BussLibrary10After implements TaskListener{ busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("zqcUsrId")); + busProcessNew.setUserId(object.getString("xdUserId")); busProcessNew.setPrcName(prcName); busBean.save(busProcessNew); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); - delegateTask.setVariable("cxdUserId",object.getString("zqcUsrId")); - delegateTask.setVariable("bzFlag", 1); + delegateTask.setVariable("cxdUserId",object.getString("xdUserId")); + delegateTask.setVariable("fzrFlag", 1); }else { throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java index 4c9c2974..86deba31 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java @@ -65,7 +65,7 @@ public class BussLibrary11After implements TaskListener{ throw new ActivitiException("1#2主起草人用户参数不存在,请配置相关用户"); } } else { - if(StringUtils.isNotBlank(object.getString("zqcUsrId"))) { + if(StringUtils.isNotBlank(object.getString("xdUserId"))) { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -73,12 +73,12 @@ public class BussLibrary11After implements TaskListener{ busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("zqcUsrId")); + busProcessNew.setUserId(object.getString("xdUserId")); busProcessNew.setPrcName(prcName); busBean.save(busProcessNew); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); - delegateTask.setVariable("cxdUserId",object.getString("zqcUsrId")); + delegateTask.setVariable("cxdUserId",object.getString("xdUserId")); delegateTask.setVariable("zrFlag", 1); }else { throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java index 0bba48cd..69473259 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java @@ -39,9 +39,9 @@ public class BussLibrary2After implements TaskListener{ List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("zqcUsrId"))){ - delegateTask.setVariable("hzUserId",object.getString("zqcUsrId")); - nextUserList.add(object.getString("zqcUsrId")); + if(StringUtils.isNotBlank(object.getString("hzUserId"))){ + delegateTask.setVariable("hzUserId",object.getString("hzUserId")); + nextUserList.add(object.getString("hzUserId")); }else { throw new ActivitiException("1#2主起草人不存在,请配置相关人员"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java index 99dd2bc1..14f34546 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java @@ -72,7 +72,7 @@ public class BussLibrary4After implements TaskListener{ throw new ActivitiException("1#2会签用户参数不存在,请配置相关用户"); } } else { - if(StringUtils.isNotBlank(object.getString("zqcUsrId"))) { + if(StringUtils.isNotBlank(object.getString("hzUserId"))) { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -85,7 +85,7 @@ public class BussLibrary4After implements TaskListener{ busBean.save(busProcessNew); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); - delegateTask.setVariable("hzUserId",object.getString("zqcUsrId")); + delegateTask.setVariable("chzUserId",object.getString("hzUserId")); delegateTask.setVariable("bzhFlag", 1); }else { throw new ActivitiException("1#2汇总用户参数不存在,请配置相关用户"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java index 60192394..a567d11a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.bussLibrary; +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; @@ -38,9 +39,17 @@ public class BussLibrary5After implements TaskListener{ List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("zqcUsrId"))){ - delegateTask.setVariable("xdUserId",object.getString("zqcUsrId")); - nextUserList.add(object.getString("zqcUsrId")); + JSONArray ideaList =delegateTask.getVariable("ideaList", JSONArray.class); + if (ideaList==null) { + ideaList=new JSONArray(); + } + + ideaList.addAll(object.getJSONArray("infoList")); + delegateTask.setVariable("ideaList",ideaList); + + if(StringUtils.isNotBlank(object.getString("xdUserId"))){ + delegateTask.setVariable("xdUserId",object.getString("xdUserId")); + nextUserList.add(object.getString("xdUserId")); }else { throw new ActivitiException("1#2标准化员不存在,请配置相关人员"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java index ddf9f1b5..6d3838b2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java @@ -1,5 +1,8 @@ package com.ydw.bat.wkflow.listener.bussLibrary; +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; @@ -25,6 +28,16 @@ public class BussLibrary6Before implements TaskListener{ List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + + /** + * 汇总已审批通过的意见 + */ + String msg = one1.getMesg(); + JSONObject jsonObject = JSON.parseObject(msg); + JSONArray ideaList=delegateTask.getVariable("ideaList",JSONArray.class); + jsonObject.put("infoList",ideaList); + one1.setMesg(jsonObject.toJSONString()); + one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java index ee243d43..3055089b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.bussLibrary; +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; @@ -36,13 +37,18 @@ public class BussLibrary7After implements TaskListener{ List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("fzrUserId"))){ - delegateTask.setVariable("fzrUserId",object.getString("fzrUserId")); - nextUserList.add(object.getString("fzrUserId")); + if(StringUtils.isNotBlank(object.getString("jsfzrUserId"))){ + delegateTask.setVariable("jsfzrUserId",object.getString("jsfzrUserId")); + nextUserList.add(object.getString("jsfzrUserId")); }else { throw new ActivitiException("1#2标准化员不存在,请配置相关人员"); } + JSONArray evaluationData =delegateTask.getVariable("evaluationList", JSONArray.class); + if (evaluationData==null) { + throw new ActivitiException("1#2评分关联数据不存在"); + } + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java index 0a67fe49..c43fb0b9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java @@ -60,12 +60,12 @@ public class BussLibrary8After implements TaskListener{ nextUserList.add(object.getString("bzUserId")); BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); - delegateTask.setVariable("bzhFlag", 0); + delegateTask.setVariable("jsfzrFlag", 0); }else { throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户"); } } else { - if(StringUtils.isNotBlank(object.getString("zqcUsrId"))) { + if(StringUtils.isNotBlank(object.getString("xdUserId"))) { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -78,8 +78,8 @@ public class BussLibrary8After implements TaskListener{ busBean.save(busProcessNew); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); - delegateTask.setVariable("cxdUserId",object.getString("zqcUsrId")); - delegateTask.setVariable("bzhFlag", 1); + delegateTask.setVariable("cxdUserId",object.getString("xdUserId")); + delegateTask.setVariable("jsfzrFlag", 1); }else { throw new ActivitiException("1#2 提交OR驳回参数不存在"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java index bae8e033..698adb1b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java @@ -65,7 +65,7 @@ public class BussLibrary9After implements TaskListener{ throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户"); } } else { - if(StringUtils.isNotBlank(object.getString("zqcUsrId"))) { + if(StringUtils.isNotBlank(object.getString("xdUserId"))) { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -73,12 +73,12 @@ public class BussLibrary9After implements TaskListener{ busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("zqcUsrId")); + busProcessNew.setUserId(object.getString("xdUserId")); busProcessNew.setPrcName(prcName); busBean.save(busProcessNew); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); - delegateTask.setVariable("cxdUserId",object.getString("zqcUsrId")); + delegateTask.setVariable("cxdUserId",object.getString("xdUserId")); delegateTask.setVariable("bzFlag", 1); }else { throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java index 18b16954..68325b08 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java @@ -2,9 +2,11 @@ package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.entity.SarBussionessStand; 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; @@ -29,6 +31,8 @@ public class ProcessStep3After 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()); @@ -41,7 +45,10 @@ public class ProcessStep3After implements TaskListener { if ("修订".equals(object.getString("nextStatus"))){ }else if ("废止".equals(object.getString("nextStatus"))){ - // TODO: 2021/11/16 等待超哥的修改企标状态的接口 + SarBussionessStand sarBussionessStand = new SarBussionessStand(); + sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus")); + sarBussionessStand.setId(object.getString("standId")); + lawsUserInfoService.updateSarBussionessStand(sarBussionessStand); } QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -84,7 +91,6 @@ public class ProcessStep3After implements TaskListener { queryWrapper1.eq("TASK_ID",delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if(one1!=null){ - one1.setCommitFlag("0"); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index 827c8279..2376c544 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -2,17 +2,22 @@ package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.entity.EsRevisePlanDTO; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; public class ProcessStep4After implements TaskListener { @@ -27,6 +32,8 @@ public class ProcessStep4After 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()); @@ -40,6 +47,47 @@ public class ProcessStep4After implements TaskListener { if ("0".equals(object.getString("bzfgbzFlag"))){ prcName = "企标制修订计划-流程结束"; delegateTask.setVariable("bzfgbzFlag",0); + //1合并 2延期 3取消 4更名 5立项 + if ("1".equals(object.getString("type"))){ + lawsUserInfoService.delPlan(object.getString("esId1")+","+object.getString("esId2")); + EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); + esRevisePlanDTO.setEsName(object.getString("esName")); + esRevisePlanDTO.setUnit(object.getString("unit")); + esRevisePlanDTO.setDrafter(object.getString("drafter")); + esRevisePlanDTO.setResPerson(object.getString("resPerson")); + esRevisePlanDTO.setPlanStatus(object.getString("planStatus")); + esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus")); + esRevisePlanDTO.setWgLeader(object.getString("wgLeader")); + esRevisePlanDTO.setDraftTime(object.getDate("draftTime")); + esRevisePlanDTO.setReleaseTime(object.getDate("releaseTime")); + lawsUserInfoService.addPlan(esRevisePlanDTO); + }else if ("2".equals(object.getString("type"))){ + EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); + esRevisePlanDTO.setId(object.getString("esId")); + esRevisePlanDTO.setReleaseTime(object.getDate("yqReleaseTime")); + esRevisePlanDTO.setDraftTime(object.getDate("yqDraftTime")); + lawsUserInfoService.modPlan(esRevisePlanDTO); + }else if ("3".equals(object.getString("type"))){ + lawsUserInfoService.delPlan(object.getString("esId")); + }else if ("4".equals(object.getString("type"))){ + EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); + esRevisePlanDTO.setEsName(object.getString("renameEs")); + esRevisePlanDTO.setId(object.getString("esId")); + lawsUserInfoService.modPlan(esRevisePlanDTO); + }else { + //立项 + EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); + esRevisePlanDTO.setEsName(object.getString("esName")); + esRevisePlanDTO.setUnit(object.getString("unit")); + esRevisePlanDTO.setDrafter(object.getString("drafter")); + esRevisePlanDTO.setResPerson(object.getString("resPerson")); + esRevisePlanDTO.setPlanStatus(object.getString("planStatus")); + esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus")); + esRevisePlanDTO.setWgLeader(object.getString("wgLeader")); + esRevisePlanDTO.setDraftTime(object.getDate("draftTime")); + esRevisePlanDTO.setReleaseTime(object.getDate("releaseTime")); + lawsUserInfoService.addPlan(esRevisePlanDTO); + } }else { prcName="企标制修订计划整改"; delegateTask.setVariable("bzfgbzFlag",1); @@ -50,12 +98,16 @@ public class ProcessStep4After implements TaskListener { } //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { + if ("0".equals(object.getString("bzfgbzFlag"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("25"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -88,5 +140,6 @@ public class ProcessStep4After implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } +// throw new ActivitiException("fa"); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java similarity index 63% rename from src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java index b7eedeca..228a9f92 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java @@ -1,26 +1,27 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; +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; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto; import com.ydw.bat.wkflow.util.SpringContextUtil; -import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; -import org.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 LaunchAfter implements TaskListener { +//分发 +public class Step1After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); @@ -36,45 +37,33 @@ public class LaunchAfter implements TaskListener { List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("responseDockerId"))){ - nextUserList= Arrays.asList(object.getString("responseDockerId").split(",")); - // 配置多实例 - delegateTask.setVariable("counterpartUserList",nextUserList); - delegateTask.addCandidateUsers(nextUserList); + if (object.getString("detailPeople").contains(",")){ + nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("detailPeople").split(",")))); + }else { + nextUserList.add(object.getString("detailPeople")); } - + delegateTask.setVariable("qrPeopleList",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 = "政策征求意见流程-任务分发"; + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); + 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"); + if ("0".equals(object.getString("passFlag"))) { + one1.setOverTime(OVERTIME); + } + one1.setPrcType("10"); 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()){ + if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); @@ -89,8 +78,4 @@ public class LaunchAfter implements TaskListener { } } } - - private String verifyObj(String str){ - return (str == null || str.equals("")) ? "" : str; - } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1Before.java similarity index 79% rename from src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1Before.java index 5c2a65c9..9f7e7348 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1Before.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; @@ -9,18 +9,14 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.List; -/** - * 对接人审核 - */ -public class DockerReviewBefore implements TaskListener { + +public class Step1Before 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("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ @@ -28,8 +24,10 @@ public class DockerReviewBefore implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzrkStep2?prcType=laws2"); + one1.setLink("xmqdqrStep3?prcType=10"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java similarity index 51% rename from src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java index 958944e8..f6393bd3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java @@ -1,35 +1,33 @@ -package com.ydw.bat.wkflow.listener.lawsLibrary; +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; +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; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto; import com.ydw.bat.wkflow.util.SpringContextUtil; -import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; -import org.apache.commons.lang.StringUtils; +import java.rmi.activation.ActivationException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; - -/** - * 政策入库申请人发起后 - */ -public class LLApplicantAfter implements TaskListener{ - +//汇总 +public class Step3After 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); + LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -39,72 +37,25 @@ public class LLApplicantAfter implements TaskListener{ delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - - // 逻辑判断是否会签 signFlag -// JSONObject array = object.getJSONObject("hqsqForm"); - -// if(object.getString("signFlag").equals("1")){ -// delegateTask.setVariable("hqFlag",1); -// -// if(StringUtils.isNotBlank(object.getString("zrUserId"))){ -// -// if(object.getString("zrUserId").contains(",")){ -// nextUserList = Arrays.asList(object.getString("zrUserId").split(",")); -// }else { -// nextUserList.add(object.getString("zrUserId")); -// } -// // 配置多实例 -// delegateTask.setVariable("hqUserList",nextUserList); -// delegateTask.addCandidateUsers(nextUserList); -// }else { -// throw new ActivitiException("1#2会签状态不存在,请配置相关状态"); -// } -// }else { -// delegateTask.setVariable("hqFlag",2); -// -// } - - if(StringUtils.isNotBlank(object.getString("jlUserId"))){ - delegateTask.setVariable("managerUserId",object.getString("jlUserId")); - nextUserList.add(object.getString("jlUserId")); - }else { - throw new ActivitiException("1#2经理人不存在,请配置相关人员"); - } - - + nextUserList.add(object.getString("approveId")); + delegateTask.setVariable("approveId",object.getString("approveId")); //截止时间 流程描述 创建人 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 = "政策入库流程"; + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); + 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("laws1"); + one1.setPrcType("10"); 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()){ + if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); @@ -119,8 +70,4 @@ public class LLApplicantAfter implements TaskListener{ } } } - - private String verifyObj(String str){ - return (str == null || str.equals("")) ? "" : str; - } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3Before.java similarity index 79% rename from src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3Before.java index 69a66eb9..4444d599 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3Before.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; @@ -9,18 +9,14 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.List; -/** - * 总监审核 - */ -public class DirectorBefore implements TaskListener { + +public class Step3Before 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("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ @@ -28,8 +24,10 @@ public class DirectorBefore implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzrkStep2?prcType=laws2"); + one1.setLink("xmqdqrStep3?prcType=10"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java index 79dc48ad..90577c95 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java @@ -19,7 +19,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; - +//评估 public class bzApproveAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -42,21 +42,28 @@ public class bzApproveAfter implements TaskListener { JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); for (Object os : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(os.toString()); - StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); - standProjectRelationDto.setProjectId(object.getString("projectId")); - standProjectRelationDto.setStandId(jsonObject.getString("id")); - standProjectRelationDtos.add(standProjectRelationDto); + if ("涉及".equals(jsonObject.getString("involve"))) { + StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); + standProjectRelationDto.setProjectId(object.getString("projectId")); + standProjectRelationDto.setStandId(jsonObject.getString("standId")); + standProjectRelationDtos.add(standProjectRelationDto); + } } lawsUserInfoService.batchInsert(standProjectRelationDtos); }else { delegateTask.setVariable("passFlag","1"); - nextUserList.add(delegateTask.getVariable("confirmId",String.class)); + nextUserList.add(delegateTask.getVariable("cpManagerSum",String.class)); } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程"; + String prcName=""; + if ("0".equals(object.getString("passFlag"))) { + prcName = "项目清单确认流程"; + }else { + prcName = "项目清单确认流程-产品工程经理查看汇总清单"; + } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java index 24684cd3..71d9bc47 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java @@ -1,32 +1,30 @@ package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; + 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; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; -import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +//确认 public class confirmAfter 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); - LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -35,23 +33,64 @@ public class confirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - delegateTask.setVariable("approveId",object.getString("approveId")); - nextUserList.add(object.getString("approveId")); - List standProjectRelationDtos = new ArrayList<>(); -// JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); -// for (Object os:jsonArray) { -// JSONObject jsonObject=JSONObject.parseObject(os.toString()); -// StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto(); -// standProjectRelationDto.setProjectId(object.getString("projectId")); -// standProjectRelationDto.setStandId(jsonObject.getString("id")); -// standProjectRelationDtos.add(standProjectRelationDto); -// } -// lawsUserInfoService.batchInsert(standProjectRelationDtos); + //设计一个确认人的计数器 + if (null!=delegateTask.getVariable("count")){ + delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1); + }else { + delegateTask.setVariable("count",1); + } + //判断是否为最后一步 决定数据是否需要合并***---*** + if (delegateTask.getVariable("qrPeopleList",List.class).size()==delegateTask.getVariable("count",Integer.class)){ + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID","xmqd"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List busProcessNews=busBean.list(queryWrapper1); + JSONArray res=new JSONArray(); + JSONArray middle=new JSONArray(); + Map map=new HashMap<>(); + Map successmap=new HashMap<>(); + List standIds=new ArrayList<>(); + List successIds=new ArrayList<>(); + middle.addAll(object.getJSONArray("dataList")); + middle.forEach(o -> { + JSONObject object1=JSONObject.parseObject(o.toString()); + makeData(map, successmap, standIds, successIds, object, object1); + }); + for (BusProcessNew bus:busProcessNews) { + JSONObject object1=JSONObject.parseObject(bus.getMesg()); + JSONArray jsonArray=object1.getJSONArray("dataList"); + jsonArray.forEach(o -> { + JSONObject object11=JSONObject.parseObject(o.toString()); + makeData(map, successmap, standIds, successIds, object1, object11); + }); + } + //草拟吗 + successmap.keySet().forEach(s -> { + res.add(successmap.get(s)); + }); + map.keySet().forEach(s -> { + if (successIds.contains(s)) { + JSONObject jsonObject=successmap.get(s); + jsonObject.put("involve","involve"); + jsonObject.put("remarks",map.get(s).getString("remarks")); + }else { + res.add(map.get(s)); + } + }); +// successmap.keySet().forEach(s -> { +// if (!standIds.contains(s)){ +// res.add(successmap.get(s)); +// } +// }); + object.put("dataList",res); + } + nextUserList.add(delegateTask.getVariable("cpManager",String.class)); + delegateTask.setVariable("cpManagerSum",delegateTask.getVariable("cpManager",String.class)); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String prcName = "项目清单确认流程"; + String prcName = "项目清单确认流程-产品工程经理查看汇总清单"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -63,8 +102,6 @@ public class confirmAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - - if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); @@ -74,10 +111,42 @@ public class confirmAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); + if (delegateTask.getVariable("qrPeopleList",List.class).size()!=delegateTask.getVariable("count",Integer.class)){ + busProcessNewNext.setTaskId("xmqd"); + } busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } } } + + private void makeData(Map map, Map successmap, List standIds, List successIds, JSONObject object1, JSONObject object11) { +// if (!standIds.contains(object11.getString("standId"))){ + if ("noInvolve".equals(object11.getString("involve"))){ + if (!standIds.contains(object11.getString("standId"))) { + object11.put("remarks", object1.getString("currentPerson") + ":" + object11.getString("remarks")); + standIds.add(object11.getString("standId")); + map.put(object11.getString("standId"), object11); + }else { + standIds.add(object11.getString("standId")); + map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks")); + } + }else { + if (!successIds.contains(object11.getString("standId"))) { + successmap.put(object11.getString("standId"),object11); + successIds.add(object11.getString("standId")); + } + } +// }else { +// if ("noInvolve".equals(object11.getString("involve"))){ +// standIds.add(object11.getString("standId")); +// map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks")); +// }else { +// if (!successIds.contains(object11.getString("standId"))) { +// successmap.put(object11.getString("standId"),object11); +// } +// } +// } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java index e2da5788..90719b02 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java @@ -16,7 +16,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; - +//启动 public class itemlistvalidationprocessStartAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -33,7 +33,7 @@ public class itemlistvalidationprocessStartAfter implements TaskListener { List nextUserList = new ArrayList(); nextUserList.add(object.getString("confirmId")); - delegateTask.setVariable("confirmId",object.getString("confirmId")); + delegateTask.setVariable("cpManager",object.getString("confirmId")); delegateTask.setVariable("dl",object.getString("approveId")); @@ -42,7 +42,7 @@ public class itemlistvalidationprocessStartAfter implements TaskListener { String username = object.getString("startUserName"); delegateTask.setVariable("startId",user); delegateTask.setVariable("startName",username); - String prcName = "项目清单确认流程"; + String prcName = "项目清单确认流程-产品工程经理分发清单"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantBefore.java deleted file mode 100644 index b3a8cab3..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantBefore.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ydw.bat.wkflow.listener.lawsLibrary; - -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.delegate.TaskListener; - -/** - * 政策入库申请人发起前 - */ -public class LLApplicantBefore implements TaskListener{ - @Override - public void notify(DelegateTask delegateTask) { - -// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); -// QueryWrapper queryWrapper1 = new QueryWrapper(); -// queryWrapper1.isNull("TASK_ID"); -// List list = busBean.list(queryWrapper1); -// if(!list.isEmpty()){ -// BusProcessNew one1 = list.get(0); -// one1.setTaskId(delegateTask.getId()); -// busBean.saveOrUpdate(one1); -// } -// - -// WkFlowSendEmail.sendEmailTodo(delegateTask,"会前申请流程"); - } -} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java deleted file mode 100644 index af032498..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java +++ /dev/null @@ -1,109 +0,0 @@ -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 DirectorAfter 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"))){ - delegateTask.setVariable("lawsProveChiefVerify",0); - } - - - //截止时间 流程描述 创建人 - 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("1"); - 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 (object.getString("lawsProveChiefVerify")=="0"){ - func2(delegateTask, busBean, object, "0", busProcessNameService); - } - - } - - private String verifyObj(String str){ - return (str == null || str.equals("")) ? "" : str; - } - - //流程结束 - 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("laws2"); - 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/policyCommentProcess/DistributionBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java deleted file mode 100644 index c4142677..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; - -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 DistributionBefore 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()); - 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/EngineerReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java deleted file mode 100644 index 8e2fffc2..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; - -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 EngineerReviewBefore 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()); - 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/FillCommentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java deleted file mode 100644 index a83486c6..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; - -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 FillCommentBefore 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()); - 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/LaunchBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java deleted file mode 100644 index 3ea9b1eb..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.netflix.eureka.util.batcher.TaskDispatcher; -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 LaunchBefore 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()); - 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/MinisterReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java deleted file mode 100644 index 6a4d6f82..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; - -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 MinisterReviewBefore 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()); - 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/ViceDirectorBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java deleted file mode 100644 index 941676e4..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.ydw.bat.wkflow.listener.policyCommentProcess; - -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 ViceDirectorBefore 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()); - busBean.saveOrUpdate(one1); - // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - //TODO 设置路由 - one1.setLink("bzrkStep2?prcType=laws2"); - one1.setTaskInfo(delegateTask.getName()); - oaService.sendTodoMq(one1); - } - } -} 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 68775625..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 @@ -10,7 +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.business_slrs.dao.WgDept; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -20,7 +20,6 @@ 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 @@ -30,9 +29,8 @@ public class PresidentApprovalAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - //存储会议信息 - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -49,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"); @@ -101,20 +128,6 @@ 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()); @@ -123,7 +136,6 @@ public class PresidentApprovalAfter implements TaskListener { busProcessNewNext.setTaskInfo("政策课题组参会流程-流程结束"); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); - lawsUserInfoService.addMeeting(sapMeeting); } } } 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"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java index f51ae55d..edd9edcd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java @@ -13,6 +13,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.StandProjectRelationDto; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; @@ -53,13 +54,15 @@ public class PEPDepartLeaderAfter implements TaskListener { JSONArray dataList=JSONArray.parseArray(object.getString("dataList")); List sarStandUnqualifieds=new ArrayList<>(); List productAssesses=new ArrayList<>(); + //清单和项目关联 + List standProjectRelationDtos = new ArrayList<>(); int i=0; for (Object j : jsonArray) { Step3DTO o=JSONObject.parseObject(String.valueOf(j), Step3DTO.class); JSONObject object1=JSONObject.parseObject(dataList.getString(i)); //未符合项整改 保存 //在研不合规 - if (null!=object1.getString("noCompliance")) { + if (null!=object1.getString("noCompliance") && !"".equals(object1.getString("noCompliance"))) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(delegateTask.getVariable("standsId",String.class)); @@ -79,10 +82,11 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(object1.getString("noCompliance")); sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("completionTime")),Date.class)); + sarStandUnqualified.setProductId(o.getProjectNumber()); sarStandUnqualifieds.add(sarStandUnqualified); } - if (null!=object1.getString("zcNoCompliance")) { + if (null!=object1.getString("zcNoCompliance") && !"".equals(object1.getString("zcNoCompliance"))) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(delegateTask.getVariable("standsId",String.class)); @@ -102,6 +106,7 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setReason(object1.getString("zcNoCompliance")); sarStandUnqualified.setProductType("product"); sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("zcCompletionTime")),Date.class)); + sarStandUnqualified.setProductId(o.getProjectNumber()); sarStandUnqualifieds.add(sarStandUnqualified); } //合估评规 结果！ @@ -128,6 +133,9 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandard.setResearchCountermeasures(object1.getString("countermeasures")); sarStandard.setResearchNonCompliance(object1.getString("noCompliance")); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + sarStandard.setEvaluationPeople(object1.getString("implementer")); + sarStandard.setEvaluationPeopleName(object1.getString("implementerId")); + sarStandard.setEvaluationTime(simpleDateFormat.format(new Date())); try { if (null!=delegateTask.getVariable("XCXSSRQ")) { sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ")))); @@ -139,10 +147,18 @@ public class PEPDepartLeaderAfter implements TaskListener { e.printStackTrace(); } i++; + Map map=delegateTask.getVariable("numberWithId",Map.class); + StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); + standProjectRelationDto.setProjectId(String.valueOf(map.get(o.getProjectNumber()))); + standProjectRelationDto.setStandId(delegateTask.getVariable("standsId",String.class)); + if (!standProjectRelationDtos.contains(standProjectRelationDto)) { + standProjectRelationDtos.add(standProjectRelationDto); + } //数据归类 productAssesses.add(sarStandard); } //数据入库！！！！ + lawsUserInfoService.batchInsert(standProjectRelationDtos); lawsUserInfoService.addsarStandUnqualified(sarStandUnqualifieds); lawsUserInfoService.addProduct(productAssesses); //是否审批通过 passFlag == 1 通过 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java index 5d26b627..b1416a74 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java @@ -45,7 +45,10 @@ public class PEPffresPersonAfter implements TaskListener { delegateTask.setVariable("objectJson", object); String prcName = ""; - if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) { + if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){ + prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批"; + } + else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) { prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批"; } else { prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估"; @@ -65,10 +68,11 @@ public class PEPffresPersonAfter implements TaskListener { delegateTask.setVariable("fenFlag", "1"); } else { //不通过就要驳回 + object.put("dataList",delegateTask.getVariable(object.getString("key"))); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("workPeople", String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("fenFlag", "2"); - + object.put("mark","back"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -124,9 +128,23 @@ public class PEPffresPersonAfter implements TaskListener { List busProcessNews=busBean.findLastworkPeople("projectEvaluationProcess5",delegateTask.getProcessInstanceId()); for (BusProcessNew b:busProcessNews) { JSONObject object=JSONObject.parseObject(b.getMesg()); - if (!"1".equals(object.getString("fenFlag"))) { + if ("".equals(b.getCommitText())) { JSONArray jsonArray = JSONArray.parseArray(object.getString("step3DTOS")); JSONArray dataList = JSONArray.parseArray(object.getString("dataList")); + //去除jaonArry中的无效数据 + JSONArray remove=new JSONArray(); + List standard=new ArrayList<>(); + dataList.forEach(o -> { + JSONObject os=JSONObject.parseObject(o.toString()); + standard.add(os.getString("itemNum")+os.getString("projectNumber")); + }); + jsonArray.forEach(o -> { + JSONObject object1=JSONObject.parseObject(o.toString()); + if (!standard.contains(object1.getString("itemNum")+object1.getString("projectNumber"))){ + remove.add(o); + } + }); + jsonArray.removeAll(remove); PEPDTO res = JSONObject.parseObject(object.toString(), PEPDTO.class); int i = 0; for (Object j : jsonArray) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java index 79b49b58..fa27c72e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java @@ -15,6 +15,7 @@ import com.ydw.bat.wkflow.util.DealWithDate; import com.ydw.bat.wkflow.util.JsonDateValueProcessor; import com.ydw.bat.wkflow.util.SpringContextUtil; import net.sf.json.JsonConfig; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.springframework.beans.BeanUtils; @@ -57,7 +58,6 @@ public class PEPmanagerApproveAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { -// one1.setOverTime(OVERTIME); one1.setPrcType("5"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -65,6 +65,7 @@ public class PEPmanagerApproveAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } //生成任务信息 + Map numberWithId=new HashMap<>(); Map map=new HashMap<>(); //是否审批通过 passFlag == 1 不通过 if (null!=object.get("passFlag")) { @@ -77,6 +78,7 @@ public class PEPmanagerApproveAfter implements TaskListener { PEPres pePres=new PEPres(); List pepdtos=new ArrayList<>(); for (SarStandProjectLibraries sa:da.getSarStandProjectLibraries()) { + numberWithId.put(sa.getProjectNumber(),sa.getId()); for (BreakdownList breakdownList1:breakdownList) { //造数据 //项目 @@ -120,6 +122,7 @@ public class PEPmanagerApproveAfter implements TaskListener { } } + delegateTask.setVariable("numberWithId",numberWithId); delegateTask.setVariable("liablePeopleList",liablePeopleList); delegateTask.setVariable("PEPAllCount",count); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java index 0c7a9910..1f83bd38 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java @@ -15,11 +15,13 @@ import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; public class PEPtaskEstimateAfter implements TaskListener { @@ -42,19 +44,35 @@ public class PEPtaskEstimateAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); - JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); + JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); + JSONArray ne = JSONArray.parseArray(object.getString("dataList")); + //操作数据库 + JSONArray remove = new JSONArray(); + for (Object json : jsonArray) { + JSONObject jsonObject1 = JSONObject.parseObject(json.toString()); + if ("".equals(jsonObject1.get("complianceReasons")) && "".equals(jsonObject1.get("noCompliance")) + && "".equals(jsonObject1.get("countermeasures")) && "".equals(jsonObject1.get("completionTime"))) { + remove.add(jsonObject1); + } + } + String uuid = String.valueOf(UUID.randomUUID()); + //代码放这带数据 + delegateTask.setVariable(uuid, jsonArray); + ne.removeAll(remove); + object.put("dataList", ne); + object.put("key", uuid); //设置分发负责人 List nextUserList = new ArrayList(); - JSONObject object1=JSONObject.parseObject(jsonArray.getString(0)); + JSONObject object1 = JSONObject.parseObject(ne.getString(0)); if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) { delegateTask.setVariable("ffUserId", object1.getString("distributePersonId")); - nextUserList.add(delegateTask.getVariable("ffUserId",String.class)); + nextUserList.add(delegateTask.getVariable("ffUserId", String.class)); } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-分发负责人审批"; + String prcName = delegateTask.getVariable("stands", String.class) + "-标准项目合规评估-分发负责人审批"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -67,12 +85,12 @@ public class PEPtaskEstimateAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - if (null!=object.getString("commentText")) { + if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); - queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); List list = busBean.list(queryWrapper3); - if(!list.isEmpty()){ + if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java index 24c4aa3d..fc1ab3ec 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java @@ -16,6 +16,7 @@ import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import java.text.SimpleDateFormat; import java.util.*; @@ -52,20 +53,28 @@ public class PEPtaskLssueAfter implements TaskListener { res.addAll(JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class)); JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class).forEach(step3DTO -> { List users = new ArrayList<>(Arrays.asList(step3DTO.getImplementerId().split(","))); - users.forEach(s1 -> { - step3DTO.setCertifiedEngineerName(String.valueOf(delegateTask.getVariable("certifiedEngineerName"))); - step3DTO.setQualityEngineerName(String.valueOf(delegateTask.getVariable("qualityEngineerName"))); + List names = new ArrayList<>(Arrays.asList(step3DTO.getImplementer().split(","))); + int i = 0; + + for (String s1 : users) { + Step3DTO result = new Step3DTO(); + BeanUtils.copyProperties(step3DTO, result); + result.setCertifiedEngineerName(String.valueOf(delegateTask.getVariable("certifiedEngineerName"))); + result.setQualityEngineerName(String.valueOf(delegateTask.getVariable("qualityEngineerName"))); + result.setImplementerId(s1); + result.setImplementer(names.get(i)); if (!workPeoples.contains(s1)) { workPeoples.add(s1); } if (null != maps.get(s1)) { - maps.get(s1).add(step3DTO); + maps.get(s1).add(result); } else { List dtos = new ArrayList<>(); - dtos.add(step3DTO); + dtos.add(result); maps.put(s1, dtos); } - }); + i++; + } }); } } @@ -74,10 +83,11 @@ public class PEPtaskLssueAfter implements TaskListener { } else { delegateTask.getVariable("workPeoples", List.class).addAll(workPeoples); } + //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估"; + String prcName = delegateTask.getVariable("stands", String.class) + "-标准项目合规评估-合规性评估"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index b877c8b0..dac7d739 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -30,6 +30,8 @@ public class WriteMaterialAfter 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()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index a961463e..3e28572b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -53,7 +53,7 @@ public class DeptApplayAfter implements TaskListener{ JSONObject os=JSONObject.parseObject(o.toString()); //分解单数据 SarStandItems sarStandItems1=new SarStandItems(); - sarStandItems1.setFileType("FBGBJBD"); + sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class)); sarStandItems1.setStandId(object.getString("standId")); sarStandItems1.setItemsNum(os.getString("itemsNum")); sarStandItems1.setItemsName(os.getString("itemsName")); @@ -81,7 +81,7 @@ public class DeptApplayAfter implements TaskListener{ standard.setComplianceState(os.getString("complianceState")); standard.setSpecificItem(os.getString("itemsNum")); standard.setStandNumber(object.getString("itemsNum")); - standard.setInterpretationTime(delegateTask.getCreateTime()); + standard.setInterpretationTime(new Date()); standard.setRiskDegree("0"); standards.add(standard); }); @@ -90,7 +90,7 @@ public class DeptApplayAfter implements TaskListener{ jsonArray1.forEach(obj ->{ JSONObject object1 = JSONObject.parseObject(obj.toString()); SarStandItems sarStandItems1=new SarStandItems(); - sarStandItems1.setFileType("FBGBJBD"); + sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class)); sarStandItems1.setStandId(object.getString("standId")); sarStandItems1.setItemsNum(object1.getString("itemsNum")); sarStandItems1.setItemsName(object1.getString("itemsName")); @@ -157,7 +157,6 @@ public class DeptApplayAfter implements TaskListener{ queryWrapper1.eq("TASK_ID",delegateTask.getId()); BusProcessNew one2 = busBean.getOne(queryWrapper1); if(one2!=null){ - one2.setCommitFlag("0"); one2.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one2); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 67958b60..45f33539 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -48,6 +48,7 @@ public class ResolveAfter implements TaskListener{ nextUserList.add(str); } // 配置多实例 + delegateTask.setVariable("fileTypeOnly",object.getString("fileType")); delegateTask.setVariable("zrUserList", nextUserList); //拆分标准 解读中情况下 也展示数据 SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO(); diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index ab75f860..b7e9b4db 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -50,16 +50,4 @@ CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束' - -