薪资管理根据转介人查询

yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAccountExportDTO.java

@@ -17,9 +17,13 @@ public class FortuneAccountExportDTO implements Serializable {
     @ExcelProperty("转介人")
     private String broker;
 
+    private String brokerBizId;
+
     @ExcelProperty("所属团队")
     private String team;
 
+    private String teamBizId;
+
     @ExcelProperty("出账币种")
     private String currency;
 

yd-csf-service/src/main/java/com/yd/csf/service/model/FortuneAccount.java

@@ -34,11 +34,21 @@ public class FortuneAccount implements Serializable {
     private String broker;
 
     /**
+     * 转介人业务id
+     */
+    private String brokerBizId;
+
+    /**
      * 所属团队
      */
     private String team;
 
     /**
+     * 所属团队业务id
+     */
+    private String teamBizId;
+
+    /**
      * 出账币种
      */
     private String currency;

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java

@@ -122,7 +122,9 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             FortuneAccount fortuneAccount = new FortuneAccount();
             fortuneAccount.setFortuneAccountBizId(RandomStringGenerator.generateBizId16("fortune_account"));
             fortuneAccount.setBroker(accountExportDTO.getBroker());
+            fortuneAccount.setBrokerBizId(accountExportDTO.getBrokerBizId());
             fortuneAccount.setTeam(accountExportDTO.getTeam());
+            fortuneAccount.setTeamBizId(accountExportDTO.getTeamBizId());
             fortuneAccount.setCurrency(accountExportDTO.getCurrency());
             fortuneAccount.setHkdAmount(accountExportDTO.getAmount());
             fortuneAccount.setFortuneAccountDate(currentDate);

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java

@@ -391,11 +391,13 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
                     FortuneAccountExportDTO accountDTO = new FortuneAccountExportDTO();
                     accountDTO.setBroker(broker);
+                    accountDTO.setBrokerBizId(brokerFortunes.get(0).getBrokerBizId());
                     accountDTO.setFortuneList(brokerFortunes);
 
                     // 设置团队、币种（取第一个记录）
                     if (CollUtil.isNotEmpty(brokerFortunes)) {
                         accountDTO.setTeam(brokerFortunes.get(0).getTeam());
+                        accountDTO.setTeamBizId(brokerFortunes.get(0).getTeamBizId());
                         accountDTO.setCurrency(currency);
                     }
 

yd-csf-service/src/main/resources/mappers/FortuneAccountMapper.xml

@@ -8,6 +8,9 @@
             <id property="id" column="id" />
             <result property="fortuneAccountBizId" column="fortune_account_biz_id" />
             <result property="broker" column="broker" />
+            <result property="brokerBizId" column="broker_biz_id" />
+            <result property="team" column="team" />
+            <result property="teamBizId" column="team_biz_id" />
             <result property="currency" column="currency" />
             <result property="amount" column="amount" />
             <result property="hkdAmount" column="hkd_amount" />
@@ -23,7 +26,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,fortune_account_biz_id,broker,currency,amount,hkd_amount,status,fortune_account_date,content,remark,
+        id,fortune_account_biz_id,broker,broker_biz_id,team,team_biz_id,
+        currency,amount,hkd_amount,status,fortune_account_date,content,remark,
         is_deleted,creator_id,updater_id,create_time,update_time
     </sql>
 </mapper>