优化查询条件

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

@@ -57,6 +57,12 @@ public class TSalaryStandardExportVo implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("项目编码")
 	private String deptNo;
+
+	@ExcelAttribute(name = "申请编码", maxLength = 32)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("申请编码")
+	private String applyNo;
+
 	/**
 	 * 项目金额
 	 */

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

@@ -575,7 +575,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 							error.setType(CommonConstants.ONE_STRING);
 							error.setCreateUserName(s.getCreateName());
 							error.setLinkId(account.getId());
-							error.setTitle(sendBack);
+							error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
 							error.setNums(CommonConstants.ONE_INT);
 							HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
 									, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
@@ -789,7 +789,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			error.setType(CommonConstants.ZERO_STRING);
 			error.setCreateUserName(s.getCreateName());
 			error.setLinkId(account.getFd_3b10af838eab5c());
-			error.setTitle(sendBack);
+			error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
 			error.setNums(CommonConstants.ONE_INT);
 			HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
 					, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
@@ -877,7 +877,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			error.setType(CommonConstants.ZERO_STRING);
 			error.setCreateUserName(s.getCreateName());
 			error.setLinkId(account.getFd_3b10af838eab5c());
-			error.setTitle(sendBack);
+			error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
 			error.setNums(CommonConstants.ONE_INT);
 			HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
 					, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
@@ -921,6 +921,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 					HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
 							, "/tincome/inner/deleteIncomeAndDetailByApplyNo", income
 							, Object.class, SecurityConstants.FROM_IN);
+					// 添加流程进展明细
+					YifuUser user = SecurityUtils.getUser();
+					if (user != null) {
+						this.saveRecordLog(ss, user, CommonConstants.ZERO_STRING, "从EKP退表");
+					}
 					return R.ok();
 				} else {
 					TSendEkpError error = new TSendEkpError();
@@ -929,7 +934,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 					error.setType(CommonConstants.SEVEN_STRING);
 					error.setCreateUserName(ss.getCreateName());
 					error.setLinkId(ss.getId());
-					error.setTitle(sendBack);
+					error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
 					error.setNums(CommonConstants.ONE_INT);
 					HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
 							, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java

@@ -174,4 +174,5 @@ public class SalaryConstants {
 	public static final String PROVINCE_ERROR = "开户行省错误！";
 	public static final String CITY_ERROR = "开户行市错误！";
 	public static final String CUR_TAX_INFO = "当前项目薪酬人员已维护计税月份，计税月份沿用系统原值，其他字段已更新！";
+	public static final String EKP_NO_RETURN = "推送EKP无结果返回";
 }