From b5e3d6c39f963d2ce5478539846723c48b702ee2 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 8 Dec 2021 17:36:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6=20?= =?UTF-8?q?=E6=97=A5=E6=9C=9Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/dto/PCA/PCAbreakdownList.java | 4 ++-- .../datas/dto/PCA/PCAchildren.java | 4 ++-- .../datas/dto/PCA/PCAdataList.java | 6 +++--- .../bat/wkflow/business_slrs/dao/WgDept.java | 8 ++++++++ .../PCAdlApproveAfter.java | 12 +++++------ .../EngineerReviseDoneAfter.java | 8 ++------ .../PEPDepartLeaderAfter.java | 20 +++++++++---------- 7 files changed, 33 insertions(+), 29 deletions(-) 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 6c38a64b..4b215769 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 @@ -18,8 +18,8 @@ public class PCAbreakdownList { private String id; private String svpps; private String standId; - private Date xcxssrq; - private Date zccssrq; + private String xcxssrq; + private String zccssrq; private String itemsNum; private String claimType; private String itemsName; diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java index e3b570bd..388d438a 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java @@ -31,6 +31,6 @@ public class PCAchildren { private Date completionTime; private String zcComplianceReasons; private String typeId; - private Date xcxssrq; - private Date zccssrq; + private String xcxssrq; + private String zccssrq; } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java index e5f82ea2..b33e661d 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java @@ -16,7 +16,7 @@ import java.util.List; @Data public class PCAdataList { - private Date ssrq; + private String ssrq; private String zrbm; private String standId; private String productLineId; @@ -31,8 +31,8 @@ public class PCAdataList { private String kccvppsbm; private String kccvppscn; private String standName; - private Date xcxssrqgj; - private Date zccssrqgj; + private String xcxssrqgj; + private String zccssrqgj; private String standEnName; private String liablePeople; private String liablePeopleId; diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/WgDept.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/WgDept.java index 0b09de7e..f7260682 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/WgDept.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/WgDept.java @@ -42,5 +42,13 @@ public class WgDept { @TableField("join_id") private String joinId; + @ApiModelProperty(value = "手机号") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "邮箱") + @TableField("email") + private String email; + } 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 fd5cc25f..674a560c 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 @@ -113,20 +113,20 @@ public class PCAdlApproveAfter implements TaskListener { sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures()); sarStandard.setProductionCompliance(pcAdataList.getZcComplianceReasons()); sarStandard.setProductionNonCompliance(pcAdataList.getZcNoCompliance()); - sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj()); +// sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj()); sarStandard.setResearchCompletionTime(pcAdataList.getCompletionTime()); sarStandard.setResearchCountermeasures(pcAdataList.getCountermeasures()); sarStandard.setResearchNonCompliance(pcAdataList.getNoCompliance()); sarStandard.setResearchCompliance(pcAdataList.getComplianceReasons()); - sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); +// sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); sarStandard.setClauseName(pcAdataList.getItemsName()); sarStandard.setStandardItem(pcAdataList.getItemNum()); sarStandard.setEvaluationTime(simpleDateFormat.format(new Date())); sarStandard.setEvaluationPeopleName(pcAdataList.getWorkPeople()); sarStandard.setEvaluationPeople(pcAdataList.getWorkPeople()); - sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); +// sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); // simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ"))) - sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj()); +// sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj()); sarStandardComplianceProductAssesses.add(sarStandard); //遍历条目 @@ -192,8 +192,8 @@ public class PCAdlApproveAfter implements TaskListener { sarStandardChild.setResearchCountermeasures(pcAchildren.getCountermeasures()); sarStandardChild.setResearchCompliance(pcAchildren.getComplianceReasons()); sarStandardChild.setResearchNonCompliance(pcAchildren.getNoCompliance()); - sarStandardChild.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); - sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj()); +// sarStandardChild.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); +// sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj()); sarStandardChild.setClauseName(pcAchildren.getItemsName()); sarStandardChild.setStandardItem(pcAchildren.getItemsNum()); sarStandardChild.setEvaluationTime(simpleDateFormat.format(new Date())); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index f763ef5b..ffac9401 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -11,8 +11,6 @@ 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.SapMeeting; -import com.ydw.bat.wkflow.entity.WgMeetingInfo; -import com.ydw.bat.wkflow.entity.WgPayInfo; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -21,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; /** * EngineerReviseDone - 标准法规工程师汇总修订 @@ -42,9 +41,7 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - String prcName = "标准化活动参会流程-"; -// prcName = "标准化活动参会流程-" + "会议结束"; - prcName = prcName + "流程结束"; + String prcName = "标准化活动参会流程-结束"; @@ -57,7 +54,6 @@ public class EngineerReviseDoneAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - prcName = "标准化活动参会流程"; JSONObject pageData = object.getJSONObject("ch_pageData"); 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 edd9edcd..abf7ed86 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 @@ -136,16 +136,16 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandard.setEvaluationPeople(object1.getString("implementer")); sarStandard.setEvaluationPeopleName(object1.getString("implementerId")); sarStandard.setEvaluationTime(simpleDateFormat.format(new Date())); - try { - if (null!=delegateTask.getVariable("XCXSSRQ")) { - sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ")))); - } - if (null!=delegateTask.getVariable("ZCCSSRQ")) { - sarStandard.setProductionImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("ZCCSSRQ")))); - } - } catch (ParseException e) { - e.printStackTrace(); - } +// try { +// if (null!=delegateTask.getVariable("XCXSSRQ")) { +// sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ")))); +// } +// if (null!=delegateTask.getVariable("ZCCSSRQ")) { +// sarStandard.setProductionImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("ZCCSSRQ")))); +// } +// } catch (ParseException e) { +// e.printStackTrace(); +// } i++; Map map=delegateTask.getVariable("numberWithId",Map.class); StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto();