Pārlūkot izejas kodu

修改bug:
bug表1111,订单审核 审核通过界面审核时间筛选提示接口异常

jiakai 4 nedēļas atpakaļ
vecāks
revīzija
8853b80b74

+ 2 - 2
commons/src/main/java/com/jzg/commons/entity/dto/FeeAuditParam.java

@@ -102,11 +102,11 @@ public class FeeAuditParam extends PageRequest {
 
     @Schema(description = "审核时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime auditTimeStart;
+    private LocalDate auditTimeBegin;
 
     @Schema(description = "审核时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime auditTimeEnd;
+    private LocalDate auditTimeEnd;
 
     @Schema(description = "审核人")
     private String auditUser;

+ 2 - 5
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportFeeAuditSummaryServiceImpl.java

@@ -16,9 +16,6 @@ import com.jzg.console.service.ReportFeeAuditSummaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalTime;
-import java.util.Objects;
-
 /**
  * 费用审核汇总统计 Service 实现
  */
@@ -47,10 +44,10 @@ public class ReportFeeAuditSummaryServiceImpl implements ReportFeeAuditSummarySe
 
         // 转换时间:LocalDate -> LocalDateTime(开始日期的00:00:00,结束日期的23:59:59)
         if (param.getAuditTimeStart() != null) {
-            feeAuditParam.setAuditTimeStart(param.getAuditTimeStart().atStartOfDay());
+            feeAuditParam.setAuditTimeBegin(param.getAuditTimeStart());
         }
         if (param.getAuditTimeEnd() != null) {
-            feeAuditParam.setAuditTimeEnd(param.getAuditTimeEnd().atTime(LocalTime.MAX));
+            feeAuditParam.setAuditTimeEnd(param.getAuditTimeEnd());
         }
 
         // 调用远程服务获取审核列表

+ 2 - 2
tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -213,8 +213,8 @@
             <if test="param.niPolicyNumber != null and param.niPolicyNumber != ''">
                 and ioep.no_policy = #{param.niPolicyNumber}
             </if>
-            <if test="param.auditTimeStart != null and param.auditTimeEnd != null">
-                and DATE_FORMAT(ifa.audit_time, '%Y-%m-%d') between #{param.auditTimeStart} AND #{param.auditTimeEnd}
+            <if test="param.auditTimeBegin != null and param.auditTimeEnd != null">
+                and DATE_FORMAT(ifa.audit_time, '%Y-%m-%d') between #{param.auditTimeBegin} AND #{param.auditTimeEnd}
             </if>
             <if test="param.auditUser != null and param.auditUser != ''">
                 and ifa.audit_user = #{param.auditUser}