二维码

gic-platform-enterprise-service/src/main/resources/mapper/TabPushMessageMapper.xml

@@ -248,10 +248,10 @@
       and push_status = #{pushStatus}
     </if>
     <if test="startTime != null">
-      and (DATE_FORMAT(update_time,'%Y-%m-%d') &gt;= #{startTime} or DATE_FORMAT(push_time,'%Y-%m-%d') &gt;= #{startTime})
+      and (update_time &gt;= #{startTime} or push_time &gt;= #{startTime})
     </if>
     <if test="endTime != null">
-      and (DATE_FORMAT(update_time,'%Y-%m-%d') &lt;= #{endTime} or DATE_FORMAT(push_time,'%Y-%m-%d') &lt;= #{endTime})
+      and (update_time &lt;= #{endTime} or push_time &lt;= #{endTime})
     </if>
     <if test="pushClassifyId != null">
       and push_classify_id = #{pushClassifyId}

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/PushMessageController.java

@@ -83,7 +83,7 @@ public class PushMessageController {
         ServiceResponse<Page<PushMessageDTO>> response = null;
         try {
             response = this.pushMessageApiService.pagePushMessage(search, pushStatus,
-                    StringUtils.isBlank(startTime) ? null : simpleDateFormat.parse(startTime), StringUtils.isBlank(endTime) ? null : simpleDateFormat.parse(endTime), pageQO.getCurrentPage(), pageQO.getPageSize(), classifyId);
+                    StringUtils.isBlank(startTime) ? null : simpleDateFormat.parse(startTime+" 00:00:00"), StringUtils.isBlank(endTime) ? null : simpleDateFormat.parse(endTime+" 23:59:59"), pageQO.getCurrentPage(), pageQO.getPageSize(), classifyId);
         } catch (ParseException e) {
             e.printStackTrace();
         }