添加时间筛选

gic-store-api/src/main/java/com/gic/store/dto/ClerkLogDTO.java

@@ -71,6 +71,8 @@ public class ClerkLogDTO implements Serializable {
      *
      */
     private String operatorName;
+    private String startTime;
+    private String endTime;
 
     public Integer getClerkLogId() {
         return clerkLogId;
@@ -167,4 +169,20 @@ public class ClerkLogDTO implements Serializable {
     public void setOperatorName(String operatorName) {
         this.operatorName = operatorName;
     }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreLogDTO.java

@@ -70,6 +70,8 @@ public class StoreLogDTO implements Serializable {
      *
      */
     private String operatorName;
+    private String startTime;
+    private String endTime;
 
     public Integer getStoreLogId() {
         return storeLogId;
@@ -166,4 +168,20 @@ public class StoreLogDTO implements Serializable {
     public void setOperatorName(String operatorName) {
         this.operatorName = operatorName;
     }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
 }

gic-store-service/src/main/resources/mapper/TabClerkLogMapper.xml

@@ -191,6 +191,12 @@
     <if test="content != null and content != '' ">
         and content like concat('%', #{content}, '%')
     </if>
+    <if test="startTime != null and startTime != '' ">
+      and start_time &gt;= #{startTime}
+    </if>
+    <if test="endTime != null and endTime != '' ">
+      and end_time &lt;= #{endTime}
+    </if>
     order by create_time desc
   </select>
 </mapper>
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabStoreLogMapper.xml

@@ -191,6 +191,12 @@
     <if test="content != null and content != '' ">
       and content like concat('%', #{content}, '%')
     </if>
+    <if test="startTime != null and startTime != '' ">
+        and start_time &gt;= #{startTime}
+    </if>
+    <if test="endTime != null and endTime != '' ">
+        and end_time &lt;= #{endTime}
+    </if>
     order by create_time desc
   </select>
 </mapper>
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java

@@ -18,7 +18,10 @@ import com.gic.enterprise.service.QrCodeApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.store.constant.ClerkLogReasonEnum;
-import com.gic.store.dto.*;
+import com.gic.store.dto.ClerkDTO;
+import com.gic.store.dto.ClerkLogDTO;
+import com.gic.store.dto.ClerkSearchDTO;
+import com.gic.store.dto.ClerkStoreListDTO;
 import com.gic.store.service.ClerkApiService;
 import com.gic.store.service.ClerkLogApiService;
 import com.gic.store.web.qo.PageQO;
@@ -27,7 +30,7 @@ import com.gic.store.web.qo.store.ClerkQrcodeQO;
 import com.gic.wechat.business.api.service.fwh.WeixinBaseFunService;
 import com.gic.wechat.business.api.service.wxa.WeixinWxaFunService;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -293,12 +296,18 @@ public class ClerkController extends DownloadUtils {
     }
 
     @RequestMapping("/list-clerk-log")
-    public RestResponse listClerkLog(PageQO pageQO, String content, Integer reason, Integer logType, Integer clerkId) {
+    public RestResponse listClerkLog(PageQO pageQO, String content, Integer reason, Integer logType, Integer clerkId, String startTime, String endTime) {
         ClerkLogDTO clerkLogDTO = new ClerkLogDTO();
         clerkLogDTO.setContent(content);
         clerkLogDTO.setReason(reason);
         clerkLogDTO.setLogType(logType);
         clerkLogDTO.setClerkId(clerkId);
+        if (StringUtils.isNotBlank(startTime)) {
+            clerkLogDTO.setStartTime(startTime + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            clerkLogDTO.setEndTime(endTime + " 23:59:59");
+        }
         ServiceResponse<Page<ClerkLogDTO>> response = clerkLogApiService.listClerkLog(clerkLogDTO, pageQO.getCurrentPage(), pageQO.getPageSize());
         return ResultControllerUtils.commonResult(response);
     }

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -306,12 +306,19 @@ public class StoreController extends DownloadUtils {
 //        return EnterpriseRestResponse.failure(response);
 //    }
     @RequestMapping("list-store-log")
-    public RestResponse listStoreLog(com.gic.enterprise.qo.PageQO pageQO, String content, Integer reason, Integer logType, Integer storeId) {
+    public RestResponse listStoreLog(com.gic.enterprise.qo.PageQO pageQO, String content, Integer reason, Integer logType, Integer storeId, String startTime, String endTime) {
         StoreLogDTO storeLog = new StoreLogDTO();
         storeLog.setContent(content);
         storeLog.setReason(reason);
         storeLog.setLogType(logType);
         storeLog.setStoreId(storeId);
+        if (StringUtils.isNotBlank(startTime)) {
+            storeLog.setStartTime(startTime + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            storeLog.setEndTime(endTime + " 23:59:59");
+        }
+
         ServiceResponse<Page<StoreLogDTO>> response = storeLogApiService.listStoreLog(storeLog, pageQO.getCurrentPage(), pageQO.getPageSize());
         return ResultControllerUtils.commonResult(response);
     }