From 0d230e7294f0eb162b05ba512a0d77889ae2d682 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 1 Sep 2020 09:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=E7=9E=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/lz/modules/app/resp/ResultRecordResp.java    | 2 ++
 .../modules/sys/service/app/impl/ResultRecordServiceImpl.java  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java b/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java
index f7e50f5f..1a8d6412 100644
--- a/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java
+++ b/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java
@@ -36,4 +36,6 @@ public class ResultRecordResp {
 
     private Integer type ;
 
+    private String monthTimeStr;
+
 }
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index c3cce562..6499bf71 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -33,6 +33,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -184,6 +185,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         PageUtils pageUtils = PageUtils.startPage(params.getPage(), params.getLimit()).doSelect(
                 page -> resultRecordMapper.selectByConditionByLeader(page, params)
         );
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM");
         List<ResultRecord> resultRecords = pageUtils.getList();
         if (CollectionUtils.isNotEmpty(resultRecords)) {
             List<ResultRecordResp> list = new ArrayList<>();
@@ -196,6 +198,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 } else if (resp.getStatus().equals(5) && staffRoleMap.get(user.getUserId()) == null) {
                     resp.setStatus(1); // 如果不是自己审批，说明自己己经审批完成
                 }
+                resp.setMonthTimeStr(df.format(resultRecord.getMonthTime()));
                 list.add(resp);
             }
             pageUtils.setList(list);