Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622'

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

@@ -54,4 +54,22 @@ public class AmountAuditParam extends PageRequest {
     @Schema(description = "领取人")
     private String receiveUser;
 
+    @Schema(description = "付款时间")
+    private String[] paymentTime;
+
+    @Schema(description = "付款时间-起")
+    private String paymentTimeBegin;
+
+    @Schema(description = "付款时间-止")
+    private String paymentTimeEnd;
+
+    @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/entity/po/SysAmountAuditing.java

@@ -60,6 +60,9 @@ public class SysAmountAuditing extends BaseModel {
     @Schema(description = "审核人id")
     private String auditingUserId;
 
+    @Schema(description = "审核人用戶名")
+    private String auditingUserName;
+
     @Schema(description = "凭证号")
     private String voucherId;
 

commons/src/main/java/com/jzg/commons/entity/vo/AmountAuditVo.java

@@ -144,6 +144,10 @@ public class AmountAuditVo  extends BaseModel {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime withdrawalRequestTime;
 
+    @ExcelProperty("审核人")
+    @Schema(description = "审核人")
+    private String auditingUserName;
+
     @ExcelProperty("审核时间")
     @Schema(description = "审核时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -16,6 +16,33 @@ public class DateTimeUtils {
     private static final DateTimeFormatter DATE_FORMATTER =
             DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
+    /**
+     * 获取日期对应的起始时间，例如 2026-01-01 转化为 2026-01-01 00:00:00
+     *
+     * @param beginDate 2026-01-01 格式的日期
+     * @return 2026-01-01 00:00:00
+     * @author lipf
+     * @date 2026/8/27 15:10
+     */
+    public static String obtainStartTime(String beginDate){
+        LocalDate localDate = LocalDate.parse(beginDate, DATE_FORMATTER);
+        return localDate.atStartOfDay().format(DateTimeFormatter.ofPattern(pattern));
+    }
+
+    /**
+     * 获取日期对应的起始时间，例如 2026-01-01 转化为 2026-01-02 00:00:00
+     *
+     * @param endDate 2026-01-01 格式的日期
+     * @return 2026-01-02 00:00:00
+     * @author lipf
+     * @date 2026/8/27 15:10
+     */
+    public static String obtainNextDayStartTime(String endDate){
+        LocalDate localDate= LocalDate.parse(endDate, DATE_FORMATTER);
+        LocalDateTime nextLocalDateTime = localDate.plusDays(1).atStartOfDay();
+        return nextLocalDateTime.format(DateTimeFormatter.ofPattern(pattern));
+    }
+
     /**
      * 比较当前时间是否大于传入的字符串时间
      *

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

@@ -6,6 +6,7 @@ import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.vo.AmountAuditVo;
+import com.jzg.commons.util.DateTimeUtils;
 import com.jzg.organization.service.SysAmountAuditingService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -35,6 +36,18 @@ public class AmountAuditingController extends BaseController {
     @Operation(summary = "提现申请列表分页")
     public HttpResult<Page<AmountAuditVo>> auditList(@RequestBody AmountAuditParam param){
         log.info("应付账款-提现申请-查询：param=[{}]", JSONUtil.toJsonStr(param));
+        if(param.getPaymentTime() != null && param.getPaymentTime().length == 2){
+            String payingTimeBegin = param.getPaymentTime()[0];
+            String payingTimeEnd = param.getPaymentTime()[1];
+            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/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -217,6 +217,9 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
                 audit.setPaymentTime(LocalDateTime.now());
                 audit.setAuditingTime(LocalDateTime.now());
                 audit.setAuditingUserId(userId);
+                // add by lipf, 添加审核人姓名, 便于查询 2026-8-27 15:35:14
+                SysUserJzgInfo sysUserJzgInfo = sysJzgInfoService.getUserByUserId(userId);
+                audit.setAuditingUserName(sysUserJzgInfo.getName());
                 this.updateById(audit);
                 // 更新用户账户
                 SysUserAccount userAccount = userAccountService.queryByUserId(audit.getUserId(),systemCode);

tenant/organization/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     active: dev
 
 mybatis-plus:
-  mapper-locations: classpath*:/mapper/*Mapper.xml
+  mapper-locations: classpath*:/mapper/**/*Mapper.xml
   global-config:
     db-config:
       logic-delete-field: is_delete

tenant/organization/src/main/resources/mapper/InvAccountCardMapper.xml

@@ -59,7 +59,7 @@
                 and ia.account_name like CONCAT('%',#{param.accountName}, '%')
             </if>
             <if test="param.cardName != null and param.cardName != ''">
-                and iac.card_name = #{param.cardName}
+                and iac.card_name like concat('%',#{param.cardName}, '%')
             </if>
             <if test="param.accountQuality != null ">
                 and iac.account_quality = #{param.accountQuality}

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

@@ -47,7 +47,7 @@
 
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
         SELECT
-        saa.receive_user_name,
+        saa.receive_user_name,saa.auditing_user_id,saa.auditing_user_name ,
         saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
         saa.manager_user_name  as managerName,sum.mobile as managerMobile,saa.create_time as createTime,
         saa.amount, saa.balance_amount as balanceAmount,saa.account_name AS accountName,
@@ -74,6 +74,9 @@
             <if test="param.amount != null and param.amount != ''">
                 and saa.amount = #{param.amount}
             </if>
+            <if test="param.auditingUser != null and param.auditingUser != ''">
+                and saa.auditing_user_name = #{param.auditingUser}
+            </if>
             <if test="param.receiveUserName != null and param.receiveUserName !=''">
                 and saa.receive_user_name = #{param.receiveUserName}
             </if>
@@ -83,6 +86,9 @@
             <if test="param.auditTimeStart != null and param.auditTimeEnd != null">
                 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.account_id = #{param.accountId}
+            </if>
             <if test="param.auditingUser != null and param.auditingUser != ''">
                 and (sua.username = #{param.auditingUser} or sua.mobile = #{param.auditingUser})
             </if>
@@ -95,6 +101,12 @@
             <if test="param.auditingStatus != null ">
                 and saa.auditing_status = #{param.auditingStatus}
             </if>
+            <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}