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

174-管控流程,批准节点获取企标计划ID修改

Browse Source
This commit is contained in:
liyawei
2022-11-21 19:46:59 +08:00
parent edacaa3172
commit 592027a786
8 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+1 -1
View File
@@ -212,5 +212,5 @@ public interface LawsUserInfoService {
public ResponseMessage<Object> insertNewsFeed(NewsFeed newsFeed);
@GetMapping("/esRevisePlan/es-revise-plan/getAllPlansByWk")
public List<EsRevisePlanDTO> getAllPlansByWk();
public List<EsRevisePlanDTO> getAllPlansByWk(@RequestParam("esName") String esName);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/EsPrcRelationController.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class EsPrcRelationController {
IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class);
TaskService taskService = SpringContextUtil.getBean(TaskService.class);
List<EsRevisePlanDTO> esRevisePlanDTOList = lawsUserInfoService.getAllPlansByWk(); // 查询 制定中，修订中的企标计划
List<EsRevisePlanDTO> esRevisePlanDTOList = lawsUserInfoService.getAllPlansByWk(null); // 查询 制定中，修订中的企标计划
// 计划标准初稿时间前一个月的企标计划
SimpleDateFormat sdfQuery = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/EsPrcRelationServiceImpl.java
+3 -3
View File
@@ -25,7 +25,7 @@ public class EsPrcRelationServiceImpl extends ServiceImpl<EsPrcRelationMapper, E
public int addEsPrcRelation(String esId, String prcId, String prcIdGk) {
EsPrcRelation esPrcRelation = new EsPrcRelation();
esPrcRelation.setEsId(esId);
esPrcRelation.setOaFlag("0"); // 已办
esPrcRelation.setOaFlag("1"); // 待办
Date date = new Date();
esPrcRelation.setCreateTime(date);
esPrcRelation.setUpdateTime(date);
@@ -35,7 +35,7 @@ public class EsPrcRelationServiceImpl extends ServiceImpl<EsPrcRelationMapper, E
}
if (StringUtils.isNotBlank(prcIdGk)) {
esPrcRelation.setPrcId(prcIdGk);
esPrcRelation.setPrcIdGk(prcIdGk);
}
return this.baseMapper.insert(esPrcRelation);
}
@@ -56,7 +56,7 @@ public class EsPrcRelationServiceImpl extends ServiceImpl<EsPrcRelationMapper, E
}
if (StringUtils.isNotBlank(prcIdGk)) {
esPrcRelation.setPrcId(prcIdGk);
esPrcRelation.setPrcIdGk(prcIdGk);
}
QueryWrapper<EsPrcRelation> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(EsPrcRelation::getEsId, esPrcRelation.getEsId());
src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class ScheduledJobEsPlan {
IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class);
TaskService taskService = SpringContextUtil.getBean(TaskService.class);
List<EsRevisePlanDTO> esRevisePlanDTOList = lawsUserInfoService.getAllPlansByWk(); // 查询 制定中，修订中的企标计划
List<EsRevisePlanDTO> esRevisePlanDTOList = lawsUserInfoService.getAllPlansByWk(null); // 查询 制定中，修订中的企标计划
// 计划标准初稿时间前一个月的企标计划
SimpleDateFormat sdfQuery = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java
+1 -1
View File
@@ -174,7 +174,7 @@ public class BLApplicantAfter implements TaskListener{
}
}
// 删除旧的 计划和流程关联关系
// 删除旧的 计划和流程关联关系， 因为 一条计划只对应一条企标制修订流程
esPrcRelationService.delEsPrcRelation(esId1);
esPrcRelationService.delEsPrcRelation(esId2);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+36 -5
View File
@@ -3,13 +3,11 @@ 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.entity.*;
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.business_main.datas.service.IEsPrcRelationService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
@@ -38,6 +36,8 @@ public class ProcessStep4After implements TaskListener {
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -47,6 +47,7 @@ public class ProcessStep4After implements TaskListener {
//标准法规部业务经理Id
List<String> nextUserList = new ArrayList();
String prcName = "";
String nowEsId = "";
//根据意见选择 企标状态并对企标信息进行修改 bzfgId
if ("0".equals(object.getString("bzfgbzFlag"))){
prcName = "企标制修订计划-流程结束";
@@ -98,7 +99,12 @@ public class ProcessStep4After implements TaskListener {
esRevisePlanDTO.setRqbJson(object.getString("rqbJson"));
esRevisePlanDTO.setTechnologic(object.getString("technologic"));
esRevisePlanDTO.setBussSort(object.getString("bussSort"));
lawsUserInfoService.addPlan(esRevisePlanDTO);
List<EsRevisePlanDTO> esRevisePlanDTOS = lawsUserInfoService.getAllPlansByWk(object.getString("esName"));
if (esRevisePlanDTOS != null && !esRevisePlanDTOS.isEmpty()) {
nowEsId = esRevisePlanDTOS.get(0).getId();
}
}else if ("2".equals(object.getString("type"))){
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setId(object.getString("esId"));
@@ -140,8 +146,13 @@ public class ProcessStep4After implements TaskListener {
if(StringUtils.isNotBlank(object.getString("planId"))){
esRevisePlanDTO.setId(object.getString("planId"));
lawsUserInfoService.modStatePlan(esRevisePlanDTO);
object.getString("planId");
}else {
lawsUserInfoService.addPlan(esRevisePlanDTO);
List<EsRevisePlanDTO> esRevisePlanDTOS = lawsUserInfoService.getAllPlansByWk(object.getString("esName"));
if (esRevisePlanDTOS != null && !esRevisePlanDTOS.isEmpty()) {
nowEsId = esRevisePlanDTOS.get(0).getId();
}
}
}
}else {
@@ -226,5 +237,25 @@ public class ProcessStep4After implements TaskListener {
busBean.save(busProcessNewNext);
}
// throw new ActivitiException("fa");
// 处理 oaFlag 为待办
//1合并 2延期 3取消 4更名 5立项
if ("5".equals(type) || "1".equals(type)){
// 新增新的 计划和流程关联关系
esPrcRelationService.addEsPrcRelation(nowEsId, null, delegateTask.getProcessInstanceId());
} else {
List<EsPrcRelation> esPrcRelationList = esPrcRelationService.list(object.getString("esId"));
if (esPrcRelationList != null && !esPrcRelationList.isEmpty()) {
// 修改 计划和流程关联关系
esPrcRelationService.modifyEsPrcRelation(object.getString("esId"), null , "0", delegateTask.getProcessInstanceId());
} else {
// 新增新的 计划和流程关联关系
esPrcRelationService.addEsPrcRelation(object.getString("esId"), null, delegateTask.getProcessInstanceId());
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6After.java
+2 -12
View File
@@ -72,18 +72,8 @@ public class ProcessStep6After implements TaskListener {
}
// 处理 oaFlag 为已办
//1合并 2延期 3取消 4更名 5立项
String type=object.getString("type");
// 删除 进行中的 旧流程
if ("2".equals(type) || "3".equals(type) || "4".equals(type)) {
// 修改 计划和流程关联关系
esPrcRelationService.modifyEsPrcRelation(object.getString("nowEsId"), null , "0", delegateTask.getProcessInstanceId());
} else {
// 新增新的 计划和流程关联关系
esPrcRelationService.addEsPrcRelation(object.getString("nowEsId"), null, delegateTask.getProcessInstanceId());
}
// 修改 计划和流程关联关系
esPrcRelationService.modifyEsPrcRelation(object.getString("nowEsId"), null , "0", delegateTask.getProcessInstanceId());
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java
+7
View File
@@ -8,6 +8,7 @@ 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.business_main.datas.service.IEsPrcRelationService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -32,6 +33,8 @@ public class ProcessstartAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -54,6 +57,10 @@ public class ProcessstartAfter implements TaskListener {
nextUserList.add(object.getString("prcCreateUser"));
delegateTask.setVariable("createUser",object.getString("prcCreateUser")); // 技术标准起草人员
delegateTask.setVariable("addFlag", object.getString("addFlag"));
// 处理 oaFlag 为待办
// 新增新的 计划和流程关联关系
esPrcRelationService.addEsPrcRelation(object.getString("nowEsId"), null, delegateTask.getProcessInstanceId());
}