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

Merge branch 'fix_foton_20240408' into 'master'

Browse Source 
Fix foton 20240408

See merge request laws-foton-slrs/foton-wkflow-rest!84
This commit is contained in:
高嵩
2024-04-10 10:05:17 +00:00
parent 93a6ed894c 12d3dc3f71
commit 1e8d858c85
18 changed files with 135 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+3
View File
@@ -227,4 +227,7 @@ public interface LawsUserInfoService {
@GetMapping("lawss/activiti/selectOnlineFile")
ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName,@RequestParam("key") String key);
@GetMapping("lawss/sarBussionessStand/updateStandStatus")
ResponseMessage<Boolean> changeStandStatus(String standId, String standCode, String standtextStatus);
}
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java
+17 -10
View File
@@ -9,6 +9,7 @@ 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_mq.service.CreateMQService;
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;
@@ -43,17 +44,23 @@ public class ProcessStep6After implements TaskListener {
delegateTask.setVariable("bafzFlag","0");
//入库"3lqnlgmgcn"
if ("废止".equals(object.getString("nextStatus"))) {
SarBussionessStand sarBussionessStand = new SarBussionessStand();
sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus"));
sarBussionessStand.setId(object.getString("standId"));
SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd");
Map<String,Object> bussAttrInfoMap = lawsUserInfoService.getBussAttrInfo(object.getString("standId"));
if(bussAttrInfoMap != null){
bussAttrInfoMap.replace("FZRQBUSS",dateFormat.format(new Date()));
// SarBussionessStand sarBussionessStand = new SarBussionessStand();
// sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus"));
// sarBussionessStand.setId(object.getString("standId"));
// SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd");
// Map<String,Object> bussAttrInfoMap = lawsUserInfoService.getBussAttrInfo(object.getString("standId"));
// if(bussAttrInfoMap != null){
// bussAttrInfoMap.replace("FZRQBUSS",dateFormat.format(new Date()));
// }
// String as = JSONObject.toJSONString(bussAttrInfoMap);
// sarBussionessStand.setSarStandAttrEOStr(as);
// lawsUserInfoService.updateSarBussionessStand(sarBussionessStand);
// 变更标准状态
ResponseMessage<Boolean> result = lawsUserInfoService.changeStandStatus(object.getString("standId"), object.getString("standCode"), object.getString("standtextStatus"));
if(!result.getData()){
throw new ActivitiException("标准状态变更失败");
}
String as = JSONObject.toJSONString(bussAttrInfoMap);
sarBussionessStand.setSarStandAttrEOStr(as);
lawsUserInfoService.updateSarBussionessStand(sarBussionessStand);
}
}else {
delegateTask.setVariable("bafzFlag","1");
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java
+7 -1
View File
@@ -13,6 +13,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.tomcat.util.digester.ArrayStack;
@@ -35,7 +36,12 @@ public class BLApplicantAfter implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject form = null;
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -31,7 +32,12 @@ public class BussLibraryProduct10After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -30,7 +31,12 @@ public class BussLibraryProduct11After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -30,7 +31,12 @@ public class BussLibraryProduct12After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject form = null;
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java
+8 -1
View File
@@ -10,8 +10,10 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
@@ -32,7 +34,12 @@ public class BussLibraryProduct13After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java
+9 -1
View File
@@ -9,12 +9,15 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
* 抄送后
@@ -28,7 +31,12 @@ public class BussLibraryProduct14After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java
+7 -1
View File
@@ -13,6 +13,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
@@ -32,7 +33,12 @@ public class BussLibraryProduct2After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
@@ -31,7 +32,12 @@ public class BussLibraryProduct3After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -30,7 +31,12 @@ public class BussLibraryProduct4After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java
+7 -1
View File
@@ -14,6 +14,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -31,7 +32,12 @@ public class BussLibraryProduct5After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -29,7 +30,12 @@ public class BussLibraryProduct6After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -30,7 +31,12 @@ public class BussLibraryProduct7After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -32,7 +33,12 @@ public class BussLibraryProduct8After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -30,7 +31,12 @@ public class BussLibraryProduct9After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
@@ -31,7 +32,12 @@ public class BussLibraryProductC3After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java
+7 -1
View File
@@ -12,6 +12,7 @@ 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.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -29,7 +30,12 @@ public class BussLibraryProductC6After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
if (CollectionUtils.isEmpty(datasList)) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
Datas datas = datasList.get(0);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);