Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java

@@ -237,9 +237,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		if (Common.isNotNull(entity.getDaysDue())){
 			wrapper.eq(TEmpContractAlert::getDaysDue,entity.getDaysDue());
 		}
-		if (Common.isNotNull(entity.getUnitId())){
+		if (Common.isNotNull(entity.getUnitId())) {
 			wrapper.eq(TEmpContractAlert::getUnitId, entity.getUnitId());
 		}
+		if (Common.isNotNull(entity.getEmpPhone())) {
+			wrapper.eq(TEmpContractAlert::getEmpPhone, entity.getEmpPhone());
+		}
 		return wrapper;
 	}
 	/**

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

@@ -67,10 +67,9 @@ public class TSalaryStandardIssueRes implements Serializable {
 	@Schema(description = "薪资主表id")
 	private String salaryId;
 	/**
-	 * money
+	 * money 2023-4-4 11:11:56 hgw 去掉了金额限制，mvp1.5.3版本
 	 */
-	@ExcelAttribute(name = "money", isNotEmpty = true, errorInfo = "money不能为空")
-	@NotBlank(message = "money不能为空")
+	@ExcelAttribute(name = "money")
 	@ExcelProperty("money")
 	@Schema(description = "money")
 	private BigDecimal money;

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java

@@ -405,11 +405,11 @@ public class TSalaryAccountController {
 	@Operation(description = "报账跨年查询导出 hasPermission('account_all_year_export')")
 	@PostMapping("/allYearExport")
 	@PreAuthorize("@pms.hasPermission('account_all_year_export')")
-	public List<TSalaryAccount> allYearExport(@RequestBody TSalaryAccountSearchVo tSalaryAccount) {
+	public R<List<TSalaryAccount>> allYearExport(@RequestBody TSalaryAccountSearchVo tSalaryAccount) {
 		if (Common.isEmpty(tSalaryAccount.getEmpIdcard())) {
-			return null;
+			return R.failed("身份证不可为空！");
 		}
-		return tSalaryAccountService.allYearExport(tSalaryAccount);
+		return R.ok(tSalaryAccountService.allYearExport(tSalaryAccount));
 	}
 	
 }

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

@@ -199,9 +199,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 						if (Common.isEmpty(res.getIssueId())) {
 							return R.failed("代发户配置id不可为空");
 						}
-						if (Common.isEmpty(res.getMoney())) {
-							return R.failed("代发户金额不可为空");
-						}
 						if (Common.isEmpty(res.getBankName())) {
 							return R.failed("代发户开户行不可为空");
 						}

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

@@ -541,7 +541,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 						fd3b71f20933e0d2.add("");
 					}
 					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_3b71f20883301a", fd3b71f20883301a);