Merge remote-tracking branch 'origin/develop' into develop

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);
@@ -594,9 +594,15 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 						standardParam.setFd_3b3d3ec85bfeb0(s.getSalaryMonth().substring(0,4)
 								+ CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4,6));
 						// 推送主表信息
-						sendBack = ekpSalaryUtil.sendStandardToEKP(s.getCreateName(), standardParam);
+						String loginName;
+						if (user != null) {
+							loginName = user.getUsername();
+						} else {
+							loginName = s.getCreateName();
+						}
+						sendBack = ekpSalaryUtil.sendStandardToEKP(loginName, standardParam);
 						if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
-							sendBack = ekpSalaryUtil.sendStandardToEKP(s.getCreateName(), standardParam);
+							sendBack = ekpSalaryUtil.sendStandardToEKP(loginName, standardParam);
 						}
 						s.setSendTime(new Date());
 						s.setSendMonth(nowMonth);
@@ -789,7 +795,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 +883,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);
@@ -901,9 +907,16 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				param.setFd_3b3c293745e7b4(ss.getDeptName());
 				param.setFd_3b3c2935c13056(ss.getDeptNo());
 				param.setFd_3b3c293811c0ee(ss.getApplyNo());
-				String sendBack = ekpSalaryUtil.backStandardToEKP(ss.getCreateName(), param);
+				YifuUser user = SecurityUtils.getUser();
+				String loginName;
+				if (user != null) {
+					loginName = user.getUsername();
+				} else {
+					loginName = ss.getCreateName();
+				}
+				String sendBack = ekpSalaryUtil.backStandardToEKP(loginName, param);
 				if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
-					sendBack = ekpSalaryUtil.backStandardToEKP(ss.getCreateName(), param);
+					sendBack = ekpSalaryUtil.backStandardToEKP(loginName, param);
 				}
 				if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
 					// 更新薪资为确认不通过
@@ -921,6 +934,10 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 					HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
 							, "/tincome/inner/deleteIncomeAndDetailByApplyNo", income
 							, Object.class, SecurityConstants.FROM_IN);
+					// 添加流程进展明细
+					if (user != null) {
+						this.saveRecordLog(ss, user, CommonConstants.ZERO_STRING, "从EKP退表");
+					}
 					return R.ok();
 				} else {
 					TSendEkpError error = new TSendEkpError();
@@ -929,7 +946,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无结果返回";
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -388,12 +388,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			}
 		}
 		if (Common.isNotNull(socialCreateMonth)) {
-			wrapper.eq(TPaymentInfo::getSocialCreateMonth, socialCreateMonth).or()
-					.eq(TPaymentInfo::getProvidentCreateMonth, socialCreateMonth);
+			wrapper.and(wrapper2 -> wrapper2.eq(TPaymentInfo::getSocialCreateMonth, socialCreateMonth)
+					.or(wrapper1 -> wrapper1.eq(TPaymentInfo::getProvidentCreateMonth, socialCreateMonth)
+					));
 		}
 		if (Common.isNotNull(socialPayMonth)) {
-			wrapper.eq(TPaymentInfo::getSocialPayMonth, socialPayMonth).or()
-					.eq(TPaymentInfo::getProvidentPayMonth, socialPayMonth);
+			wrapper.and(wrapper2 -> wrapper2.eq(TPaymentInfo::getSocialPayMonth, socialPayMonth)
+					.or(wrapper1 -> wrapper1.eq(TPaymentInfo::getProvidentPayMonth, socialPayMonth)
+					));
 		}
 		return wrapper;
 	}