bug修复

src/main/java/com/project/appeal/domain/param/AppealParam.java

@@ -5,5 +5,7 @@ import lombok.Data;
 
 @Data
 public class AppealParam extends BaseParam {
-    public String subLineName;
+    public Long subLineId;
+    public Long lineId;
+    public Long businessId;
 }

src/main/java/com/project/appeal/domain/service/Impl/SearchAppealDomainServiceImpl.java

@@ -45,8 +45,8 @@ public class SearchAppealDomainServiceImpl implements SearchAppealDomainService
         QueryWrapper<AppealEntity> appealEntityQueryWrapper = new QueryWrapper<>();
         IPage<AppealDTO> appealDTOIPage = new Page<>();
         Map<Long, String> taskIdToSubLineNameMap = new HashMap<>();
-        appealEntityQueryWrapper.orderByDesc("update_time");
+        appealEntityQueryWrapper.orderByDesc("create_time");
-        if (StringUtils.isBlank(appealParam.getSubLineName())){
+        if (appealParam.getBusinessId() == null && appealParam.getLineId() == null && appealParam.getSubLineId() == null) {
             Page<AppealEntity> appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper);
             appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new));
 
@@ -58,13 +58,15 @@ public class SearchAppealDomainServiceImpl implements SearchAppealDomainService
             }
         }else{
             //查询产品线相关的考试任务
-            List<TaskDTO> taskBySubLineName = taskMapper.getTaskBySubLineName(appealParam.getSubLineName());
+            List<TaskDTO> taskByAppealParam = taskMapper.getTaskByAppealParam(appealParam.getSubLineId(),appealParam.getLineId(),appealParam.getBusinessId());
-            taskIdToSubLineNameMap = taskBySubLineName.stream().collect(Collectors.toMap(TaskDTO::getId, TaskDTO::getSubLineName));
+            taskIdToSubLineNameMap = taskByAppealParam.stream().collect(Collectors.toMap(TaskDTO::getId, TaskDTO::getSubLineName));
-
+
-            //查询申诉列表
+            if (!CollectionUtils.isEmpty(taskByAppealParam)){
-            appealEntityQueryWrapper.in("task_id",taskBySubLineName.stream().map(TaskDTO::getId).collect(Collectors.toList()));
+                //查询申诉列表
-            Page<AppealEntity> appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper);
+                appealEntityQueryWrapper.in("task_id",taskByAppealParam.stream().map(TaskDTO::getId).collect(Collectors.toList()));
-            appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new));
+                Page<AppealEntity> appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper);
+                appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new));
+            }
         }
         appealDTOIPage.setRecords(buildDTO(appealDTOIPage.getRecords(),taskIdToSubLineNameMap));
         return Result.page(appealDTOIPage);

src/main/java/com/project/operation/domain/param/OperationLogParam.java

@@ -13,9 +13,9 @@ public class OperationLogParam extends BaseParam {
     //详细信息
     public String description;
     //开始时间
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     public Date startTime;
     //结束时间
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     public Date endTime;
 }

src/main/java/com/project/operation/domain/service/impl/SearchOperationLogDomainServiceImpl.java

@@ -1,5 +1,6 @@
 package com.project.operation.domain.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -50,10 +51,10 @@ public class SearchOperationLogDomainServiceImpl implements SearchOperationLogDo
             logQueryWrapper.like("description",param.getDescription());
         }
         if (param.getStartTime() != null) {
-            logQueryWrapper.ge("create_time",param.getStartTime());
+            logQueryWrapper.ge("create_time", DateUtil.beginOfDay(param.getStartTime()));
         }
         if (param.getEndTime() != null) {
-            logQueryWrapper.le("create_time",param.getEndTime());
+            logQueryWrapper.le("create_time",DateUtil.endOfDay(param.getEndTime()));
         }
         //只查执行成功的日志
         logQueryWrapper.eq("result",0);

src/main/java/com/project/task/mapper/TaskMapper.java

@@ -30,10 +30,22 @@ public interface TaskMapper extends BaseMapper<TaskEntity> {
      * 查询考试任务
      */
     @Select({
-            "select e.id,l.name as subLineName " +
+            "<script>",
-                    "FROM evaluator_task e " +
+            "SELECT e.id, l.name AS subLineName ",
-                    "LEFT join evaluator_product_line l on e.sub_line_id = l.id " +
+            "FROM evaluator_task e ",
-                    "where l.leaf = 1 and l.name LIKE CONCAT('%', #{subLineName}, '%')"
+            "LEFT JOIN evaluator_product_line l ON e.sub_line_id = l.id ",
+            "<where> ",
+            "<if test='subLineId != null'>",
+            "  e.sub_line_id = #{subLineId} ",
+            "</if>",
+            "<if test='lineId != null'>",
+            "  AND e.line_id = #{lineId} ",
+            "</if>",
+            "<if test='businessId != null'>",
+            "  AND e.business_id = #{businessId} ",
+            "</if>",
+            "</where>",
+            "</script>"
     })
-    List<TaskDTO> getTaskBySubLineName(@Param("subLineName") String subLineName);
+    List<TaskDTO> getTaskByAppealParam(@Param("subLineId") Long subLineId,@Param("lineId") Long lineId,@Param("businessId") Long businessId);
 }