修复日期无法筛选

chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java

@@ -17,36 +17,38 @@ public class ProjectQuery extends CommonParam {
     /**
      * 项目名称
      */
-    @Condition(name = "project_name", type = Condition.ConditionType.like)
+    @Condition(name = "project_name", type = Condition.ConditionType.like,tableName = "wrk_info")
     private String projectName;
     /**
      * 项目联系人
      */
-    @Condition(name = "project_concat")
+    @Condition(name = "project_concat", type = Condition.ConditionType.like,tableName = "wrk_info")
     private String projectConcat;
     /**
      * 联系人手机号
      */
-    @Condition(name = "project_phone", type = Condition.ConditionType.like)
+    @Condition(name = "project_phone", type = Condition.ConditionType.like,tableName = "wrk_info")
     private String projectPhone;
     /**
      * 所属部门
      */
-    @Condition(name = "dept_id")
+    @Condition(name = "dept_id",type = Condition.ConditionType.eq,tableName = "wrk_info")
     private Long deptId;
     /**
      * 创建时间
      */
-    @Condition(name = "create_time", type = Condition.ConditionType.between)
+    @Condition(name = "create_time", type = Condition.ConditionType.between,tableName = "wrk_info")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN)
     private List<LocalDateTime> createTimes;
     /**
      * 项目状态
      */
-    @Condition(name = "project_effect")
+    @Condition(name = "project_effect", type = Condition.ConditionType.eq,tableName = "wrk_info")
     private Integer projectEffect;
 
-    @Condition(name = "dispose_time", type = Condition.ConditionType.between)
+    @Condition(name = "dispose_time", type = Condition.ConditionType.between,tableName = "wrk_info")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN)
     private List<LocalDateTime>  disposeTimes;
+
+    private List<String> disposeTime;
 }

chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java

@@ -20,4 +20,6 @@ public class WrkDataQuery extends CommonParam {
     @Condition(name = "dispose_time", tableName = "wi", type = Condition.ConditionType.between)
     private List<LocalDateTime> disposeTimes;
 
+    private List<String> disposeTime;
+
 }

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java

@@ -1,6 +1,7 @@
 package com.chushang.inspection.project.controller;
 
 import com.chushang.common.core.exception.utils.AssertUtil;
+import com.chushang.common.core.util.DateUtils;
 import com.chushang.common.core.validator.Create;
 import com.chushang.common.core.validator.Update;
 import com.chushang.common.core.web.AjaxResult;
@@ -19,10 +20,15 @@ import com.chushang.inspection.project.service.WrkProjectPaymentService;
 import com.chushang.inspection.project.service.WrkProjectService;
 import com.chushang.security.annotation.RequiresPermissions;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @auther: zhao
@@ -198,6 +204,16 @@ public class WrkProjectController {
     @RequiresPermissions("inspection:emp:data")
     public AjaxResult empData(ProjectQuery projectQuery)
     {
+        List<String> disposeTime = projectQuery.getDisposeTime();
+        if (!CollectionUtils.isEmpty(disposeTime)){
+            LocalDate disposeTimeStart = DateUtils.parseDate(disposeTime.get(0));
+            LocalDate disposeTimeEnd = DateUtils.parseDate(disposeTime.get(1));
+            List<LocalDateTime> disposeTimes = new ArrayList<>(2);
+            disposeTimes.add( disposeTimeStart.atStartOfDay());
+            disposeTimes.add(disposeTimeEnd.atTime(23, 59, 59));
+            projectQuery.setDisposeTimes(disposeTimes);
+        }
+
         return AjaxResult.success(projectService.empData(projectQuery));
     }
 

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java

@@ -2,6 +2,7 @@ package com.chushang.inspection.work.controller;
 
 
 import cn.hutool.core.util.StrUtil;
+import com.chushang.common.core.util.DateUtils;
 import com.chushang.common.core.web.AjaxResult;
 import com.chushang.common.log.annotation.SysLog;
 import com.chushang.common.log.enums.BusinessType;
@@ -13,6 +14,7 @@ import com.chushang.inspection.work.service.WrkInfoService;
 import com.chushang.security.annotation.RequiresPermissions;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +23,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.NumberFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -243,6 +247,15 @@ public class WrkInfoController {
     @RequiresPermissions("wrk:info:data")
     public AjaxResult wrkData(WrkDataQuery wrkDataQuery)
     {
+        List<String> disposeTime = wrkDataQuery.getDisposeTime();
+        if (!CollectionUtils.isEmpty(disposeTime)){
+            LocalDate disposeTimeStart = DateUtils.parseDate(disposeTime.get(0));
+            LocalDate disposeTimeEnd = DateUtils.parseDate(disposeTime.get(1));
+            List<LocalDateTime> disposeTimes = new ArrayList<>(2);
+            disposeTimes.add( disposeTimeStart.atStartOfDay());
+            disposeTimes.add(disposeTimeEnd.atTime(23, 59, 59));
+            wrkDataQuery.setDisposeTimes(disposeTimes);
+        }
         return AjaxResult.success(wrkInfoService.wrkData(wrkDataQuery));
     }
 

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java

@@ -796,6 +796,7 @@ public class WrkInfoServiceImpl extends ServiceImpl<WrkInfoMapper, WrkInfo> impl
     public PageResult empData(ProjectQuery projectQuery) {
         CommonParam commonParam = CommonParam.buildPageRequest();
         Page<WrkInfo> page = new Page<>(commonParam.getPage(), commonParam.getLimit());
+        WrapperUtils.buildSql(projectQuery);
         List<EmployeeVO> employeeVOList = baseMapper.empData(projectQuery, page);
         Set<Long> deptIds = employeeVOList.stream().map(EmployeeVO::getDeptId).collect(Collectors.toSet());
         Set<Long> userIds = employeeVOList.stream().map(EmployeeVO::getUserId).collect(Collectors.toSet());

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml

@@ -307,6 +307,9 @@
         <if test="query.projectConcat != null and query.projectConcat != ''">
             AND project_concat = #{query.projectConcat}
         </if>
+        <if test="1 == 1">
+            ${query.sqlParam.get('sqlWhere')}
+        </if>
         GROUP BY user_id
     </select>