项目维度 日期bug修复

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 String xcxssrq;
-    private Date zccssrq;
+    private String zccssrq;
     private String itemsNum;
     private String claimType;
     private String itemsName;

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 String xcxssrq;
-    private Date zccssrq;
+    private String zccssrq;
 }

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 String xcxssrqgj;
-    private Date zccssrqgj;
+    private String zccssrqgj;
     private String standEnName;
     private String liablePeople;
     private String liablePeopleId;

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;
+
 
 }

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.setResearchImplementationTime(pcAdataList.getXcxssrqgj());
-                    sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj());
+//                    sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj());
                     sarStandardChild.setClauseName(pcAchildren.getItemsName());
                     sarStandardChild.setStandardItem(pcAchildren.getItemsNum());
                     sarStandardChild.setEvaluationTime(simpleDateFormat.format(new Date()));

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<String> nextUserList = new ArrayList();
 
-        String prcName = "标准化活动参会流程-";
+        String prcName = "标准化活动参会流程-结束";
-//            prcName = "标准化活动参会流程-" + "会议结束";
-        prcName = 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");

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 {
+//            try {
-                if (null!=delegateTask.getVariable("XCXSSRQ")) {
+//                if (null!=delegateTask.getVariable("XCXSSRQ")) {
-                    sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ"))));
+//                    sarStandard.setResearchImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ"))));
-                }
+//                }
-                if (null!=delegateTask.getVariable("ZCCSSRQ")) {
+//                if (null!=delegateTask.getVariable("ZCCSSRQ")) {
-                    sarStandard.setProductionImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("ZCCSSRQ"))));
+//                    sarStandard.setProductionImplementationTime(simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("ZCCSSRQ"))));
-                }
+//                }
-            } catch (ParseException e) {
+//            } catch (ParseException e) {
-                e.printStackTrace();
+//                e.printStackTrace();
-            }
+//            }
             i++;
             Map map=delegateTask.getVariable("numberWithId",Map.class);
             StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto();