diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java index 8b7db278..d4898ce2 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAbreakdownList.java @@ -16,12 +16,16 @@ import java.util.Date; public class PCAbreakdownList { private String id; + private String svpps; private String standId; + private Date xcxssrq; + private Date zccssrq; private String itemsNum; + private String claimType; private String itemsName; + private String applyArctic; + private String busStandCover; private String responsibleUnit; private String responsibleEngineer; - private String workPeople; - private String workPeopleId; } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index d6ab2956..9c4bfdb6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -71,6 +71,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandUnqualified.setProductType("research"); sarStandUnqualified.setReason(pcAdataList.getNoCompliance()); sarStandUnqualified.setPlanCloseTime(pcAdataList.getCompletionTime()); + sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class)); standUnqualifieds.add(sarStandUnqualified); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java index 1bbff726..539224d2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java @@ -13,6 +13,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.util.DealWithDate; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -106,7 +107,7 @@ public class PCAjgManagerDistributeAfter implements TaskListener { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(JsonUtil.toJson(map.get(userId))); + busProcessNewNext.setMesg(DealWithDate.delWithTimePCA(map.get(userId))); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java index f897a1f1..a3b39af4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java @@ -35,6 +35,7 @@ public class PCAstartAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + delegateTask.setVariable("productLines",object.getString("productLine")); //获取对象中的项目的数据 // 获取标准,项目相关信息!预测在下发阶段需要分散 但是在非下发阶段要带着数据!所以此步骤只需要拿到预存的id就好了 delegateTask.setVariable("ywjl",object.getString("serviceManager")); diff --git a/src/main/java/com/ydw/bat/wkflow/util/DealWithDate.java b/src/main/java/com/ydw/bat/wkflow/util/DealWithDate.java index eb12160e..887fb2a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/util/DealWithDate.java +++ b/src/main/java/com/ydw/bat/wkflow/util/DealWithDate.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.util; +import com.ydw.bat.wkflow.business_main.datas.dto.PCA.PCAtotal; import com.ydw.bat.wkflow.business_main.datas.dto.PEPres; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; @@ -15,4 +16,11 @@ public class DealWithDate { return jsonObject.toString(); } + public static String delWithTimePCA(PCAtotal a){ + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(Date.class, new JsonDateValueProcessor()); + JSONObject jsonObject = JSONObject.fromObject(a,jsonConfig); + return jsonObject.toString(); + } + }