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-07-20 16:46:13 +08:00
parent 26572e18c6
commit 660a5c7969
19 changed files with 304 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+8 -4
View File
@@ -2,10 +2,7 @@ package com.ydw.bat.wkflow.business_auth;
import com.github.pagehelper.PageInfo;
import com.tmsps.fk.common.wrapper.Wrapper;
import com.ydw.bat.wkflow.business_main.datas.dto.AddDetailedDto;
import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto;
import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList;
import com.ydw.bat.wkflow.business_main.datas.dto.SarStandUnqualified;
import com.ydw.bat.wkflow.business_main.datas.dto.*;
import com.ydw.bat.wkflow.business_main.datas.entity.*;
import feign.Headers;
import org.apache.ibatis.annotations.Param;
@@ -92,13 +89,20 @@ public interface LawsUserInfoService {
@PutMapping("sarLawsDetailedList/sar-laws-detailed-list/updateList")
public ResponseMessage updateLaws(@RequestBody DetailedUpDto addDetailedDto);
//合规评估流程
@PostMapping("sarStandUnqualified/sar-stand-unqualified/add")
public ResponseMessage addsarStandUnqualified(@RequestBody List<SarStandUnqualified> sarStandUnqualifieds);
@PostMapping("sarStandardComplianceAssessResult/add")
public ResponseMessage addProduct(@RequestBody List<SarStandardComplianceProductAssess> sarStandardComplianceProductAssesses);
@RequestMapping(value = "sarLawsDetailedList/sar-laws-detailed-list/getStandById",method = RequestMethod.POST)
public SarLawsDetailedList getStandById(@RequestParam("id") String id);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/BreakdownList.java
+4
View File
@@ -2,6 +2,8 @@
* Copyright 2021 bejson.com
*/
package com.ydw.bat.wkflow.business_main.datas.dto;
import lombok.Data;
import java.util.Date;
/**
@@ -10,6 +12,7 @@ import java.util.Date;
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
@Data
public class BreakdownList {
private String id;
@@ -21,6 +24,7 @@ public class BreakdownList {
private String applyArctic;
private String busStandCover;
private String responsibleUnit;
private String responsibleEngineer;
public void setId(String id) {
this.id = id;
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DataList.java
+32
View File
@@ -2,8 +2,10 @@
* Copyright 2021 bejson.com
*/
package com.ydw.bat.wkflow.business_main.datas.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -20,6 +22,36 @@ public class DataList {
private String distributePerson;
private String distributePersonId;
private String projectManager;
//合规评估添加的数据
private String itemNum;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xCXSSRQ;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zCCSSRQ;
private String itemsName;
private String standName;
private String implementer;
private String projectName;
private String standNumber;
private String noCompliance;
private String implementerId;
private String projectNumber;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date completionTime;
private String zcNoCompliance;
private String countermeasures;
private String qualityEngineer;
private String responsibleUnit;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zcCompletionTime;
private String certifiedEngineer;
private String complianceReasons;
private String zcCountermeasures;
private String responsibleEngineer;
private String zcComplianceReasons;
private List<SarStandProjectLibraries> sarStandProjectLibraries;
public void setUname(String uname) {
this.uname = uname;
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PEPDTO.java
+4
View File
@@ -34,6 +34,10 @@ public class PEPDTO {
//时间字段
private String ZCCSSRQ;
private String XCXSSRQ;
private String commentText;
private List<Step3DTO> step3DTOS;
public void setId(String id) {
this.id = id;
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java
+4 -3
View File
@@ -11,6 +11,7 @@ import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.sql.Timestamp;
import java.util.Date;
/**
* <p>
@@ -57,7 +58,7 @@ public class SarStandUnqualified {
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Timestamp createTime;
private Date createTime;
@ApiModelProperty(value = "关闭状态（1为开启，2为关闭）")
@TableField("CLOSE_STATE")
@@ -66,12 +67,12 @@ public class SarStandUnqualified {
@ApiModelProperty(value = "实际关闭时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Timestamp actualCloseTime;
private Date actualCloseTime;
@ApiModelProperty(value = "计划关闭时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Timestamp planCloseTime;
private Date planCloseTime;
@ApiModelProperty(value = "未符合原因")
private String reason;
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java
+109
View File
@@ -0,0 +1,109 @@
package com.ydw.bat.wkflow.business_main.datas.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author zyl
* @since 2021-06-18
*/
@Data
@Accessors(chain = true)
@ApiModel(value="SarStandardComplianceProductAssess对象", description="")
public class SarStandardComplianceProductAssess {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "'产品线'")
private String productLineId;
@ApiModelProperty(value = "'项目id'")
private String productId;
@ApiModelProperty(value = "'项目名称'")
private String productName;
@ApiModelProperty(value = "标准ID")
@TableField("STAND_ID")
private String standId;
@ApiModelProperty(value = "标准编号")
@TableField("STAND_NUMBER")
private String standNumber;
@ApiModelProperty(value = "'标准名称'")
@TableField("STAND_NAME")
private String standName;
@ApiModelProperty(value = "'标准章条'")
private String standardItem;
@ApiModelProperty(value = "标准类型")
@TableField("STAND_TYPE")
private String standType;
@ApiModelProperty(value = "标准主要内容")
private String standardInfo;
@ApiModelProperty(value = "1是在产，0是在研")
private Integer productType;
@ApiModelProperty(value = "在研产品实施时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date researchImplementationTime;
@ApiModelProperty(value = "在研产品合规信息")
private String researchCompliance;
@ApiModelProperty(value = "在研产品不合规项目")
private String researchNonCompliance;
@ApiModelProperty(value = "在研产品不合规应对措施")
private String researchCountermeasures;
@ApiModelProperty(value = "在研产品不合规完成时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date researchCompletionTime;
@ApiModelProperty(value = "在产产品实施时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionImplementationTime;
@ApiModelProperty(value = "在产产品合规信息")
private String productionCompliance;
@ApiModelProperty(value = "在产产品不合规应对措施")
private String productionCountermeasures;
@ApiModelProperty(value = "在产产品不合规完成时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionCompletionTime;
@ApiModelProperty(value = "审查状态")
@TableField("INTERPRETATION_STATE")
private String interpretationState;
@ApiModelProperty(value = "审查时间")
@TableField("INTERPRETATION_TIME")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date interpretationTime;
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java
+6 -1
View File
@@ -24,11 +24,16 @@ public class Step3DTO {
private String projectNumber;
private String projectManager;
private String qualityEngineer;
private String qualityEngineerName;
private String distributePerson;
private String certifiedEngineer;
private String certifiedEngineerName;
private String distributePersonId;
private String zCCSSRQ;
private String xCXSSRQ;
private String responsibleUnit;
private String responsibleEngineer;
private String standId;
private String standardInfo;
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class StartSurveyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java
+87 -5
View File
@@ -1,8 +1,12 @@
package com.ydw.bat.wkflow.listener.projectEvaluationProcess;
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.dto.SarStandUnqualified;
import com.ydw.bat.wkflow.business_main.datas.dto.SarStandardComplianceProductAssess;
import com.ydw.bat.wkflow.business_main.datas.dto.Step3DTO;
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;
@@ -10,10 +14,13 @@ 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 org.apache.commons.lang.StringUtils;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -42,11 +49,86 @@ public class PEPDepartLeaderAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
//存数据
//存数据 存储集合
JSONArray jsonArray=JSONArray.parseArray(object.getString("step3DTOS"));
JSONArray dataList=JSONArray.parseArray(object.getString("dataList"));
List<SarStandUnqualified> sarStandUnqualifieds=new ArrayList<>();
List<SarStandardComplianceProductAssess> productAssesses=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")) {
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
//少一个standId 不合格原因 在研在产！
sarStandUnqualified.setStandId(o.getStandNumber());
sarStandUnqualified.setStandName(o.getStandName());
sarStandUnqualified.setItemsNum(o.getItemNum());
sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class));
sarStandUnqualified.setItemsName(o.getItemsName());
sarStandUnqualified.setProductLine(o.getProductLine());
sarStandUnqualified.setCloseState(1);
sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(o.getStandName());
sarStandUnqualified.setQaEngineer(o.getQualityEngineer());
sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer());
sarStandUnqualified.setDutyEngineer(o.getDistributePersonId());
sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
sarStandUnqualified.setProductType("research");
sarStandUnqualified.setReason(object1.getString("noCompliance"));
sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("completionTime")),Date.class));
sarStandUnqualifieds.add(sarStandUnqualified);
}
if (null!=object1.getString("zcNoCompliance")) {
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
//少一个standId 不合格原因 在研在产！
sarStandUnqualified.setStandId(o.getStandNumber());
sarStandUnqualified.setStandName(o.getStandName());
sarStandUnqualified.setItemsNum(o.getItemNum());
sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class));
sarStandUnqualified.setItemsName(o.getItemsName());
sarStandUnqualified.setProductLine(o.getProductLine());
sarStandUnqualified.setCloseState(1);
sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(o.getStandName());
sarStandUnqualified.setQaEngineer(o.getQualityEngineer());
sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer());
sarStandUnqualified.setDutyEngineer(o.getDistributePersonId());
sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
sarStandUnqualified.setReason(object1.getString("zcNoCompliance"));
sarStandUnqualified.setProductType("product");
sarStandUnqualified.setPlanCloseTime(JSONObject.parseObject(String.valueOf(object1.get("zcCompletionTime")),Date.class));
sarStandUnqualifieds.add(sarStandUnqualified);
}
//合估评规 结果！
SarStandardComplianceProductAssess sarStandard=new SarStandardComplianceProductAssess();
sarStandard.setProductLineId(o.getProductLine());
sarStandard.setStandName(o.getStandName());
sarStandard.setStandNumber(o.getStandNumber());
//111
sarStandard.setProductionCompletionTime(JSONObject.parseObject(String.valueOf(object1.get("zcCompletionTime")),Date.class));
sarStandard.setProductionCountermeasures(object1.getString("zcCountermeasures"));
sarStandard.setProductionCompliance(object1.getString("zcNoCompliance"));
sarStandard.setResearchCompletionTime(JSONObject.parseObject(String.valueOf(object1.get("completionTime")),Date.class));
sarStandard.setResearchCountermeasures(object1.getString("countermeasures"));
sarStandard.setResearchNonCompliance(object1.getString("noCompliance"));
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ"))));
sarStandard.setProductionImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("ZCCSSRQ"))));
} catch (ParseException e) {
e.printStackTrace();
}
i++;
//数据归类
productAssesses.add(sarStandard);
}
//数据入库！！！！
lawsUserInfoService.addsarStandUnqualified(sarStandUnqualifieds);
lawsUserInfoService.addProduct(productAssesses);
//是否审批通过 passFlag == 1 通过
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
@@ -56,7 +138,7 @@ public class PEPDepartLeaderAfter implements TaskListener {
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(delegateTask.getVariable("DLUserId",String.class));
busBean.save(busProcessNew);
busBean.saveOrUpdate(busProcessNew);
func1(delegateTask, busBean, object, "0");
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java
+3 -2
View File
@@ -57,7 +57,7 @@ public class PEPSumAfter 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);
String prcName = "标准项目合规评估-汇总";
String prcName = "标准项目合规评估-标准法规部领导审批";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -80,7 +80,7 @@ public class PEPSumAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
busBean.saveOrUpdate(busProcessNew);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -94,5 +94,6 @@ public class PEPSumAfter implements TaskListener {
busBean.save(busProcessNewNext);
}
}
// throw new ActivitiException("Slkenaiufcuqgiurwajkgnl23n");
}
}
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java
+25 -16
View File
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
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.PEPDTO;
import com.ydw.bat.wkflow.business_main.datas.dto.PEPres;
import com.ydw.bat.wkflow.business_main.datas.dto.Step3DTO;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -17,6 +19,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.*;
@@ -63,7 +66,7 @@ public class PEPffresPersonAfter 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);
String prcName = "标准项目合规评估-分发负责人审批";
String prcName = "标准项目合规评估-汇总审批";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -85,44 +88,49 @@ public class PEPffresPersonAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
busBean.saveOrUpdate(busProcessNew);
oneStep1(delegateTask, busBean, object, nextUserList);
oneStep1(delegateTask, busBean, object, nextUserList);
}
private void oneStep1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, List<String> nextUserList) {
//中间对象
Map<String, List<BusProcessNew>> map = new HashMap<>();
Map<String, List<Step3DTO>> maps = new HashMap<>();
Map<String, PEPDTO> maps = new HashMap<>();
List<String> CPX = new ArrayList<>();
JSONArray jsonArray=JSONArray.parseArray(object.getString("step3DTOS"));
JSONArray dataList=JSONArray.parseArray(object.getString("dataList"));
PEPDTO res=JSONObject.parseObject(object.toString(),PEPDTO.class);
int i=0;
for (Object j : jsonArray) {
Step3DTO o=JSONObject.parseObject(String.valueOf(j), Step3DTO.class);
if (!CPX.contains(o.getProjectManager())){
CPX.add(o.getProjectManager());
}
if (null!=maps.get(o.getProjectManager())){
maps.get(o.getProjectManager()).add(o);
maps.get(o.getProjectManager()).getStep3DTOS().add(o);
maps.get(o.getProjectManager()).getDataList().add(JSONObject.parseObject(String.valueOf(dataList.get(i)),DataList.class));
}else {
PEPDTO re=new PEPDTO();
BeanUtils.copyProperties(res,re);
List<Step3DTO> mis=new ArrayList<>();
mis.add(o);
maps.put(o.getProjectManager(),mis);
re.setStep3DTOS(mis);
List<DataList> dataLists=new ArrayList<>();
DataList list=JSONObject.parseObject(String.valueOf(dataList.get(i)),DataList.class);
dataLists.add(list);
re.setDataList(dataLists);
maps.put(o.getProjectManager(),re);
}
i++;
}
//生成任务信息
for (String cp : CPX) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
if (null!=map.get(cp)) {
busProcessNewNext.setMesg(JsonUtil.toJson(map.get(cp)));
}else {
PEPres pePres=new PEPres();
pePres.setStep3DTOS(maps.get(cp));
busProcessNewNext.setMesg(JsonUtil.toJson(pePres));
}
busProcessNewNext.setMesg(JsonUtil.toJson(maps.get(cp)));
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
@@ -135,6 +143,7 @@ public class PEPffresPersonAfter implements TaskListener {
}else {
delegateTask.getVariable("CPXpeoples",List.class).addAll(CPX);
}
// throw new ActivitiException("Sfahfiq");
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java
+2 -2
View File
@@ -50,7 +50,7 @@ public class PEPmanagerApproveAfter 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);
String prcName = "标准项目合规评估-审批";
String prcName = "标准项目合规评估-流程下发";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -130,7 +130,7 @@ public class PEPmanagerApproveAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
busBean.saveOrUpdate(busProcessNew);
if(liablePeopleList != null && !liablePeopleList.isEmpty()){
for(String liable : liablePeopleList){
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java
+5 -2
View File
@@ -47,13 +47,16 @@ public class PEPstartAfter implements TaskListener {
//赋值标准法规部领导
delegateTask.setVariable("DLUserIds", object.getString("ministerUser"));
delegateTask.setVariable("qualityEngineer", object.getString("qualityEngineer"));
delegateTask.setVariable("certifiedEngineerName",object.getString("certifiedEngineerName"));
delegateTask.setVariable("qualityEngineerName",object.getString("qualityEngineerName"));
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String prcName = "标准项目合规评估流程-发起";
String prcName = "标准项目合规评估流程-审批";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -75,7 +78,7 @@ public class PEPstartAfter implements TaskListener {
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
busBean.saveOrUpdate(busProcessNew);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java
+2 -2
View File
@@ -54,7 +54,7 @@ public class PEPtaskEstimateAfter 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);
String prcName = "标准项目合规评估-合规评估";
String prcName = "标准项目合规评估-分发负责人审批";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -76,7 +76,7 @@ public class PEPtaskEstimateAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
busBean.saveOrUpdate(busProcessNew);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java
+4 -3
View File
@@ -51,6 +51,8 @@ public class PEPtaskLssueAfter implements TaskListener {
if (null!=map.get(s)) {
res.addAll(JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class));
JSONArray.parseArray(String.valueOf(map.get(s)), Step3DTO.class).forEach(step3DTO -> {
step3DTO.setCertifiedEngineerName(String.valueOf(delegateTask.getVariable("certifiedEngineerName")));
step3DTO.setQualityEngineerName(String.valueOf(delegateTask.getVariable("qualityEngineerName")));
if (!workPeoples.contains(step3DTO.getImplementerId())) {
workPeoples.add(step3DTO.getImplementerId());
}
@@ -73,7 +75,7 @@ public class PEPtaskLssueAfter 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);
String prcName = "标准项目合规评估-流程下发";
String prcName = "标准项目合规评估-合规性评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -97,7 +99,7 @@ public class PEPtaskLssueAfter implements TaskListener {
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
busBean.saveOrUpdate(busProcessNew);
//更改遍历方式！！遍历生成的数据条数 每条都要判断！！
if (workPeoples != null && !workPeoples.isEmpty()) {
for (String nextUser : workPeoples) {
@@ -115,5 +117,4 @@ public class PEPtaskLssueAfter implements TaskListener {
}
}
}
// }
}
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class CountersignSRPAfter implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = object.getString("standName");
String prcName = standName+"-标准法规清单申请";
String prcName = standName+"-标准法规清单-修订";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class SRPApplyApplicantAfter implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = object.getString("standName");
String prcName = standName+"-标准法规清单申请-修订";
String prcName = standName+"-标准法规清单申请-经理人审批";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java
-1
View File
@@ -29,7 +29,6 @@ public class SRPManagerApproveAfter implements TaskListener{
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<Datas> queryWrapper = new QueryWrapper<>();
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java
+6 -1
View File
@@ -87,7 +87,12 @@ public class SRPstartAfter implements TaskListener {
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String standName = object.getString("standName");
String prcName = standName+"-标准法规清单申请";
String prcName="";
if(object.getString("signFlag").equals("1")) {
prcName = standName + "-标准法规清单申请-会签";
}else {
prcName = standName + "-标准法规清单申请-经理审批";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);