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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-12-27 17:44:56 +08:00
parent 8d430df609 e1139715a7
commit 8b8a515f52
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class PEPtaskEstimateAfter implements TaskListener {
//设置分发负责人 //设置分发负责人
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
if (null!=ne && ne.size()>0) { if (null!=ne && ne.size()>0) {
JSONObject object1 = JSONObject.parseObject(remove.getString(0)); JSONObject object1 = JSONObject.parseObject(ne.getString(0));
if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) { if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) {
delegateTask.setVariable("ffUserId", object1.getString("distributePersonId")); delegateTask.setVariable("ffUserId", object1.getString("distributePersonId"));
nextUserList.add(delegateTask.getVariable("ffUserId", String.class)); nextUserList.add(delegateTask.getVariable("ffUserId", String.class));
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java
+9 -3
View File
@@ -76,9 +76,15 @@ public class SRPManagerApproveAfter implements TaskListener{
for (Object o: jsonArray) { for (Object o: jsonArray) {
JSONObject object1=JSONObject.parseObject(o.toString()); JSONObject object1=JSONObject.parseObject(o.toString());
info=info+object1.getString("id")+","; info=info+object1.getString("id")+",";
putTime=putTime+object1.getString("issueTime")+","; if (!"".equals(object1.getString("issueTime"))) {
zccTime=zccTime+object1.getString("ZCCSSRQ")+","; putTime = putTime + object1.getString("issueTime") + ",";
xcxTime=xcxTime+object1.getString("XCXSSRQ")+","; }
if (!"".equals(object1.getString("ZCCSSRQ"))) {
zccTime = zccTime + object1.getString("ZCCSSRQ") + ",";
}
if (!"".equals(object1.getString("XCXSSRQ"))) {
xcxTime = xcxTime + object1.getString("XCXSSRQ") + ",";
}
} }
detailed.setInforlist(info.substring(0,info.length()-1)); detailed.setInforlist(info.substring(0,info.length()-1));
detailed.setInforlist1(putTime.substring(0,putTime.length()-1)); detailed.setInforlist1(putTime.substring(0,putTime.length()-1));