fix:合并代码,修复撤销提交丢失的代码,

mybatis的动态sql的if标签判断中LocalDateTime不能与字符串比较,LocaDateTime只需要判断非null即可
修复使用LocalDateTime接受时间字符串失败的问题

ruoyi-modules/ruoyi-customerReconciliation/src/main/java/org/dromara/customerReconciliation/controller/CustomerReconciliationController.java

@@ -10,15 +10,19 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.customerReconciliation.domain.DTO.CustomerReconciliationDTO;
+import org.dromara.customerReconciliation.domain.VO.CustomerReconciliationVO;
 import org.dromara.customerReconciliation.domain.VO.PageVO;
 import org.dromara.customerReconciliation.domain.VO.ExportCustomerReconciliationVO;
 import org.dromara.customerReconciliation.service.CustomerReconciliationService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 /**
  * 客户对账单Controller
@@ -31,7 +35,7 @@ public class CustomerReconciliationController extends BaseController {
     @SaCheckPermission("fa:customerReconciliation:list")
     @GetMapping("/getCustomerReconciliation")
     public R<PageVO> getCustomerReconciliation(@Valid() CustomerReconciliationDTO customerReconciliationDTO, PageQuery pageQuery){
-        PageVO list = customerReconciliationService.getCustomerReconciliationPageVO(customerReconciliationDTO,pageQuery);
+        PageVO<CustomerReconciliationVO> list = customerReconciliationService.getCustomerReconciliationPageVO(customerReconciliationDTO,pageQuery);
         return R.ok(list);
     }
     @SaCheckPermission("fa:customerReconciliation:update")
@@ -46,7 +50,15 @@ public class CustomerReconciliationController extends BaseController {
         ExcelUtil.exportExcel(list, "客户对账单", ExportCustomerReconciliationVO.class,  response);
     }
     @GetMapping("/customers_pay")
-    public R<PageVO> getCustomerCollection(PageQuery pageQuery, LocalDateTime startTime, LocalDateTime endTime){
-        return R.ok(customerReconciliationService.getCustomerCollection(pageQuery,startTime,endTime));
+    public R<PageVO> getCustomerCollection(PageQuery pageQuery, Date startTime, Date endTime){
+        LocalDateTime s = null;
+        LocalDateTime e = null;
+        if (Objects.nonNull(startTime)) {
+            s = startTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+        }
+        if (Objects.nonNull(endTime)) {
+            e = endTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+        }
+        return R.ok(customerReconciliationService.getCustomerCollection(pageQuery, s, e));
     }
 }

ruoyi-modules/ruoyi-customerReconciliation/src/main/java/org/dromara/customerReconciliation/service/CustomerReconciliationService.java

@@ -2,19 +2,21 @@ package org.dromara.customerReconciliation.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.customerReconciliation.domain.DTO.CustomerReconciliationDTO;
+import org.dromara.customerReconciliation.domain.VO.CustomerReconciliationVO;
 import org.dromara.customerReconciliation.domain.VO.PageVO;
 
 import java.time.LocalDateTime;
 import org.dromara.customerReconciliation.domain.VO.ExportCustomerReconciliationVO;
+import org.dromara.customerReconciliation.domain.VO.PlanAndOrderVO;
 
 import java.util.List;
 
 public interface CustomerReconciliationService {
-    PageVO getCustomerReconciliationPageVO(CustomerReconciliationDTO customerReconciliationDTO, PageQuery pageQuery);
+    PageVO<CustomerReconciliationVO> getCustomerReconciliationPageVO(CustomerReconciliationDTO customerReconciliationDTO, PageQuery pageQuery);
 
     boolean updateCustomerReconciliationStatus(CustomerReconciliationDTO customerReconciliationDTO);
 
-    PageVO getCustomerCollection(PageQuery pageQuery, LocalDateTime startTime, LocalDateTime endTime);
+    PageVO<PlanAndOrderVO> getCustomerCollection(PageQuery pageQuery, LocalDateTime startTime, LocalDateTime endTime);
 
     List<ExportCustomerReconciliationVO> export(CustomerReconciliationDTO customerReconciliationDTO, PageQuery pageQuery);
 }

ruoyi-modules/ruoyi-customerReconciliation/src/main/java/org/dromara/customerReconciliation/service/impl/CustomerReconciliationServiceImpl.java

@@ -24,7 +24,7 @@ import java.time.LocalDateTime;
 public class CustomerReconciliationServiceImpl implements CustomerReconciliationService {
     private final CustomerReconciliationVOMapper customerReconciliationVOMapper;
     @Override
-    public PageVO getCustomerReconciliationPageVO(CustomerReconciliationDTO customerReconciliationDTO, PageQuery pageQuery) {
+    public PageVO<CustomerReconciliationVO> getCustomerReconciliationPageVO(CustomerReconciliationDTO customerReconciliationDTO, PageQuery pageQuery) {
         Page<CustomerReconciliationVO> page = customerReconciliationVOMapper.get(pageQuery.<CustomerReconciliationVO>build(), customerReconciliationDTO);
         return new PageVO(page.getTotal(), page.getRecords());
     }
@@ -51,7 +51,6 @@ public class CustomerReconciliationServiceImpl implements CustomerReconciliation
     @Override
     public PageVO<PlanAndOrderVO> getCustomerCollection(PageQuery pageQuery, LocalDateTime startTime, LocalDateTime endTime) {
         Page<PlanAndOrderVO> page = customerReconciliationVOMapper.getCustomerCollection(pageQuery.<PlanAndOrderVO>build(), startTime, endTime);
-        PageVO vo = new PageVO(page.getTotal(), page.getRecords());
-        return vo;
+        return new PageVO<>(page.getTotal(), page.getRecords());
     }
 }

ruoyi-modules/ruoyi-customerReconciliation/src/main/resources/mapper/CustomerReconciliationVOMapper.xml

@@ -192,10 +192,10 @@
         LEFT JOIN
         fa_kuyou_user_order uo ON p.order_num = uo.order_num
         <where>
-            <if test="startTime != null and startTime != ''">
+            <if test="startTime != null">
                 AND p.delivery_time >= #{startTime}
             </if>
-            <if test="endTime != null and endTime != ''">
+            <if test="endTime != null">
                  #{endTime} >= p.delivery_time
             </if>
         </where>