This commit is contained in:
liao
2021-12-05 10:02:43 +08:00
parent 39fa1c157c
commit ac92d728cd
4 changed files with 101 additions and 2 deletions
@@ -122,7 +122,8 @@ public interface LawsUserInfoService {
@PostMapping("/sarStandProjectLibrary/batchInsert")
public String batchInsert(@RequestBody List<StandProjectRelationDto> standProjectRelationDtos);
@PostMapping("/WgDept/saveBatch")
public String wgDeptSaveBatch(@RequestBody List<WgDept> wgDepts);
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting;
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;
@@ -9,6 +10,10 @@ 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_slrs.dao.SarFileSplitInfoEO;
import com.ydw.bat.wkflow.business_slrs.dao.SarInterpretationNationalStandard;
import com.ydw.bat.wkflow.business_slrs.dao.SarStandItems;
import com.ydw.bat.wkflow.business_slrs.dao.WgDept;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -28,7 +33,7 @@ public class ApprovalAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -46,6 +51,35 @@ public class ApprovalAfter implements TaskListener {
if("1".equals(object.getString("shyFlag"))){
delegateTask.setVariable("shyFlag", "1");
JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
List<WgDept> wgDept=new ArrayList<>();
jsonArray.forEach(o -> {
JSONObject os=JSONObject.parseObject(o.toString());
WgDept wgDept1=new WgDept();
wgDept1.setWgId(object.getString("standId"));
wgDept1.setDeptOrder(os.getString("itemsNum"));
wgDept1.setDeptPeopleId(os.getString("itemsName"));
wgDept1.setIdentity(os.getString("responsibleUnitShow"));
wgDept1.setJoinfile(os.getString("zxUserIdName"));
wgDept1.setJoinId(os.getString("itermsConditions"));
wgDept.add(wgDept1);
});
JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
jsonArray1.forEach(obj ->{
JSONObject object1 = JSONObject.parseObject(obj.toString());
WgDept wgDept1=new WgDept();
wgDept1.setWgId(object.getString("standId"));
wgDept1.setDeptOrder(object1.getString("itemsNum"));
wgDept1.setDeptPeopleId(object1.getString("itemsName"));
wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
wgDept1.setJoinfile(object1.getString("zx![](C:/Users/liao/AppData/Local/Temp/LogiUI/Pak/img/device.png)UserIdName"));
wgDept1.setJoinId(object1.getString("itermsConditions"));
wgDept.add(wgDept1);
});
lawsUserInfoService.wgDeptSaveBatch(wgDept);
prcName = "政策课题组会后流程";
}else{
delegateTask.setVariable("shyFlag", "0");
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting;
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;
@@ -9,6 +10,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_slrs.dao.WgDept;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -28,6 +30,7 @@ public class PresidentApprovalAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -44,6 +47,35 @@ public class PresidentApprovalAfter implements TaskListener {
if("1".equals(object.getString("gsfz"))){
delegateTask.setVariable("gsfz", "1");
JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
List<WgDept> wgDept=new ArrayList<>();
jsonArray.forEach(o -> {
JSONObject os=JSONObject.parseObject(o.toString());
WgDept wgDept1=new WgDept();
wgDept1.setWgId(object.getString("standId"));
wgDept1.setDeptOrder(os.getString("itemsNum"));
wgDept1.setDeptPeopleId(os.getString("itemsName"));
wgDept1.setIdentity(os.getString("responsibleUnitShow"));
wgDept1.setJoinfile(os.getString("zxUserIdName"));
wgDept1.setJoinId(os.getString("itermsConditions"));
wgDept.add(wgDept1);
});
JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
jsonArray1.forEach(obj ->{
JSONObject object1 = JSONObject.parseObject(obj.toString());
WgDept wgDept1=new WgDept();
wgDept1.setWgId(object.getString("standId"));
wgDept1.setDeptOrder(object1.getString("itemsNum"));
wgDept1.setDeptPeopleId(object1.getString("itemsName"));
wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
wgDept1.setJoinfile(object1.getString("zxUserIdName"));
wgDept1.setJoinId(object1.getString("itermsConditions"));
wgDept.add(wgDept1);
});
lawsUserInfoService.wgDeptSaveBatch(wgDept);
prcName = "政策课题组参会流程";
}else{
delegateTask.setVariable("gsfz", "0");
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment;
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;
@@ -11,6 +12,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_slrs.dao.WgDept;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -51,6 +53,36 @@ public class PGREPresidentApprovalAfter implements TaskListener {
if ("1".equals(object.getString("gsfz"))) {
delegateTask.setVariable("gsfz", "1");
JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
List<WgDept> wgDept=new ArrayList<>();
jsonArray.forEach(o -> {
JSONObject os=JSONObject.parseObject(o.toString());
WgDept wgDept1=new WgDept();
wgDept1.setWgId(object.getString("standId"));
wgDept1.setDeptOrder(os.getString("itemsNum"));
wgDept1.setDeptPeopleId(os.getString("itemsName"));
wgDept1.setIdentity(os.getString("responsibleUnitShow"));
wgDept1.setJoinfile(os.getString("zxUserIdName"));
wgDept1.setJoinId(os.getString("itermsConditions"));
wgDept.add(wgDept1);
});
JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
jsonArray1.forEach(obj ->{
JSONObject object1 = JSONObject.parseObject(obj.toString());
WgDept wgDept1=new WgDept();
wgDept1.setWgId(object.getString("standId"));
wgDept1.setDeptOrder(object1.getString("itemsNum"));
wgDept1.setDeptPeopleId(object1.getString("itemsName"));
wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
wgDept1.setJoinfile(object1.getString("zxUserIdName"));
wgDept1.setJoinId(object1.getString("itermsConditions"));
wgDept.add(wgDept1);
});
lawsUserInfoService.wgDeptSaveBatch(wgDept);
prcName = "政策课题组入会流程";
} else {
delegateTask.setVariable("gsfz", "0");