From cd15d41e5b1d2e21eb4df15957a36e90d756ec24 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 25 Jul 2023 09:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8=E6=95=B4?=
 =?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QsJsonLocalDateTimeDeserializer.java      | 28 +++++++++++++++++++
 .../modules/seeyon/SeeYonController.java      | 11 ++++++--
 .../seeyon/entity/vo/SeeYonApproveDataVo.java |  5 ++++
 .../modules/tbs/common/TbsSeeYonConst.java    |  1 +
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/qs/serve/common/util/model/QsJsonLocalDateTimeDeserializer.java

diff --git a/src/main/java/com/qs/serve/common/util/model/QsJsonLocalDateTimeDeserializer.java b/src/main/java/com/qs/serve/common/util/model/QsJsonLocalDateTimeDeserializer.java
new file mode 100644
index 00000000..ad46dfb6
--- /dev/null
+++ b/src/main/java/com/qs/serve/common/util/model/QsJsonLocalDateTimeDeserializer.java
@@ -0,0 +1,28 @@
+package com.qs.serve.common.util.model;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author YenHex
+ * @since 2023/7/25
+ */
+public class QsJsonLocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
+
+    final DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    @Override
+    public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JacksonException {
+        String val = jsonParser.getText();
+        if (val==null||val.isEmpty()){
+            return null;
+        }
+        return LocalDateTime.parse(val,df);
+    }
+}
diff --git a/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java b/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java
index ee65547a..d9fafce2 100644
--- a/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java
+++ b/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java
@@ -55,7 +55,7 @@ public class SeeYonController {
      */
     @GetMapping("listCheckList")
     public R<PageVo<SeeYonApproveDataVo>> listAllCha(SeeYonApproveQuery query){
-        R<String> result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_LIST_AFFAIR,query,"");
+        R<String> result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_LIST_CHECK,query,"");
         if(result.getStatus()==200){
             PageVo<?> pageVo = JsonUtil.jsonToPojo(result.getData(),PageVo.class);
             List<SeeYonApproveDataVo> affairList = new ArrayList<>();
@@ -63,7 +63,14 @@ public class SeeYonController {
                 for (Object o : pageVo.getList()) {
                     String json = JsonUtil.objectToJson(o);
                     SeeYonApproveDataVo obj = JsonUtil.jsonToPojo(json,SeeYonApproveDataVo.class);
-                    affairList.add(obj);
+                    if(obj!=null&&obj.getTargetCode()!=null){
+                        //tempCode不参与业务。统一类型重新赋值，方便前端跳转
+                        String tempCode = obj.getTargetCode().replace("_Test","");
+                        tempCode = tempCode.replace("contractApply","CostBill");
+                        obj.setTemplateCode(tempCode);
+
+                        affairList.add(obj);
+                    }
                 }
             }
             PageVo<SeeYonApproveDataVo> resultVo = PageVo.initNewList(pageVo,affairList);
diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java
index 5364028c..4a5f645f 100644
--- a/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java
+++ b/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java
@@ -1,5 +1,7 @@
 package com.qs.serve.modules.seeyon.entity.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.qs.serve.common.util.model.QsJsonLocalDateTimeDeserializer;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -47,17 +49,20 @@ public class SeeYonApproveDataVo {
      * 状态：0-待审批；1->已审
      */
     private String affairState;
+    private String affairId;
 
     private String memberId;
 
     /**
      * 申请时间
      */
+    @JsonDeserialize(using = QsJsonLocalDateTimeDeserializer.class)
     private LocalDateTime applyTime;
 
     /**
      * 评论时间
      */
+    @JsonDeserialize(using = QsJsonLocalDateTimeDeserializer.class)
     private LocalDateTime commitTime;
 
 }
diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java
index 7d373232..d75ccb76 100644
--- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java
+++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java
@@ -43,6 +43,7 @@ public interface TbsSeeYonConst {
     String API_PAGE_AFFAIR = "/process/pageMemberAffair";
     String API_CHECK_AFFAIR = "/process/checkAffair";
     String API_LIST_AFFAIR = "/process/listFormAffair";
+    String API_LIST_CHECK = "/process/getCheckList";
     String API_ADD_NODE = "/process/addNode";
     String API_COUNT_NOT_OK = "/process/countUnfinished";
     String API_CHECK_SUMMERY = "/process/checkAffairSummery";