修复bug

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/info/CustomerInfoMapper.java

@@ -34,8 +34,8 @@ public interface CustomerInfoMapper extends BaseMapperX<CustomerInfoDO> {
                 .eqIfPresent(CustomerInfoDO::getTrade, reqVO.getTrade())
                 .eqIfPresent(CustomerInfoDO::getCustomerNature, reqVO.getCustomerNature())
                 .eqIfPresent(CustomerInfoDO::getCompanyAddress, reqVO.getCompanyAddress())
-                .eqIfPresent(CustomerInfoDO::getCustomerPerson, reqVO.getCustomerPerson())
-                .eqIfPresent(CustomerInfoDO::getCustomerPersonPhone, reqVO.getCustomerPersonPhone())
+                .likeIfPresent(CustomerInfoDO::getCustomerPerson, reqVO.getCustomerPerson())
+                .likeIfPresent(CustomerInfoDO::getCustomerPersonPhone, reqVO.getCustomerPersonPhone())
                 .eqIfPresent(CustomerInfoDO::getCompanyPersonAddress, reqVO.getCompanyPersonAddress())
                 .eqIfPresent(CustomerInfoDO::getCustomerFrom, reqVO.getCustomerFrom())
                 .eqIfPresent(CustomerInfoDO::getIsOpen, reqVO.getIsOpen())

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/leave/AttendanceLeaveController.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.attendance.controller.admin.leave;
 
 import cn.iocoder.yudao.module.attendance.controller.admin.business.vo.AttendanceBusinessRespVO;
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -43,6 +45,8 @@ public class AttendanceLeaveController {
     private AttendanceLeaveService leaveService;
     @Resource
     private DeptApi deptApi;
+    @Resource
+    private FileApi fileApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建请假信息")
@@ -83,6 +87,9 @@ public class AttendanceLeaveController {
                 respVO.setDeptName(dept.getName());
             }
         }
+        // 附件列表
+        List<FileDTO> fileList = fileApi.getFileDTOListByBiz(respVO.getLeaveId());
+        respVO.setFileList(fileList);
         return success(respVO);
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/leave/vo/AttendanceLeavePageReqVO.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.attendance.controller.admin.leave.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
+
+import java.time.LocalDate;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -51,7 +53,7 @@ public class AttendanceLeavePageReqVO extends PageParam {
 
     @Schema(description = "开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] startDate;
+    private LocalDate[] startDate;
 
     @Schema(description = "具体时间，精确到上下午，am上午 pm下午")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -59,7 +61,7 @@ public class AttendanceLeavePageReqVO extends PageParam {
 
     @Schema(description = "结束日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] endDate;
+    private LocalDate[] endDate;
 
     @Schema(description = "具体时间，精确到上下午，am上午 pm下午")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/leave/vo/AttendanceLeaveRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.attendance.controller.admin.leave.vo;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -119,4 +120,7 @@ public class AttendanceLeaveRespVO {
     @ExcelProperty("租户编号")
     private Long tenantId;
 
+    @Schema(description = "附件列表")
+    private List<FileDTO> fileList;
+
 }

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/out/AttendanceOutController.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.attendance.controller.admin.out;
 
-import cn.iocoder.yudao.module.attendance.controller.admin.leave.vo.AttendanceLeaveRespVO;
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -43,6 +44,8 @@ public class AttendanceOutController {
     private AttendanceOutService outService;
     @Resource
     private DeptApi deptApi;
+    @Resource
+    private FileApi fileApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建公务外出信息")
@@ -83,6 +86,9 @@ public class AttendanceOutController {
                 respVO.setDeptName(dept.getName());
             }
         }
+        // 附件列表
+        List<FileDTO> fileList = fileApi.getFileDTOListByBiz(respVO.getOutId());
+        respVO.setFileList(fileList);
         return success(respVO);
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/out/vo/AttendanceOutRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.attendance.controller.admin.out.vo;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -111,4 +112,7 @@ public class AttendanceOutRespVO {
     @ExcelProperty("租户编号")
     private Long tenantId;
 
+    @Schema(description = "附件列表")
+    private List<FileDTO> fileList;
+
 }

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/service/info/AttendanceInfoServiceImpl.java

@@ -181,10 +181,10 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
     @Override
     @TenantIgnore
     public PageResult<AttendanceDailyInfoRespVO> getDailyInfoPage(AttendanceDailyInfoPageReqVO pageReqVO) {
-        int currentPage = pageReqVO.getPageNo();
-        if (currentPage > 0) {
-            pageReqVO.setPageNo(currentPage - 1);
-        }
+//        int currentPage = pageReqVO.getPageNo();
+//        if (currentPage > 0) {
+//            pageReqVO.setPageNo(currentPage - 1);
+//        }
         List<AttendanceDailyInfoRespVO> list = infoMapper.getDailyInfoPage(pageReqVO);
         if (list != null && list.size() > 0) {
             for (AttendanceDailyInfoRespVO info : list) {