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/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index 827c8279..cbe4ba13 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,13 +2,16 @@ 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; @@ -27,6 +30,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 +45,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")) ||( !object.getString("esId1").isEmpty() && !object.getString("esId2").isEmpty())){ + 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); @@ -88,5 +134,6 @@ public class ProcessStep4After implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } +// throw new ActivitiException("fa"); } }