Merge remote-tracking branch 'origin/master'

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

@@ -20,6 +20,15 @@ public class AmountAuditParam extends PageRequest {
     @Schema(description = "业务员类型1.前线人员 2:后线人员 3:合伙人 4:工作室管理员 5:团队 6:个代 7：电销 8 渠道")
     private String attrType;
 
+    @Schema(description = "管理人姓名")
+    private String managerName;
+
+    @Schema(description = "提现金额")
+    private String amount;
+
+    @Schema(description = "领取人姓名")
+    private String receiveUserName;
+
     @Schema(description = "提现时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate createTimeStart;

commons/src/main/java/com/jzg/commons/entity/finance/vo/importbatchmodify/InsPlyIncomeBatch.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.finance.vo.importbatchmodify;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.jzg.commons.entity.finance.po.InsPlyIncome;
 import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
 import io.swagger.v3.oas.annotations.media.Schema;

commons/src/main/java/com/jzg/commons/entity/finance/vo/importbatchmodify/InsPlyIncomeExportVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 @Data
 @Schema(description = "财务应收表")
@@ -32,26 +33,26 @@ public class InsPlyIncomeExportVo implements Serializable {
 
     @Schema(description = "交强手续费比例")
     @ExcelProperty(value ="交强手续费比例", index = 4)
-    private String jqSuperviseCostsProportion;
+    private BigDecimal jqSuperviseCostsProportion;
 
     @Schema(description = "交强跟单费比例")
     @ExcelProperty(value = "交强跟单费比例", index = 5)
-    private String jqOtherCostsProportion;
+    private BigDecimal jqOtherCostsProportion;
 
     @Schema(description = "商业手续费比例")
     @ExcelProperty(value = "商业手续费比例", index = 6)
-    private String sySuperviseCostsProportion;
+    private BigDecimal sySuperviseCostsProportion;
 
     @Schema(description = "商业跟单费比例")
     @ExcelProperty(value = "商业跟单费比例", index = 7)
-    private String syOtherCostsProportion;
+    private BigDecimal syOtherCostsProportion;
 
     @Schema(description = "驾意手续费比例")
     @ExcelProperty(value = "驾意手续费比例", index = 8)
-    private String jySuperviseCostsProportion;
+    private BigDecimal jySuperviseCostsProportion;
 
     @Schema(description = "驾意跟单费比例")
     @ExcelProperty(value = "驾意跟单费比例", index = 9)
-    private String jyOtherCostsProportion;
+    private BigDecimal jyOtherCostsProportion;
 
 }

commons/src/main/java/com/jzg/commons/entity/po/SysAmountAuditing.java

@@ -4,6 +4,7 @@ import java.io.Serial;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.BaseModel;
@@ -97,9 +98,17 @@ public class SysAmountAuditing extends BaseModel {
     @Schema(description = "领取人")
     private String receiveUser;
 
+    @Schema(description = "领取人姓名")
+    private String receiveUserName;
+
     @Schema(description = "系统code")
     private String systemCode;
 
+    @Schema(description = "管理人的用戶ID")
+    private String managerUserId;
+    @Schema(description = "管理人的姓名")
+    private String managerUserName;
+
     /**
      * 构造提现
      * @param applyWithdrawParam

commons/src/main/java/com/jzg/commons/entity/userinfo/ManagerUserInfo.java

@@ -0,0 +1,32 @@
+package com.jzg.commons.entity.userinfo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 管理人信息
+ *
+ * @author lipf
+ * @date 2026/8/27 11:19
+ */
+@Data
+public class ManagerUserInfo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 7522377148687127356L;
+
+
+    @Schema(description = "管理人在sys_user表中的序号")
+    private String managerUserId;
+
+//    @Schema(description = "管理人在sys_user表的userName字段")
+//    private String managerUserName;
+
+    @Schema(description = "管理人在sys_user_jzg_info表的序号")
+    private String managerJzgInfoId;
+
+    @Schema(description = "管理人在sys_user_jzg_info表的Name字段")
+    private String managerName;
+}

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

@@ -135,6 +135,10 @@ public class AmountAuditVo  extends BaseModel {
     @Schema(description = "提现人")
     private String withdrawalRequester;
 
+    @ExcelIgnore
+    @Schema(description = "领取人姓名")
+    private String receiveUserName;
+
     @ExcelProperty("提现时间")
     @Schema(description = "提现时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UserInfoController.java

@@ -0,0 +1,24 @@
+package com.jzg.quotation.summary.controller;
+
+import com.jzg.quotation.summary.service.userinfo.UserInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class UserInfoController {
+
+    @Autowired
+    private UserInfoService userInfoService;
+
+    /**
+     * 根据用户手机号查询名称
+     *
+     * @param mobile
+     * @return
+     */
+    @GetMapping("/api/v1/getUserNameByMobile")
+    String getUserNameByMobile(String mobile){
+        return userInfoService.getUserNameByMobile(mobile);
+    }
+}

tenant/organization/src/main/java/com/jzg/organization/action/service/ChangeBsAccountHandler.java

@@ -3,11 +3,9 @@ package com.jzg.organization.action.service;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.action.base.ActionHandler;
 import com.jzg.commons.entity.action.enums.ActionEnum;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
 import com.jzg.commons.exception.SystemException;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

tenant/organization/src/main/java/com/jzg/organization/action/service/ChangePocHandler.java

@@ -5,8 +5,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.action.base.ActionHandler;
 import com.jzg.commons.entity.action.enums.ActionEnum;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.commons.exception.SystemException;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

tenant/organization/src/main/java/com/jzg/organization/action/service/SendNotifyMsgHandler.java

@@ -8,15 +8,13 @@ import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import com.jzg.organization.consumer.templete.UserMessageTemplate;
 import com.jzg.organization.service.SysUserJzgInfoService;
 import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * 发送通知消息动作
  */

tenant/organization/src/main/java/com/jzg/organization/action/service/SupplementaryOrderHandler.java

@@ -4,7 +4,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.action.base.ActionHandler;
 import com.jzg.commons.entity.action.enums.ActionEnum;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

tenant/organization/src/main/java/com/jzg/organization/aop/OrderOperationLogAspect.java

@@ -12,7 +12,7 @@ import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
 import com.jzg.commons.entity.vo.QuestionOrder;
 import com.jzg.commons.util.JsonDiffUtil;
 import com.jzg.commons.util.SchemaDescriptionParser;
-import com.jzg.organization.client.InsOrdersClient;
+import com.jzg.organization.client.summary.InsOrdersClient;
 import com.jzg.quotation.summary.aop.aspect.OrderOperationLog;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

tenant/organization/src/main/java/com/jzg/organization/client/InsFeeOrdersClient.java → tenant/organization/src/main/java/com/jzg/organization/client/summary/InsFeeOrdersClient.java

@@ -1,4 +1,4 @@
-package com.jzg.organization.client;
+package com.jzg.organization.client.summary;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.finance.vo.BatchModifyVo;
@@ -6,6 +6,7 @@ import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -38,4 +39,13 @@ public interface InsFeeOrdersClient {
      */
     @PostMapping("/supplementOrder/adjustmentCostAndSave")
     HttpResult<InsFeeOrders> adjustmentCostAndSave(@RequestBody PtlAgreementCostRatioVo ptlAgreementCostRatioVo);
+
+    /**
+     * 根据用户手机号查询名称
+     *
+     * @param mobile
+     * @return
+     */
+    @GetMapping("/api/v1/getUserNameByMobile")
+    String getUserNameByMobile(@RequestParam("mobile") String mobile);
 }

tenant/organization/src/main/java/com/jzg/organization/client/InsOrdersClient.java → tenant/organization/src/main/java/com/jzg/organization/client/summary/InsOrdersClient.java

@@ -1,7 +1,6 @@
-package com.jzg.organization.client;
+package com.jzg.organization.client.summary;
 
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.finance.vo.BatchModifyVo;
 import com.jzg.commons.entity.finance.vo.UpdateCompanyBatchVo;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;

tenant/organization/src/main/java/com/jzg/organization/client/QuoteClient.java → tenant/organization/src/main/java/com/jzg/organization/client/summary/QuoteClient.java

@@ -1,4 +1,4 @@
-package com.jzg.organization.client;
+package com.jzg.organization.client.summary;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsFeeOrdersParam;

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.dto.PartnerReviewParam;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.user.vo.UserInfoWithPhone;
+import com.jzg.commons.entity.userinfo.ManagerUserInfo;
 import com.jzg.commons.entity.vo.PartnerRecommenderVo;
 
 import java.util.List;
@@ -12,6 +13,16 @@ import java.util.Map;
 
 public interface SysUserJzgInfoService extends IService<SysUserJzgInfo> {
 
+    /**
+     * 根据 sys_user_jzg_info 表的序号查询改用户管理人的信息
+     *
+     * @param jzgInfoId sys_user_jzg_info 表的序号
+     * @return ManagerUserInfo
+     * @author lipf
+     * @date 2026/8/27 11:29
+     */
+    ManagerUserInfo queryManagerInfoByJzgInfo(String jzgInfoId);
+
     /**
      * 查询有效的业务员信息
      *

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -46,8 +46,8 @@ import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.*;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.client.EsmInsCompanyClient;
-import com.jzg.organization.client.InsFeeOrdersClient;
-import com.jzg.organization.client.InsOrdersClient;
+import com.jzg.organization.client.summary.InsFeeOrdersClient;
+import com.jzg.organization.client.summary.InsOrdersClient;
 import com.jzg.organization.entity.dto.CalRes;
 import com.jzg.organization.excel.listener.JyExcelListener;
 import com.jzg.organization.excel.listener.OtherExcelListener;
@@ -2283,15 +2283,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         InsPlyIncomeExportVo vo = new InsPlyIncomeExportVo();
         // 这里是参考样例，方便业务进行修改
         vo.setLicenseNo("样例：晋AK68H2");
-        vo.setJqPolicyNo("jq_2026年8月26日10:00:48");
-        vo.setSyPolicyNo("sy_2026年8月26日10:00:56");
-        vo.setJyPolicyNo("jy_2026年8月26日10:01:04");
-        vo.setJqSuperviseCostsProportion("10");
-        vo.setJqOtherCostsProportion("15");
-        vo.setSySuperviseCostsProportion("12");
-        vo.setSyOtherCostsProportion("11");
-        vo.setJySuperviseCostsProportion("13");
-        vo.setJyOtherCostsProportion("17");
+        vo.setJqPolicyNo("TEST-JQ-202608270001");
+        vo.setSyPolicyNo("TEST-SY-202608270001");
+        vo.setJyPolicyNo("TEST-JY-202608270001");
+        vo.setJqSuperviseCostsProportion(BigDecimalUtil.valueOf("10"));
+        vo.setJqOtherCostsProportion(BigDecimalUtil.valueOf("15"));
+        vo.setSySuperviseCostsProportion(BigDecimalUtil.valueOf("12"));
+        vo.setSyOtherCostsProportion(BigDecimalUtil.valueOf("11"));
+        vo.setJySuperviseCostsProportion(BigDecimalUtil.valueOf("13"));
+        vo.setJyOtherCostsProportion(BigDecimalUtil.valueOf("17"));
         exportVos.add(vo);
         // 调用动态导出
         return exportBaseService.upLoadFile(
@@ -2364,15 +2364,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      */
     private HttpResult<String> validateBatch(List<InsPlyIncomeBatch> datas) {
         log.info("导入批量修改。 datas.size=[{}]", JSONUtil.toJsonStr(datas));
-        StringJoiner joiner = new StringJoiner(",","校验未通过： ","");
+        StringJoiner errorMsg = new StringJoiner(",","","");
         for (InsPlyIncomeBatch data : datas) {
             if(StrUtil.isEmpty(data.getOrderNo())){
-                joiner.add(String.format("车牌号为[%s]的记录根据保单号没有找到订单信息", data.getLicenseNo()));
+                errorMsg.add(String.format("车牌号为[%s]的记录根据保单号没有找到订单信息", data.getLicenseNo()));
                 continue;
             }
             InsPlyIncome insPlyIncome = data.getInsPlyIncome();
             if(insPlyIncome == null){
-                joiner.add(String.format("车牌号为[%s]的记录根据订单号[%s]没有找到应收记录", data.getLicenseNo(), data.getOrderNo()));
+                errorMsg.add(String.format("车牌号为[%s]的记录根据订单号[%s]没有找到应收记录", data.getLicenseNo(), data.getOrderNo()));
                 continue;
             }
         }
@@ -2383,12 +2383,12 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         }).toList();
         String s = this.validatePolicy(exts, "20");
         if(StrUtil.isNotEmpty(s)){
-            joiner.add(s);
+            errorMsg.add(s);
         }
-        if(StrUtil.isNotEmpty(joiner.toString())){
-            return HttpResult.ok();
+        if(StrUtil.isNotEmpty(errorMsg.toString())){
+            return HttpResult.error(errorMsg.toString());
         }
-        return HttpResult.error(joiner.toString());
+        return HttpResult.ok();
     }
 
     /**

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -18,10 +18,12 @@ import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.po.SysUserAccount;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import com.jzg.commons.entity.userinfo.ManagerUserInfo;
 import com.jzg.commons.entity.vo.AmountAuditVo;
 import com.jzg.commons.entity.vo.IncomeAndExpenseList;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.*;
+import com.jzg.organization.client.summary.InsFeeOrdersClient;
 import com.jzg.organization.mapper.SysAmountAuditingMapper;
 import com.jzg.organization.service.*;
 import com.jzg.organization.state.AuditState;
@@ -82,10 +84,14 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     @Autowired
     private InvAccountCardService invAccountCardService;
 
+    @Autowired
+    private InsFeeOrdersClient insFeeOrdersClient;
+
     private static final String AMOUNT_LOCK_PREFIX = "amountLock:";
 
     @Override
     public Page<AmountAuditVo> queryPage(AmountAuditParam param) {
+        log.info("应付账款-提现申请： param=[{}]", JSONUtil.toJsonStr(param));
         Page<AmountAuditVo> page = baseMapper.queryPage(param.getPage(), param);
         List<AmountAuditVo> records = page.getRecords();
         if(CollUtil.isNotEmpty(records)){
@@ -148,6 +154,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             }else{
                 // 领取订单
                 audit.setReceiveUser(receiveUser);
+                audit.setReceiveUserName(insFeeOrdersClient.getUserNameByMobile(receiveUser));
                 audit.setReceiveTime(LocalDateTime.now());
                 this.updateById(audit);
                 // redis 锁定按钮
@@ -452,7 +459,13 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         }
         SysUserJzgInfoBankCardDto sysUserJzgInfoBankCardDto = bankCardByUserId.stream().filter(x -> x.getId().equals(applyWithdrawParam.getBankCardId())).findFirst().get();
         // 构造提现对象
-        SysAmountAuditing sysAmountAuditing = new SysAmountAuditing(applyWithdrawParam,sysUserAccount,sysUserJzgInfoBankCardDto,baseController.getUserId());
+        SysAmountAuditing sysAmountAuditing = new SysAmountAuditing(applyWithdrawParam,sysUserAccount,sysUserJzgInfoBankCardDto,baseController.getUserId());;
+        // 查询业务员的管理员信息
+        ManagerUserInfo managerUserInfo = sysUserJzgInfoService.queryManagerInfoByJzgInfo(sysUserJzgInfo.getId());
+        if(managerUserInfo != null){
+            sysAmountAuditing.setManagerUserId(managerUserInfo.getManagerUserId());
+            sysAmountAuditing.setManagerUserName(managerUserInfo.getManagerName());
+        }
         baseMapper.insert(sysAmountAuditing);
         return HttpResult.ok("提现申请完成");
     }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDistributionSettingServiceImpl.java

@@ -12,7 +12,7 @@ import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.EasyExcelUtils;
 import com.jzg.commons.util.ServletUtils;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import com.jzg.organization.mapper.SysDistributionAuditMapper;
 import com.jzg.organization.mapper.SysDistributionSettingMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoMapper;

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -11,9 +11,10 @@ import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.entity.account.po.SysUserAccountChangeLog;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.*;
+import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.util.BigDecimalUtil;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import com.jzg.organization.mapper.SysAmountAuditingMapper;
 import com.jzg.organization.mapper.SysUserAccountIncomeLogMapper;
 import com.jzg.organization.mapper.SysUserAccountMapper;

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.jzg.commons.entity.dto.PartnerReviewParam;
 import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.user.vo.UserInfoWithPhone;
+import com.jzg.commons.entity.userinfo.ManagerUserInfo;
 import com.jzg.commons.entity.vo.PartnerRecommenderVo;
 import com.jzg.organization.mapper.SysUserJzgInfoMapper;
 import com.jzg.organization.mapper.SysUserMapper;
@@ -37,6 +38,37 @@ public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper,
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    /**
+     * 根据 sys_user_jzg_info 表的序号查询改用户管理人的信息
+     *
+     * @param jzgInfoId sys_user_jzg_info 表的序号， 业务员的id
+     * @return ManagerUserInfo
+     * @author lipf
+     * @date 2026/8/27 11:29
+     */
+    @Override
+    public ManagerUserInfo queryManagerInfoByJzgInfo(String jzgInfoId) {
+        log.info("根据 sys_user_jzg_info 表的序号查询改用户管理人的信息. jzgInfoId=[{}]", jzgInfoId);
+        if(jzgInfoId == null){
+            return null;
+        }
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper.selectById(jzgInfoId);
+        if(sysUserJzgInfo == null || StrUtil.isEmpty(sysUserJzgInfo.getLeaderId())){
+            return null;
+        }
+        // 管理人在sys_user_jzg_info 表的序号
+        String leaderId = sysUserJzgInfo.getLeaderId();
+        SysUserJzgInfo managerUserJzgInfo = sysUserJzgInfoMapper.selectById(leaderId);
+        if(managerUserJzgInfo == null){
+            log.info("根据管理人id=[{}]查询sys_user_jzg_info 表中数据为空",leaderId);
+            return null;
+        }
+        ManagerUserInfo  managerUserInfo = new ManagerUserInfo();
+        managerUserInfo.setManagerJzgInfoId(managerUserJzgInfo.getId());
+        managerUserInfo.setManagerName(managerUserJzgInfo.getName());
+        managerUserInfo.setManagerUserId(managerUserJzgInfo.getUserId());
+        return managerUserInfo;
+    }
 
     /**
      * 查询有效的业务员信息

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -843,6 +843,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult<Boolean> batchLeader(BatchLeaderVo batchLeaderVo) {
+        log.info("设置管理人：batchLeaderVo=[{}]", JSONUtil.toJsonStr(batchLeaderVo));
         if (batchLeaderVo.getGetAll() == 1) {
             List<SysUserJzgInfo> sysUserJzgInfoList = sysUserJzgInfoService.list();
             for (SysUserJzgInfo sysUserJzgInfo : sysUserJzgInfoList) {

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

@@ -47,8 +47,9 @@
 
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
         SELECT
+        saa.receive_user_name,
         saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
-        sujim.name as managerName,sum.mobile as managerMobile,saa.create_time as createTime,
+        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,
         saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum, suji.id as userJzgInfoId,
         saa.payment_time as paymentTime, saa.reject_reason as rejectReason, saa.reject_time as rejectTime, saa.reject_person as rejectPerson,
@@ -70,7 +71,12 @@
             <if test="param.attrType != null ">
                 and suji.type_attr = #{param.attrType}
             </if>
-
+            <if test="param.amount != null and param.amount != ''">
+                and saa.amount = #{param.amount}
+            </if>
+            <if test="param.receiveUserName != null and param.receiveUserName !=''">
+                and saa.receive_user_name = #{param.receiveUserName}
+            </if>
             <if test="param.createTimeStart != null and param.createTimeEnd != null">
                 and DATE_FORMAT(saa.create_time, '%Y-%m-%d') between #{param.createTimeStart} AND #{param.createTimeEnd}
             </if>
@@ -83,7 +89,9 @@
             <if test="param.userJzgInfoId != null and param.userJzgInfoId != ''">
                 and suji.id = #{param.userJzgInfoId}
             </if>
-
+            <if test="param.managerName != null and param.managerName !=''">
+                and saa.manager_user_name  like concat('%',#{param.managerName},'%')
+            </if>
             <if test="param.auditingStatus != null ">
                 and saa.auditing_status = #{param.auditingStatus}
             </if>