Commit 2569d434 authored by hongguangwu's avatar hongguangwu

MVP1.5.3-代发户

parent 4ca56db7
...@@ -67,10 +67,9 @@ public class TSalaryStandardIssueRes implements Serializable { ...@@ -67,10 +67,9 @@ public class TSalaryStandardIssueRes implements Serializable {
@Schema(description = "薪资主表id") @Schema(description = "薪资主表id")
private String salaryId; private String salaryId;
/** /**
* money * money 2023-4-4 11:11:56 hgw 去掉了金额限制,mvp1.5.3版本
*/ */
@ExcelAttribute(name = "money", isNotEmpty = true, errorInfo = "money不能为空") @ExcelAttribute(name = "money")
@NotBlank(message = "money不能为空")
@ExcelProperty("money") @ExcelProperty("money")
@Schema(description = "money") @Schema(description = "money")
private BigDecimal money; private BigDecimal money;
......
...@@ -541,7 +541,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -541,7 +541,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
fd3b71f20933e0d2.add(""); fd3b71f20933e0d2.add("");
} }
fd3b745c35ff27a8.add(res.getBankName()); fd3b745c35ff27a8.add(res.getBankName());
fd3b73a736cc9cc8.add(String.valueOf(res.getMoney())); if (Common.isNotNull(res.getMoney())) {
fd3b73a736cc9cc8.add(String.valueOf(res.getMoney()));
} else {
fd3b73a736cc9cc8.add("");
}
} }
sendMap.put("fd_3b71f1f4fd40ac.fd_3b71f207c0cfd0", fd3b71f207c0cfd0); sendMap.put("fd_3b71f1f4fd40ac.fd_3b71f207c0cfd0", fd3b71f207c0cfd0);
sendMap.put("fd_3b71f1f4fd40ac.fd_3b71f20883301a", fd3b71f20883301a); sendMap.put("fd_3b71f1f4fd40ac.fd_3b71f20883301a", fd3b71f20883301a);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment