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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-05-26 09:22:19 +08:00
parent 1f8949c324 228be71e01
commit d7c1908df0
11 changed files with 101 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/WG/NewsFeed.java
+65
View File
@@ -0,0 +1,65 @@
package com.ydw.bat.wkflow.business_main.datas.dto.WG;
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;
import java.util.Date;
/**
* @Author: qk
* @Date: 2022/5/23 0023 14:47
* @Version 1.0
*/
@Data
@Accessors(chain = true)
@ApiModel(value="NewsFeed对象", description="")
public class NewsFeed {
private static final long serialVersionUID = 1L;
@TableId
@ApiModelProperty(value = "主键")
private String id;
@TableField("RESOURCE_TYPE")
@ApiModelProperty(value = "资源类型")
private String resourceType;
@TableField("MESSAGE_TYPE")
@ApiModelProperty(value = "消息类型")
private String messageType;
@TableField("STANDARD_ID")
@ApiModelProperty(value = "标准类型")
private String standardId;
@TableField("STANDARD")
@ApiModelProperty(value = "标准号")
private String standard;
@TableField("STANDARD_NAME")
@ApiModelProperty(value = "标准名称")
private String standardName;
@TableField("RELEASE_DATE")
@ApiModelProperty(value = "发布日期")
private String releaseDate;
@TableField("TEXT_STATE")
@ApiModelProperty(value = "文本状态")
private String textState;
@TableField("RENEW_TIME")
@ApiModelProperty(value = "更新时间")
private Date renewTime;
}
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java
+11 -3
View File
@@ -53,9 +53,17 @@ public class DockingApprovalAfter implements TaskListener {
// object.getString("standName")
String standName = delegateTask.getVariable("number",String.class);
JSONObject jsonArray=JSONArray.parseObject(object.getString("info"));
JSONArray jsonArray1=JSONArray.parseArray(jsonArray.getString("fileDataList"));
JSONObject object111=JSONObject.parseObject(String.valueOf(jsonArray1.get(0)));
String prcName = standName+"-"+object111.getString("standName")+"-未符合项整改";
//区分驳回和通过
String prcName=null;
if(jsonArray==null){
JSONArray jsonArray2=JSONArray.parseArray(object.getString("responUserList"));
JSONObject object111=JSONObject.parseObject(String.valueOf(jsonArray2.get(0)));
prcName = standName+"-"+object111.getString("standName")+"-未符合项整改";
}else {
JSONArray jsonArray1=JSONArray.parseArray(jsonArray.getString("fileDataList"));
JSONObject object111=JSONObject.parseObject(String.valueOf(jsonArray1.get(0)));
prcName = standName+"-"+object111.getString("standName")+"-未符合项整改";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java
+15 -2
View File
@@ -2,6 +2,8 @@ package com.ydw.bat.wkflow.listener.standardLibrary;
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.WG.NewsFeed;
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;
@@ -16,6 +18,7 @@ import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.UUID;
/**
* 经理人审批后
@@ -26,7 +29,7 @@ public class ManagerApproveAfter implements TaskListener {
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<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
@@ -64,7 +67,7 @@ public class ManagerApproveAfter implements TaskListener {
/**
* 流程名称 标准号+"标准入库" + 下一个节点名称
*/
String prcName = standAllName+"-"+standName+"-批准";
String prcName = standAllName+"-"+standName+"-入库";
busProcessNew.setPrcName(prcName);
// busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
busBean.save(busProcessNew);
@@ -72,6 +75,16 @@ public class ManagerApproveAfter implements TaskListener {
func1(delegateTask, busBean, object, "1");
delegateTask.setVariable("jlFlag", 1);
} else {
NewsFeed newsFeed = new NewsFeed();
newsFeed.setId(String.valueOf(UUID.randomUUID()));
newsFeed.setRenewTime(new Date());
newsFeed.setResourceType(object.getString("standType"));
newsFeed.setMessageType("0");
newsFeed.setStandard(object.getString("standNumber"));
newsFeed.setStandardName(object.getString("standName"));
newsFeed.setReleaseDate(object.getString("issueTime"));
newsFeed.setTextState(object.getString("textStatus"));
lawsUserInfoService.insertNewsFeed(newsFeed);
delegateTask.setVariable("jlFlag", 0);
func2(delegateTask, busBean, object, "0", busProcessNameService);
}
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class DeptApplayAfter implements TaskListener{
}
} else {
delegateTask.setVariable("bzFlag", 2);
prcName=prcName+"-填写解读分析";
// prcName=prcName+"-填写解读分析";
JSONObject object1=object.getJSONObject("RollBack");
nextUserList.add(String.valueOf(object1.getString("id")));
delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack"));
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+2 -2
View File
@@ -43,13 +43,13 @@ public class EngineerApplayAfter implements TaskListener{
//工程师是否要进行审核
if (object.getString("zrApplyFlag").equals("1")) {
delegateTask.setVariable("gcFlag", 1);
prcName=prcName+"-部长审批";
// prcName=prcName+"-部长审批";
if (StringUtils.isNotBlank(object.getString("deptUserId"))) {
delegateTask.setVariable("deptUserId", object.getString("deptUserId"));
nextUserList.add(object.getString("deptUserId"));
}
} else {
prcName=prcName+"-填写解读分析";
// prcName=prcName+"-填写解读分析";
delegateTask.setVariable("gcFlag", 2);
JSONObject object1=object.getJSONObject("RollBack");
nextUserList.add(String.valueOf(object1.getString("id")));
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+2 -2
View File
@@ -43,7 +43,7 @@ public class ZrApplayAfter implements TaskListener{
//责任人是否要进行审核
if(object.getString("resolveFlag").equals("1")){
delegateTask.setVariable("zrFlag",1);
prcName=prcName+"-工程师审核";
// prcName=prcName+"-工程师审核";
// if(StringUtils.isNotBlank(object.getString("applyUserId"))){
// delegateTask.setVariable("engineerUserId",object.getString("applyUserId"));
// nextUserList.add(object.getString("applyUserId"));
@@ -53,7 +53,7 @@ public class ZrApplayAfter implements TaskListener{
nextUserList.add(delegateTask.getVariable("userId",String.class));
// }
}else {
prcName=prcName+"-填写解读分析";
// prcName=prcName+"-填写解读分析";
delegateTask.setVariable("zrFlag",2);
log.error("解读流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId")));
JSONObject object1=object.getJSONObject("RollBack");
src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1After.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class Step1After implements TaskListener {
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String prcName = object.getString("projectNumber")+"-项目合规评估流程-项目维度";
String prcName = object.getString("projectNumber")+object.getString("projectName")+"-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2After.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class Step2After implements TaskListener {
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规部部长审核";
String prcName = object.getString("projectNumber")+object.getString("projectName")+"-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3After.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class Step3After implements TaskListener {
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName",String.class);
String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-标准法规部部长审核";
String prcName = object.getString("projectNumber")+object.getString("projectName")+"-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class Step4After implements TaskListener {
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName",String.class);
String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-标准法规部部长审核";
String prcName = object.getString("projectNumber")+object.getString("projectName")+"-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java
+1 -1
View File
@@ -131,7 +131,7 @@ public class Step5After 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 = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规部部长审核";
String prcName = object.getString("projectNumber")+object.getString("projectName")+"-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);