From 8e97f53ffa6edabda054419ace046eb30facb62d Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Tue, 5 Nov 2024 18:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E3=80=91=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/service/MaterialMainService.java | 21 -------------------
 .../mapper/master/MaterialMainMapper.xml      |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
index 89292981..9cd8b8a0 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
@@ -62,7 +62,6 @@ import java.math.RoundingMode;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.*;
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -222,7 +221,6 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
 
         if (result.size() > 0) {
             initMaterialAttrsMapForPageList(result, childList);
-            formatTimeField(result);
         }
 
         dataResult.setRecords(result);
@@ -239,25 +237,6 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
         return dataResult;
     }
 
-    /**
-     * 手动格式化Map中的日期格式（jackson配置的时间格式不生效）
-     * @param result
-     */
-    private void formatTimeField(List<Map<String, Object>> result) {
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        result.forEach(item -> {
-            if (ObjectUtil.isNotEmpty(item.get("createdTime"))) {
-                item.put("createdTime", formatter.format((Timestamp) item.get("createdTime")));
-            }
-            if (ObjectUtil.isNotEmpty(item.get("updatedTime"))) {
-                item.put("updatedTime", formatter.format((Timestamp) item.get("updatedTime")));
-            }
-            if (ObjectUtil.isNotEmpty(item.get("lastApplyTime"))) {
-                item.put("lastApplyTime", formatter.format((Timestamp) item.get("lastApplyTime")));
-            }
-        });
-    }
-
     /**
      * 获取总页数
      *
diff --git a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
index 622b8aaa..ad619a32 100644
--- a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
+++ b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
@@ -81,13 +81,13 @@
         `apply_user_code` AS applyUserCode,
         `apply_dept_name` AS applyDeptName,
         `updated_by_user_code` AS updatedByUserCode,
-        `last_apply_time` AS lastApplyTime,
+        DATE_FORMAT(last_apply_time,'%Y-%m-%d %H:%i:%s') AS lastApplyTime,
         `replace_material_no` AS replaceMaterialNo,
         `material_class` AS materialClass,
         `created_by` AS createdBy,
-        `created_time` AS createdTime,
+        DATE_FORMAT(created_time,'%Y-%m-%d %H:%i:%s') AS createdTime,
         `updated_by` AS updatedBy,
-        `updated_time` AS updatedTime,
+        DATE_FORMAT(updated_time,'%Y-%m-%d %H:%i:%s') AS updatedTime,
         `oa_row_id` AS oaRowId ,
         IF(reuse_of_once_state=1,'一次性','重复') as reuseOfOnceState,
         (case process_state when 0 then '待提交' when 2 then '已驳回' when 5 then '变更申请中' when 10 then 'OA审核中' when 15 then