修改若干 bug

src/main/resources/application-dev.yml

@@ -25,6 +25,9 @@ spring:
       enabled: true  #设置开启热部署
     freemarker:
       cache: false    #页面不加载缓存，修改即时生效
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 pagehelper:
   helper-dialect: mysql
   reasonable: true

src/main/resources/application-prod.yml

@@ -25,6 +25,9 @@ spring:
       enabled: true  #设置开启热部署
     freemarker:
       cache: false    #页面不加载缓存，修改即时生效
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 pagehelper:
   helper-dialect: mysql
   reasonable: true

src/main/resources/application-test.yml

@@ -25,6 +25,9 @@ spring:
       enabled: true  #设置开启热部署
     freemarker:
       cache: false    #页面不加载缓存，修改即时生效
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 pagehelper:
   helper-dialect: mysql
   reasonable: true

src/main/resources/mybatis/mapper/customer/CustomerInfoFeedbackMapper.xml

@@ -23,7 +23,8 @@
             convenient_time,
             communication_content,
             user_feedback,
-            store
+            store,
+            p_code
         FROM
             customer_info_feedback
         where 1=1
@@ -36,6 +37,12 @@
         <if test="end_fb_date != null and end_fb_date !=''">
             and fb_Date &lt; #{end_fb_date}
         </if>
+        <if test="start_entry_date != null and start_entry_date !=''">
+            and entry_date &gt;= #{start_entry_date}
+        </if>
+        <if test="end_entry_date != null and end_entry_date !=''">
+            and entry_date &lt; #{end_entry_date}
+        </if>
         <if test="source_channel != null ">
             and source_channel in
             <foreach collection="source_channel" item="item" index="index" open="(" separator="," close=")">