执行人姓名

src/main/java/com/example/demo/mapper/coin/AuditMapper.java

@@ -51,4 +51,6 @@ public interface AuditMapper {
     void updateFirstRecharge(Integer jwcode);
     //获取审核人id对应人名
     List<Admin> getNamesByIds(Set<Integer> submitterIds);
+
+    List<Admin> getNamesByJwcodes(Set<Integer> executorIds);
 }

src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@@ -433,6 +433,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
         PageHelper.startPage(pageNum, pageSize);
 //        System.out.println(goldDetail.getMarkets());
         List<CashRecordDTO> list = cashRefundMapper.exSelect(cashRecordDTO);
+        System.out.println( list);
         if (list.isEmpty()) {
             return new PageInfo<>(list);
         }
@@ -442,12 +443,14 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
         Set<Integer> marketIds = new HashSet<>();
         Set<Integer> submitterIds = new HashSet<>();
         Set<Integer> auditIds = new HashSet<>();
+        Set<Integer> executorIds = new HashSet<>();
 
         list.forEach(item -> {
             if (item.getRelatedId() != null) relatedIds.add(item.getRelatedId());
             if (item.getMarket() != null) marketIds.add(item.getMarket());
             if (item.getSubmitterId() != null) submitterIds.add(item.getSubmitterId());
             if (item.getAuditId() != null) auditIds.add(item.getAuditId());
+            if (item.getExecutor() != null) executorIds.add(item.getExecutor());
         });
 
         // 批量查询
@@ -462,6 +465,8 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
 
         Map<Integer, LhlAudit> auditMap = cashRefundMapper.getAuditBatch(auditIds)
                 .stream().collect(Collectors.toMap(LhlAudit::getId, Function.identity()));
+        Map<String, String> executorNameMap = auditMapper.getNamesByJwcodes(executorIds)
+                .stream().collect(Collectors.toMap(Admin::getAccount, Admin::getAdminName));
 
         // 处理数据
         list.forEach(item -> {
@@ -470,12 +475,15 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
                 processCashCollection(item, cashCollection);
             }
 
+
             String marketName = marketNameMap.get(item.getMarket());
             String submitter = submitterNameMap.get(item.getSubmitterId());
             LhlAudit lhlAudit = auditMap.get(item.getAuditId());
+            String executorName = executorNameMap.get(String.valueOf(item.getExecutor()));
 
             item.setMarketName(marketName != null ? marketName : "");
             item.setSubmitter(submitter != null ? submitter : "");
+            item.setExecutorName(executorName != null ? executorName : "");
 
             if (lhlAudit != null) {
                 item.setAreaServise(lhlAudit.getAreaServise());

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -232,6 +232,7 @@
         crc.num_unit,
         crr.refund_model,
         crr.submitter_id,
+        crr.executor,
         crr.refund_reason,
         crr.remark,
         crr.status,
@@ -321,6 +322,7 @@
         crr.refund_channels,
         crr.voucher,
         crr.refund_time,
+        crr.executor,
         crr.status,
         crr.audit_id,
         crr.submitter_id,

src/main/resources/mapper/AuditMapper.xml

@@ -207,4 +207,18 @@
         ORDER BY create_time DESC
             limit 1
     </select>
+    <select id="getNamesByJwcodes" resultType="com.example.demo.domain.entity.Admin">
+        select account, admin_name from admin
+        <where>
+            <if test="executorIds != null and executorIds.size() > 0">
+                account in
+                <foreach collection="executorIds" item="account" open="(" separator="," close=")">
+                    #{account}
+                </foreach>
+            </if>
+            <if test="executorIds == null or executorIds.size() == 0">
+                1=0
+            </if>
+        </where>
+    </select>
 </mapper>