diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index 891d79ae..63478fd0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -54,34 +54,34 @@ public class PGREPresidentApprovalAfter implements TaskListener { if ("1".equals(object.getString("gsfz"))) { delegateTask.setVariable("gsfz", "1"); - JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList")); - List 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 jsonArray=JSONArray.parseArray(object.getString("itemList")); +// List 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); +// }); - 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); +// lawsUserInfoService.wgDeptSaveBatch(wgDept); prcName = "政策课题组入会流程"; } else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java index 79198b06..47b1f0f5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java @@ -75,8 +75,8 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setProductName(o.getProjectName()); - sarStandUnqualified.setQaEngineer(o.getQualityEngineer()); - sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer()); + sarStandUnqualified.setQaEngineer(delegateTask.getVariable("qualityEngineerName",String.class)); + sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class)); sarStandUnqualified.setDutyEngineer(o.getImplementerId()); sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit()); sarStandUnqualified.setProductType("research"); @@ -99,8 +99,8 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualified.setCloseState(1); sarStandUnqualified.setCreateTime(new Date()); sarStandUnqualified.setProductName(o.getProjectName()); - sarStandUnqualified.setQaEngineer(o.getQualityEngineer()); - sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer()); + sarStandUnqualified.setQaEngineer(delegateTask.getVariable("qualityEngineerName",String.class)); + sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class)); sarStandUnqualified.setDutyEngineer(o.getImplementerId()); sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit()); sarStandUnqualified.setReason(object1.getString("zcNoCompliance"));