Merge branch 'dev_jzg_lipf_v20260901' into test

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/service/impl/PtlAgreementCostServiceImpl.java

@@ -415,6 +415,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/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/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>