日志汇总加日期条件搜索

biz-base/src/main/java/com/dayou/controller/ItemUserLogController.java

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.*;
 import com.dayou.utils.ConvertUtil;
 import com.dayou.utils.HttpKit;
 import com.dayou.exception.ErrorCode;
+
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -89,8 +91,8 @@ public class ItemUserLogController extends BaseController {
      * @return
      */
     @GetMapping("/collect")
-    public RestResponse<List<ItemLogCollectVO>> logCollect(Long departmentId, Boolean scope,Long itemId){
-        List<ItemLogCollectVO> result = itemUserLogService.logCollect(departmentId,scope,itemId);
+    public RestResponse<List<ItemLogCollectVO>> logCollect(Long departmentId, Boolean scope, Long itemId, LocalDate startDate,LocalDate endDate){
+        List<ItemLogCollectVO> result = itemUserLogService.logCollect(departmentId,scope,itemId,startDate,endDate);
         return RestResponse.data(result);
     }
 

biz-base/src/main/resources/application-local.yml

@@ -5,7 +5,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/item-management?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
     username: root
-    password: 123456
+    password: 914851221
     initialSize: 10 #初始化连接数D
     minIdle: 10 #最小空闲连接数
     max-active: 100 #最大连接数

dao/src/main/java/com/dayou/mapper/ItemUserLogMapper.java

@@ -7,6 +7,7 @@ import com.dayou.vo.ItemUserLogVO;
 import com.dayou.vo.LogStatVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -19,8 +20,8 @@ import java.util.List;
  */
 public interface ItemUserLogMapper extends CustomBaseMapper<ItemUserLog> {
 
-    List<ItemUserLogVO> logListByUserId(@Param("userId") Long userId,@Param("itemId") Long itemId);
-    List<ItemUserLogVO> logListByDepartmentId(@Param("departmentId") Long departmentId,@Param("itemId") Long itemId);
+    List<ItemUserLogVO> logListByUserId(@Param("userId") Long userId,@Param("itemId") Long itemId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+    List<ItemUserLogVO> logListByDepartmentId(@Param("departmentId") Long departmentId,@Param("itemId") Long itemId ,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 
     Page<ItemUserLogVO> page(Page page, @Param("itemUserLogVO") ItemUserLogVO itemUserLog,@Param("userId") Long userId);
 

dao/src/main/resources/mapper/ItemUserLogMapper.xml

@@ -60,6 +60,22 @@
             u.deleted = 0
           AND i.deleted = 0
           AND iul.deleted = 0
+        <choose>
+            <when test="startDate!=null">
+                and log_date &gt;= #{startDate}
+            </when>
+            <otherwise>
+                and log_date &gt;= date_add(curDate(),INTERVAL -10 DAY)
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="endDate!=null">
+                and log_date &lt;= #{endDate}
+            </when>
+            <otherwise>
+                and log_date &lt;= curDate()
+            </otherwise>
+        </choose>
         AND iul.item_id = #{itemId}
     </select>
 
@@ -83,6 +99,22 @@
             u.deleted = 0
           AND i.deleted = 0
           AND iul.deleted = 0
+            <choose>
+                <when test="startDate!=null">
+                    and log_date &gt;= #{startDate}
+                </when>
+                <otherwise>
+                    and log_date &gt;= date_add(curDate(),INTERVAL -10 DAY)
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="endDate!=null">
+                    and log_date &lt;= #{endDate}
+                </when>
+                <otherwise>
+                    and log_date &lt;= curDate()
+                </otherwise>
+            </choose>
         <if test="itemId!=null">
             and iul.item_id = #{itemId}
         </if>

service/src/main/java/com/dayou/service/IItemUserLogService.java

@@ -10,6 +10,7 @@ import com.dayou.vo.LogStatVO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -32,7 +33,7 @@ public interface IItemUserLogService extends IService<ItemUserLog> {
 
         Boolean delete(Long id);
 
-    List<ItemLogCollectVO> logCollect(Long departmentId, Boolean scope,Long itemId);
+    List<ItemLogCollectVO> logCollect(Long departmentId, Boolean scope, Long itemId, LocalDate startDate, LocalDate endDate);
 
     LogEcharsVO getLogEchars();
 

service/src/main/java/com/dayou/service/impl/ItemUserLogServiceImpl.java

@@ -64,15 +64,15 @@ public class ItemUserLogServiceImpl extends ServiceImpl<ItemUserLogMapper, ItemU
     }
 
     @Override
-    public List<ItemLogCollectVO> logCollect(Long departmentId, Boolean scope,Long itemId) {
+    public List<ItemLogCollectVO> logCollect(Long departmentId, Boolean scope,Long itemId,LocalDate startDate,LocalDate endDate) {
         List<ItemUserLogVO> logList = new ArrayList<>();
         List<ItemLogCollectVO> result = new ArrayList<>();
         if (scope){
             Long userId = LoginContext.getUserId();
-            logList = itemUserLogMapper.logListByUserId(userId,itemId);
+            logList = itemUserLogMapper.logListByUserId(userId,itemId,startDate,endDate);
         }
         else {
-            logList = itemUserLogMapper.logListByDepartmentId(departmentId,itemId);
+            logList = itemUserLogMapper.logListByDepartmentId(departmentId,itemId,startDate,endDate);
         }
         Map<Long, List<ItemUserLogVO>> collectByUser = logList.stream().collect(Collectors.groupingBy(ItemUserLog::getUserId));
         for(Map.Entry<Long, List<ItemUserLogVO>> byUserMap : collectByUser.entrySet()){