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

174-企标制修订计划管控流程-添加技术标准起草节点

Browse Source
This commit is contained in:
liyawei
2022-11-18 18:35:27 +08:00
parent 427b5535b1
commit 9b1b5ffad2
8 changed files with 183 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+13 -2
View File
@@ -20,9 +20,9 @@ import java.util.Map;
import java.util.Set;
@Component
@FeignClient(value = "FotonLAWSSystem",path="/api",url="")
//@FeignClient(value = "FotonLAWSSystem",path="/api",url="")
//线上部署用
//@FeignClient(value = "FotonLAWSSystem-test",path="/api",url="")
@FeignClient(value = "FotonLAWSSystem-test",path="/api",url="")
@RequestMapping("/")
public interface LawsUserInfoService {
@@ -212,4 +212,15 @@ public interface LawsUserInfoService {
public ResponseMessage<Object> insertNewsFeed(NewsFeed newsFeed);
@GetMapping("/esRevisePlan/es-revise-plan/listEsPrcRelationByWk")
public ResponseMessage<Object> listEsPrcRelation(@RequestParam("esId") String esId);
@PostMapping("/esRevisePlan/es-revise-plan/addEsPrcRelationByWk")
public ResponseMessage<Object> addEsPrcRelation(@RequestBody EsPrcRelationDTO esPrcRelationDTO);
@PostMapping("/esRevisePlan/es-revise-plan/modEsPrcRelationByWk")
public ResponseMessage<Object> modEsPrcRelation(@RequestBody EsPrcRelationDTO esPrcRelationDTO);
@GetMapping("/esRevisePlan/es-revise-plan/delEsPrcRelationByWk")
public ResponseMessage<Object> delEsPrcRelation(@RequestParam("esId") String esId);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsPrcRelationDTO.java
+22
View File
@@ -0,0 +1,22 @@
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;
@Data
@Accessors(chain = true)
@ApiModel(value="EsPrcRelation对象", description="企标计划和技术标准流程关联表")
public class EsPrcRelationDTO {
@ApiModelProperty(value = "企标计划ID")
private String esId;
@ApiModelProperty(value = "流程ID")
private String prcId;
}
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs4Before.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class BussFs4Before implements TaskListener {
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bussFs3?prcType=buss3");
one1.setLink("bussFs6?prcType=buss3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+2 -4
View File
@@ -51,6 +51,8 @@ public class ProcessStep4After implements TaskListener {
if ("0".equals(object.getString("bzfgbzFlag"))){
prcName = "企标制修订计划-流程结束";
delegateTask.setVariable("bzfgbzFlag",0);
nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class));
delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class));
// 建立对应字符串
Map<String,String> plan_status=new HashMap<>();
plan_status.put("未开始","0");
@@ -172,16 +174,12 @@ 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);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6After.java
+89
View File
@@ -0,0 +1,89 @@
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_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.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.TaskService;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.Date;
public class ProcessStep6After implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
//默认流程数据接口
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
//流程节点信息
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
TaskService taskService = SpringContextUtil.getBean(TaskService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
//截止时间 流程描述 创建人
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 queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper1);
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("25");
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
//存储当前节点意见
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID", delegateTask.getId());
BusProcessNew one2 = busBean.getOne(queryWrapper2);
if (one2 != null) {
one2.setMsgType("clause");
one2.setPId(delegateTask.getProcessInstanceId());
one2.setMesg(object.toJSONString());
one2.setFinishFlag("0");
one2.setTaskInfo(delegateTask.getName());
one2.setCommitFlag("0");
one2.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one2);
}
//1合并 2延期 3取消 4更名 5立项
String type=object.getString("type");
// 删除 进行中的 旧流程
if ("1".equals(type)) {
// List<Task> list = taskService.createTaskQuery().processInstanceId().active().list();
// if (list != null && !list.isEmpty()) {
//
// }
} else if ("2".equals(type)) {
} else if ("3".equals(type)) {
} else if ("4".equals(type)) {
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6Before.java
+39
View File
@@ -0,0 +1,39 @@
package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.List;
/**
* 企标制修订计划管控-技术标准起草
*/
public class ProcessStep6Before implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()) {
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("qbzxdjhgkStep6?prcType=25");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java
+14 -6
View File
@@ -40,13 +40,21 @@ public class ProcessstartAfter implements TaskListener {
delegateTask.setVariable("objectJson", object);
//标准法规部业务经理Id deptCenterId
List<String> nextUserList = new ArrayList();
nextUserList.add(object.getString("dockUser"));
delegateTask.setVariable("topmanagerId",object.getString("dockUser"));
if ("0".equals(object.getString("addFlag"))) {
nextUserList.add(object.getString("dockUser"));
delegateTask.setVariable("topmanagerId", object.getString("dockUser"));
delegateTask.setVariable("addFlag", object.getString("addFlag"));
//存储后续需要的人员
delegateTask.setVariable("Step1", object.getString("countersigner")); // 会签人员
delegateTask.setVariable("Step2", object.getString("examine")); // 审定人员
delegateTask.setVariable("Step3", object.getString("approver")); // 批准人员
} else {
delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); // 技术标准起草人员
delegateTask.setVariable("addFlag", object.getString("addFlag"));
}
//存储后续需要的人员
delegateTask.setVariable("Step1",object.getString("countersigner"));
delegateTask.setVariable("Step2",object.getString("examine"));
delegateTask.setVariable("Step3",object.getString("approver"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step1After.java
+3
View File
@@ -18,6 +18,9 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* 项目合规评估流程-项目
*/
public class Step1After implements TaskListener {