MVP1.4-salary代发户5次上传代码-openBill详情加字段

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TApprovalRecord.java

@@ -29,6 +29,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -41,7 +42,7 @@ import java.util.Date;
 @TableName("t_approval_record")
 @EqualsAndHashCode()
 @Schema(description = "审批记录表")
-public class TApprovalRecord {
+public class TApprovalRecord implements Serializable {
 
 	/**
 	 * 主键

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandardIssueRes.java

@@ -27,6 +27,7 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -38,7 +39,7 @@ import java.math.BigDecimal;
 @Data
 @TableName("t_salary_standard_issue_res")
 @Schema(description = "薪资表与代发户表关联表")
-public class TSalaryStandardIssueRes {
+public class TSalaryStandardIssueRes implements Serializable {
 
 	/**
 	 * id

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryDetailVo.java

 package com.yifu.cloud.plus.v1.yifu.salary.vo;
 
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAtta;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -36,5 +33,9 @@ public class TSalaryDetailVo implements Serializable {
 	 * 薪资类审核记录 fxj 2021-11-15
 	 */
 	private List<TApprovalRecord> auditLogList = new ArrayList<>();
+	/**
+	 * 代发户列表 hgw 2023-1-13 14:36:34
+	 */
+	private List<TSalaryStandardIssueRes> resList = new ArrayList<>();
 
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -1459,6 +1459,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				}
 				salaryDetailVo.setSalaryAccountList(salaryAccountList);
 				attaList = tSalaryAttaService.getAttaListHaveSrc(salary.getId(), 230);
+
+				List<TSalaryStandardIssueRes> resList = tSalaryStandardIssueResService.list(
+						Wrappers.<TSalaryStandardIssueRes>query().lambda().eq(TSalaryStandardIssueRes::getSalaryId, salary.getId()));
+				salaryDetailVo.setResList(resList);
 			}
 			salaryDetailVo.setAttaList(attaList);
 			salaryDetailVo.setAuditLogList(auditLogService.list(Wrappers.<TApprovalRecord>query().lambda().eq(TApprovalRecord::getSalaryId, salary.getId())));