From 2ef89a20d1091dd71dcc24d7674af47f1bc8db41 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Thu, 3 Dec 2020 10:33:19 +0800
Subject: [PATCH] up

---
 .../template/service/impl/AwardRecordServiceImpl.java          | 3 +++
 src/main/java/com/jingcheng/template/vo/AwardRecordVo.java     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java b/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
index b43985e..bdfbff0 100644
--- a/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
+++ b/src/main/java/com/jingcheng/template/service/impl/AwardRecordServiceImpl.java
@@ -232,6 +232,7 @@ public class AwardRecordServiceImpl extends BaseServiceImpl<AwardRecordMapper, A
     public AjaxResult getAwardRecordList(JSONObject jsonObject) {
         AjaxResult ajaxResult = new AjaxResult();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Integer awardType = jsonObject.getInteger("awardType");
         Integer pageNum = jsonObject.getInteger("pageNum");
         Integer pageSize = jsonObject.getInteger("pageSize");
@@ -265,6 +266,7 @@ public class AwardRecordServiceImpl extends BaseServiceImpl<AwardRecordMapper, A
                 awardRecordVo.setIsAward("是");
             }
             awardRecordVo.setId(awardRecord.getId());
+            awardRecordVo.setAwardType(awardRecord.getAwardType());
             awardRecordVo.setUserId(awardRecord.getUserId());
             awardRecordVo.setName(awardRecord.getName());
             awardRecordVo.setPhone(awardRecord.getPhone());
@@ -274,6 +276,7 @@ public class AwardRecordServiceImpl extends BaseServiceImpl<AwardRecordMapper, A
             awardRecordVo.setSource(awardRecord.getSource());
             awardRecordVo.setCreateDateTime(awardRecord.getCreateDateTime());
             awardRecordVo.setAwardDate(simpleDateFormat.format(awardRecord.getCreateDateTime()));
+            awardRecordVo.setAwardTime(simpleDateFormat2.format(awardRecord.getCreateDateTime()));
             awardRecordVoList.add(awardRecordVo);
         }
         JSONObject result = new JSONObject();
diff --git a/src/main/java/com/jingcheng/template/vo/AwardRecordVo.java b/src/main/java/com/jingcheng/template/vo/AwardRecordVo.java
index 7b5e2d4..0a9b77c 100644
--- a/src/main/java/com/jingcheng/template/vo/AwardRecordVo.java
+++ b/src/main/java/com/jingcheng/template/vo/AwardRecordVo.java
@@ -13,4 +13,6 @@ public class AwardRecordVo extends AwardRecord {
     private String openId;
 
     private String awardDate;
+
+    private String awardTime;
 }