From e16a72d4fe875d2a39d7b72a498cccad9f00246a Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Fri, 24 Jun 2022 13:22:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug=20#55972=20=E5=A4=8D=E5=AE=A1?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=91=E8=B5=B7=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business_auth/LawsUserInfoService.java    |  2 +-
 .../datas/entity/standState/ModelData.java    | 16 ++++++---
 .../wkflow/config/ScheduledJobStandState.java | 33 +++++++++++--------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
index fb4473b0..6d8b1bdc 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
@@ -38,7 +38,7 @@ public interface LawsUserInfoService {
      * @param page
      * @return
      */
-    @GetMapping("/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList")
+    @PostMapping("/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList")
     public List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page);
 
 
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java
index 56862814..fbdcadac 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/standState/ModelData.java
@@ -2,6 +2,7 @@
   * Copyright 2022 bejson.com 
   */
 package com.ydw.bat.wkflow.business_main.datas.entity.standState;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -19,16 +20,21 @@ public class ModelData {
     private String standId;
     private String standName;
     private String standCode;
-    private Date reviewTime;
-    private Date issueTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String reviewTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTime;
     private String reviewResults;
     private String reviewProcessNum;
-    private Date creationTime;
-    private Date modifyTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String creationTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String modifyTime;
     private int validFlag;
     private String param1;
     private String param2;
-    private Date putTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTime;
     private String standSort;
     private String qcdw;
     private String fsrqbuss;
diff --git a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java
index 1d4786d9..d649c118 100644
--- a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java
+++ b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobStandState.java
@@ -78,21 +78,26 @@ public class ScheduledJobStandState implements Runnable {
             QbfsForm qbfsForm = new QbfsForm();
             SarBussionessStandStatePage page = new SarBussionessStandStatePage();
             List<ModelData> modelDataList = lawsUserInfoService.getSarBussionessStandStateProcessList(page);
-            qbfsForm.setModelData(modelDataList);
-            standStateDraft.setQbfsForm(qbfsForm);
-            standStateDraft.setRoleForm(roleForm);
-            String json = toJson(standStateDraft);
-            System.out.println(json);
+            if(!modelDataList.isEmpty()){
+                qbfsForm.setModelData(modelDataList);
+                standStateDraft.setQbfsForm(qbfsForm);
+                standStateDraft.setRoleForm(roleForm);
+                String json = toJson(standStateDraft);
+                System.out.println(json);
 
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String time = sdf.format(new Date());
-            BusProcessName busProcessName = new BusProcessName();
-            busProcessName.setPrcType("buss3");
-            busProcessName.setCreatUser("chenchunmei");
-            busProcessName.setCreatTime(time);
-            busProcessName.setMes(json);
-            busProcessName.setCreatUserName("陈春梅");
-            iBusProcessNameService.save(busProcessName);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String time = sdf.format(new Date());
+                BusProcessName busProcessName = new BusProcessName();
+                busProcessName.setPrcType("buss3");
+                busProcessName.setCreatUser("chenchunmei");
+                busProcessName.setCreatTime(time);
+                busProcessName.setMes(json);
+                busProcessName.setCreatUserName("陈春梅");
+                iBusProcessNameService.save(busProcessName);
+                logger.info("自动发起复审流程---已存入草稿");
+            }else{
+                logger.info("自动发起复审流程---没有复审数据不发起草稿");
+            }
 
             logger.info("每天0点1分执行 自动发起复审流程自动存入草稿:"+Thread.currentThread().getName() + " cron=0 1 0 * * ? --- " + new Date()+"---End-01");
         }catch(Exception e){