From f48fa183ae990a28217b1045b9d0a8eaf95cc9cf Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期四, 14 一月 2021 10:22:07 +0800
Subject: [PATCH] 微心愿分页列表增加各个时间字段
---
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml | 8 +++-----
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 8 ++++++++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
index 8483a85..d78239e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,9 +24,7 @@
<component name="ChangeListManager">
<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -392,7 +390,7 @@
<workItem from="1610326930387" duration="5497000" />
<workItem from="1610368400707" duration="771000" />
<workItem from="1610415637750" duration="6485000" />
- <workItem from="1610499071420" duration="15397000" />
+ <workItem from="1610499071420" duration="16776000" />
</task>
<servers />
</component>
@@ -512,10 +510,10 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
- <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610585615412">
+ <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610590520513">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610585615412" />
+ <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610590520513" />
<state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
<screen x="0" y="0" width="1536" height="824" />
</state>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index 0043338..0c9bb41 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -30,6 +30,10 @@
"w.sponsor_phone,\n" +
"w.wish_name,\n" +
"w.`status`,\n" +
+ "w.`feedback_at`,\n" +
+ "w.`examine_at`,\n" +
+ "w.`distribution_at`,\n" +
+ "w.`evaluate_at`,\n" +
"w.`photo_path_list`,\n" +
"count(wu.id)star_num,\n" +
"w.`detail`,\n" +
@@ -81,6 +85,10 @@
"w.sponsor_phone,\n" +
"w.wish_name,\n" +
"w.`status`,\n" +
+ "w.`feedback_at`,\n" +
+ "w.`examine_at`,\n" +
+ "w.`distribution_at`,\n" +
+ "w.`evaluate_at`,\n" +
"w.`photo_path_list`,\n" +
"count(wu.id)star_num,\n" +
"w.`detail`,\n" +
--
Gitblit v1.7.1