应付账款-拒绝付款tab页面支持按照拒绝时间进行搜索

commons/src/main/java/com/jzg/commons/entity/dto/AmountAuditParam.java

@@ -65,4 +65,11 @@ public class AmountAuditParam extends PageRequest {
 
     @Schema(description = "付款账户ID")
     private String accountId;
+
+    @Schema(description = "驳回时间")
+    private String[] rejectTime;
+    @Schema(description = "驳回时间-起")
+    private String rejectTimeBegin;
+    @Schema(description = "驳回时间-止")
+    private String rejectTimeEnd;
 }

commons/src/main/java/com/jzg/commons/util/DateTimeUtils.java

@@ -40,7 +40,7 @@ public class DateTimeUtils {
     public static String obtainNextDayStartTime(String endDate){
         LocalDate localDate= LocalDate.parse(endDate, DATE_FORMATTER);
         LocalDateTime nextLocalDateTime = localDate.plusDays(1).atStartOfDay();
-        return nextLocalDateTime.format(DateTimeFormatter.ofPattern(patternYMD));
+        return nextLocalDateTime.format(DateTimeFormatter.ofPattern(pattern));
     }
 
     /**

tenant/organization/src/main/java/com/jzg/organization/controller/AmountAuditingController.java

@@ -42,6 +42,12 @@ public class AmountAuditingController extends BaseController {
             param.setPaymentTimeBegin(DateTimeUtils.obtainStartTime(payingTimeBegin));
             param.setPaymentTimeEnd(DateTimeUtils.obtainNextDayStartTime(payingTimeEnd));
         }
+        if(param.getRejectTime() != null && param.getRejectTime().length == 2){
+            String rejectTimeBegin = param.getRejectTime()[0];
+            String rejectTimeEnd = param.getRejectTime()[1];
+            param.setRejectTimeBegin(DateTimeUtils.obtainStartTime(rejectTimeBegin));
+            param.setRejectTimeEnd(DateTimeUtils.obtainNextDayStartTime(rejectTimeEnd));
+        }
         Page<AmountAuditVo> result = sysAmountAuditingService.queryPage(param);
         return HttpResult.ok(result);
     }

tenant/organization/src/main/resources/mapper/finance/SysAmountAuditingMapper.xml

@@ -87,7 +87,7 @@
                 and DATE_FORMAT(saa.auditing_time, '%Y-%m-%d') between #{param.auditTimeStart} AND #{param.auditTimeEnd}
             </if>
             <if test="param.accountId != null and param.accountId != ''">
-                and saa.accountId = #{param.accountId}
+                and saa.account_id = #{param.accountId}
             </if>
             <if test="param.auditingUser != null and param.auditingUser != ''">
                 and (sua.username = #{param.auditingUser} or sua.mobile = #{param.auditingUser})
@@ -104,6 +104,9 @@
             <if test="param.paymentTimeBegin != null and param.paymentTimeEnd != null">
                 and saa.payment_time between #{param.paymentTimeBegin} and #{param.paymentTimeEnd}
             </if>
+            <if test="param.rejectTimeBegin != null and param.rejectTimeEnd != null">
+                and saa.reject_time between #{param.rejectTimeBegin} and #{param.rejectTimeEnd}
+            </if>
             <choose>
                 <when test="param.receiveUser != null and param.receiveUser != ''">
                     and saa.receive_user = #{param.receiveUser}