FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企标制修订计划管控---最新的 立项 取消 合并 修改

Browse Source
This commit is contained in:
yuezhihang
2021-12-29 16:07:15 +08:00
parent 26f45780b7
commit b953b9ee2b
2 changed files with 95 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java
+41
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.business_main.datas.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -68,4 +69,44 @@ public class EsRevisePlanDTO {
@ApiModelProperty(value = "起草责任单位")
private String unit;
@ApiModelProperty(value = "起草责任单位ID")
private String unitName;
@ApiModelProperty(value = "引入企业标准json(标准id)")
private String rqbJson;
@ApiModelProperty(value = "引入企业标准json(标准名称)")
private String rqbName;
@ApiModelProperty(value = "引入企业标准json(标准编号)")
private String rqbCode;
@ApiModelProperty(value = "体系结构树（id存储方式是逗号拼接）")
private String tsJson;
@ApiModelProperty(value = "体系结构树（名称逗号拼接展示）")
private String tsJsonName;
@ApiModelProperty(value = "标准范围")
private String area;
@ApiModelProperty(value = "标准范围")
private String areaName;
//企标类别
private String standType;
@ApiModelProperty(value = "企标类别")
private String esMatingRelations;
private String esStandRelations;
@ApiModelProperty(value = "是否引用标准")
@TableField("is_relate")
private String isRelate;
@ApiModelProperty(value = "采用程度")
@TableField("use_level")
private String useLevel;
private String useLevelName;
@ApiModelProperty(value = "简述技术指标依据")
@TableField("technologic")
private String technologic;
@ApiModelProperty(value = "企标类别")
@TableField("buss_sort")
private String bussSort;
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+54 -11
View File
@@ -16,9 +16,7 @@ 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 ProcessStep4After implements TaskListener {
@@ -47,19 +45,50 @@ public class ProcessStep4After implements TaskListener {
if ("0".equals(object.getString("bzfgbzFlag"))){
prcName = "企标制修订计划-流程结束";
delegateTask.setVariable("bzfgbzFlag",0);
// 建立对应字符串
Map<String,String> plan_status=new HashMap<>();
plan_status.put("未开始","0");
plan_status.put("制定中","1");
plan_status.put("修订中","2");
plan_status.put("已取消","3");
plan_status.put("已完成","4");
Map<String,String> revise_status=new HashMap<>();
revise_status.put("制定","1");
revise_status.put("修订","2");
//1合并 2延期 3取消 4更名 5立项
if ("1".equals(object.getString("type"))){
lawsUserInfoService.delPlan(object.getString("esId1")+","+object.getString("esId2"));
EsRevisePlanDTO del1=new EsRevisePlanDTO();
del1.setId(object.getString("esId1"));
del1.setPlanStatus("3");
lawsUserInfoService.modPlan(del1);
EsRevisePlanDTO del2=new EsRevisePlanDTO();
del2.setId(object.getString("esId2"));
del2.setPlanStatus("3");
lawsUserInfoService.modPlan(del2);
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setEsName(object.getString("esName"));
esRevisePlanDTO.setUnit(object.getString("unitId"));
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.setPlanStatus(plan_status.get(object.getString("planStatus")));
esRevisePlanDTO.setReviseStatus(revise_status.get(object.getString("reviseStatus")));
esRevisePlanDTO.setWgLeader(object.getString("wgLeader"));
esRevisePlanDTO.setDraftTime(object.getDate("draftTime"));
esRevisePlanDTO.setReleaseTime(object.getDate("releaseTime"));
esRevisePlanDTO.setEsMatingRelations(object.getString("esMatingRelations"));
esRevisePlanDTO.setEsStandRelations(object.getString("esStandRelations"));
esRevisePlanDTO.setUseLevel(object.getString("useLevel"));
esRevisePlanDTO.setIsRelate(object.getString("isRelate"));
esRevisePlanDTO.setTsJson(object.getString("tsJson"));
esRevisePlanDTO.setArea(object.getString("area"));
esRevisePlanDTO.setRqbJson(object.getString("rqbJson"));
esRevisePlanDTO.setPlanStatus(object.getString("planStatus"));
esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus"));
esRevisePlanDTO.setTechnologic(object.getString("technologic"));
esRevisePlanDTO.setBussSort(object.getString("bussSort"));
lawsUserInfoService.addPlan(esRevisePlanDTO);
}else if ("2".equals(object.getString("type"))){
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
@@ -68,7 +97,10 @@ public class ProcessStep4After implements TaskListener {
esRevisePlanDTO.setDraftTime(object.getDate("yqDraftTime"));
lawsUserInfoService.modPlan(esRevisePlanDTO);
}else if ("3".equals(object.getString("type"))){
lawsUserInfoService.delPlan(object.getString("esId"));
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setId(object.getString("esId"));
esRevisePlanDTO.setPlanStatus("3");
lawsUserInfoService.modPlan(esRevisePlanDTO);
}else if ("4".equals(object.getString("type"))){
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setEsName(object.getString("renameEs"));
@@ -78,14 +110,25 @@ public class ProcessStep4After implements TaskListener {
//立项
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setEsName(object.getString("esName"));
esRevisePlanDTO.setUnit(object.getString("unitId"));
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.setPlanStatus(plan_status.get(object.getString("planStatus")));
esRevisePlanDTO.setReviseStatus(revise_status.get(object.getString("reviseStatus")));
esRevisePlanDTO.setWgLeader(object.getString("wgLeader"));
esRevisePlanDTO.setDraftTime(object.getDate("draftTime"));
esRevisePlanDTO.setReleaseTime(object.getDate("releaseTime"));
esRevisePlanDTO.setEsMatingRelations(object.getString("esMatingRelations"));
esRevisePlanDTO.setEsStandRelations(object.getString("esStandRelations"));
esRevisePlanDTO.setUseLevel(object.getString("useLevel"));
esRevisePlanDTO.setIsRelate(object.getString("isRelate"));
esRevisePlanDTO.setTsJson(object.getString("tsJson"));
esRevisePlanDTO.setArea(object.getString("area"));
esRevisePlanDTO.setRqbJson(object.getString("rqbJson"));
esRevisePlanDTO.setPlanStatus(object.getString("planStatus"));
esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus"));
esRevisePlanDTO.setTechnologic(object.getString("technologic"));
esRevisePlanDTO.setBussSort(object.getString("bussSort"));
lawsUserInfoService.addPlan(esRevisePlanDTO);
}
}else {