Merge remote-tracking branch 'origin/master'

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

@@ -90,6 +90,8 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     @Schema(description = "管理员名称")
     private String leaderName;
 
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
     @Schema(description = "审核记录列表")
     private List<ChangeLogDetail> sysUserJzgInfoBankCardRecordList;
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoMapper.java

@@ -16,6 +16,8 @@ import java.util.List;
 @Mapper
 public interface SysUserJzgInfoMapper extends BaseMapper<SysUserJzgInfo> {
 
+    SysUserJzgInfo getYWYById(@Param("id") String id);
+
     /**
      * 查询有效的业务员信息
      *

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

@@ -43,6 +43,7 @@ public interface SysUserJzgInfoService extends IService<SysUserJzgInfo> {
     SysUserJzgInfo getUserByUserId(String userId);
 
     SysUserJzgInfo getUserById(String userId);
+    SysUserJzgInfo getYWYById(String userId);
 
     /**
      * 通过手机号获取晋掌柜用户信息

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

@@ -421,6 +421,18 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
         costParam.setPhones(phones);
 
         Map<String, String> userName2Name = sysUserJzgInfoService.queryUserInfoUserName2Name(baseController.getSystemCode());
+        Map<String, String> name2UserName = new HashMap<>(userName2Name);
+        for (String s : userName2Name.keySet()) {
+            String name = userName2Name.get(s);
+            if(!s.equals(name)){
+                name2UserName.put(name, s);
+            }
+        }
+        if(StrUtil.isNotEmpty(costParam.getAuditPerson())){
+            String auditPersonPhone = name2UserName.getOrDefault(costParam.getAuditPerson(), costParam.getAuditPerson());
+            log.info("姓名换汇为手机号。 name=[{}],phone=[{}]",costParam.getAuditPerson(), auditPersonPhone);
+            costParam.setAuditPerson(auditPersonPhone);
+        }
         Page<CostManagementVo> costManagementVoPage = baseMapper.pageList(costParam.getPage(), costParam);
         // 按承保规则属性 sort 正序，重新排列 cost_rules 各段描述
         reorderCostRules(costManagementVoPage.getRecords());

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

@@ -1050,7 +1050,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         SalespersonInfoVo salespersonInfo = schemeRuleFilterVo.getSalespersonInfo();
         if (CollUtil.isNotEmpty(companyList) && ObjectUtil.isNotEmpty(salespersonInfo) && StrUtil.isNotBlank(salespersonInfo.getId())) {
             // 根据业务员ID获取业务员信息（含部门ID）
-            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getUserById(salespersonInfo.getId());
+            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getYWYById(salespersonInfo.getId());
             String userDeptId = sysUserJzgInfo.getDeptId(); // 业务员所属部门ID
 
             // ========== 核心逻辑开始 ==========

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

@@ -130,6 +130,10 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
 
                 changeLogDetailList.add(new ChangeLogDetail(action.getDescription(), action.getCreateTime(), show, action.getRemark(), action.getBankCardId(), action.getId()));
             }
+            // 按照财务要求， 待审核的时候，也应该有一个提交申请的列表
+            if("0".equals(sysUserJzgInfoBankCardDto.getAuditStatus())){
+                changeLogDetailList.add(new ChangeLogDetail("添加新卡", sysUserJzgInfoBankCardDto.getCreateTime(), null, "添加新卡，待审核", sysUserJzgInfoBankCardDto.getBankCardNumber(), sysUserJzgInfoBankCardDto.getId()));
+            }
             sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(changeLogDetailList);
             // 填充最新的驳回日期和驳回原因
             if(CollUtil.isNotEmpty(sysUserJzgInfoBankCardRecordList)){

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

@@ -102,6 +102,10 @@ public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper,
         return baseMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
                 .eq(SysUserJzgInfo::getId, id));
     }
+    @Override
+    public SysUserJzgInfo getYWYById(String id) {
+        return sysUserJzgInfoMapper.getYWYById(id);
+    }
 
 
     @Override

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

@@ -118,6 +118,7 @@ data-scope:
     - getOrganizationUser
     - deleteOrganizationUser
     - queryBJYwy
+    - getYWYById
 
 
 

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

@@ -407,12 +407,6 @@
         LEFT JOIN esm_ins_company eic on eic.id = pa.company_id  AND eic.is_delete = 0
         <where>
             pc.is_delete = 0
-            <if test="costParam.phones != null and costParam.phones.size() > 0 ">
-                and pc.audit_person in
-                <foreach collection="costParam.phones" separator="," open="(" close=")" item="phone">
-                    #{phone}
-                </foreach>
-            </if>
             <if test="costParam.costDescribes != null and costParam.costDescribes.length >0 ">
                 and (
                     <foreach  collection="costParam.costDescribes" close=")" open="(" separator="and " item="costDescribe">
@@ -524,7 +518,9 @@
             <if test="costParam.updateTimeArr != null and costParam.updateTimeArr.size() > 0">
                 AND pc.update_time BETWEEN #{costParam.updateTimeArr[0]} AND #{costParam.updateTimeArr[1]}
             </if>
-
+            <if test="costParam.auditPerson != null and costParam.auditPerson != '' ">
+                and pc.audit_person = #{costParam.auditPerson}
+            </if>
             <if test="costParam.newCostIds != null and costParam.newCostIds.size() &gt; 0">
                 AND pc.id IN
                 <foreach collection="costParam.newCostIds" item="v" open="(" separator="," close=")">#{v}</foreach>

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

@@ -56,6 +56,19 @@
             </if>
         </where>
     </select>
+    <select id="getYWYById" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">
+        SELECT id, user_id, name, work_number, status, is_enable, system_code, dept_id,
+        open_id, alipay, approval_opinion, logout_time, head_sculpture, leader_id,
+        referrer_id, manager_id, position_id, operator_code, partner_level, type_attr,
+        factor_verify, address, nations, koseki, birthday, marital_status, politics_status,
+        health, postal_code, email, blood_type, education, school, graduation_time,
+        former_employer, entry_time, agent_qualification_code, emergency_contact_tel,
+        emergency_contact_name, remark, sex, is_computer, speciality, salary, salary_level,
+        live_address, province, city, district, is_delete, is_distribution, distribution_time,
+        bank_card_number, bank_name, last_login_time, create_by, create_time, update_by, update_time
+        FROM sys_user_jzg_info
+        where id = #{id}
+    </select>
     <!-- 查询业务员 lipf 2026年4月24日11:22:18  -->
     <select id="queryYwy" resultMap="BaseResultMap">
         select