Merge remote-tracking branch 'origin/develop' into develop

2021-12-08 09:02:05 +08:00
parent 13a825ab5f a8d3f5e5ab
commit d579a5e20e
13 changed files with 754 additions and 28 deletions
@@ -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<String> 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")
@@ -140,4 +140,20 @@ public interface LawsUserInfoService {
    @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<Object> modPlan(@RequestBody EsRevisePlanDTO esRevisePlan);
+
+    @PostMapping("/esRevisePlan/es-revise-plan/addPlanByWk")
+    public ResponseMessage<Object> addPlan(@RequestBody EsRevisePlanDTO esRevisePlan);
+
+    @GetMapping("/esRevisePlan/es-revise-plan/delPlanByWk")
+    public ResponseMessage<Object> delPlan(@RequestParam("id") String id);
+
+
+    @GetMapping("/lawss/sarBussionessStand/updateSarBussionessStand")
+    public ResponseMessage<Object> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO);
+
+
+
+
 }
@@ -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;
+
+/**
+ * <p>
+ * 企标制修订计划
+ * </p>
+ *
+ * @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;
+
+}
@@ -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.*;
+
+/**
+ * <p>
+ * 企业标准信息表
+ * </p>
+ *
+ * @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<AttFileVo> standFileList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private List<AttFileVo> opinionFilesList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private List<AttFileVo> relevanceFileList = new ArrayList<AttFileVo>();
+
+    @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<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
+
+    @TableField(exist = false)
+    private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
+
+    @TableField(exist = false)
+    private String sarStandAttrEOStr; //新增修改时属性表信息
+
+    @TableField(exist = false)
+    private String fileIds; //全部文件ID
+
+    @TableField(exist = false)
+    private List<SarStandAttrDetailsEO> 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<AttFileVo> getStandFileList() {
+        return standFileList;
+    }
+
+    public void setStandFileList(List<AttFileVo> standFileList) {
+        this.standFileList = standFileList;
+    }
+
+    public List<AttFileVo> getOpinionFilesList() {
+        return opinionFilesList;
+    }
+
+    public void setOpinionFilesList(List<AttFileVo> opinionFilesList) {
+        this.opinionFilesList = opinionFilesList;
+    }
+
+    public List<AttFileVo> getRelevanceFileList() {
+        return relevanceFileList;
+    }
+
+    public void setRelevanceFileList(List<AttFileVo> 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<String, Object> getAttrInfoMap() {
+        return attrInfoMap;
+    }
+
+    public void setAttrInfoMap(Map<String, Object> attrInfoMap) {
+        this.attrInfoMap = attrInfoMap;
+    }
+
+    public Map<String, Object> getAttrInfoCaseMap() {
+        return attrInfoCaseMap;
+    }
+
+    public void setAttrInfoCaseMap(Map<String, Object> 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<SarStandAttrDetailsEO> getAttrInfoList() {
+        return attrInfoList;
+    }
+
+    public void setAttrInfoList(List<SarStandAttrDetailsEO> attrInfoList) {
+        this.attrInfoList = attrInfoList;
+    }
+}
@@ -21,4 +21,7 @@ public interface IBusProcessNameService extends IService<BusProcessName> {

    //新查询代办接口 初步测试中
    List<BusProcessName> todoTask(TaskCommonQuery taskCommonQuery);
+
+
+    String delDB(List<String> id);
 }
@@ -34,4 +34,13 @@ public class BusProcessNameServiceImpl extends ServiceImpl<BusProcessNameMapper,
        return busProcessNameMapper.todoTask(taskCommonQuery);
    }

+    @Override
+    public String delDB(List<String> id) {
+        if (busProcessNameMapper.deleteBatchIds(id)>0) {
+            return "success";
+        }else {
+            return "error";
+        }
+    }
+
 }
@@ -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;


@@ -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<BusProcessNew> busProcessNews = busBean.findLastworkPeople2("企标复审流程-起草人修改标准状态",delegateTask.getProcessInstanceId());
+            QueryWrapper<BusProcessNew> wrapper=new QueryWrapper<>();
+            wrapper.eq("TASK_ID","6969696969696969");
+            wrapper.eq("P_ID",delegateTask.getProcessInstanceId());
+            List<BusProcessNew> busProcessNews = busBean.list(wrapper);
            List<String> stings=new ArrayList<>();
            stings.add(object.getString("presentPeople")+"-"+object.getString("reviewComments"));
            busProcessNews.forEach(busProcessNew -> {
@@ -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<Datas> queryWrapper = new QueryWrapper<>();
@@ -39,6 +43,13 @@ public class ProcessStep6After implements TaskListener {
        List<String> 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));
@@ -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<Datas> 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);
            }
@@ -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<Datas> 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");
    }
 }
@@ -65,14 +65,23 @@ public class confirmAfter implements TaskListener {
                });
            }
            //草拟吗
-            map.keySet().forEach(s -> {
-               res.add(map.get(s));
-            });
            successmap.keySet().forEach(s -> {
-                if (!standIds.contains(s)){
-                    res.add(successmap.get(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));
@@ -113,25 +122,31 @@ public class confirmAfter implements TaskListener {
    }

    private void makeData(Map<String, JSONObject> map, Map<String, JSONObject> successmap, List<String> standIds, List<String> successIds, JSONObject object1, JSONObject object11) {
-        if (!standIds.contains(object11.getString("standId"))){
+//        if (!standIds.contains(object11.getString("standId"))){
            if ("noInvolve".equals(object11.getString("involve"))){
-                object11.put("remarks",object1.getString("currentPerson")+":"+object11.getString("remarks"));
-                standIds.add(object11.getString("standId"));
-                map.put(object11.getString("standId"),object11);
+                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);
-                }
-            }
-        }
+//        }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);
+//                }
+//            }
+//        }
    }
 }
@@ -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);
            });