Skip to content

Y
yifu-mvp
Commit 8bd8ec97 authored by hongguangwu's avatar hongguangwu
Browse files
Options

优化收入

parent 77e67a0b
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/SocialConstants.java
View file @ 8bd8ec97
...@@ -19,5 +19,6 @@ public class SocialConstants { ...@@ -19,5 +19,6 @@ public class SocialConstants {
public static final String BIR = "生育"; public static final String BIR = "生育";
public static final String GS = "工伤"; public static final String GS = "工伤";
public static final String YB = "医保"; public static final String YB = "医保";
public static final String YEAR_1970 = "1970-02";
} }
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
View file @ 8bd8ec97
...@@ -33,6 +33,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*; ...@@ -33,6 +33,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpIncomeUtil; import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpIncomeUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk;
import com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome; import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail; import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSendEkpError; import com.yifu.cloud.plus.v1.yifu.social.entity.TSendEkpError;
...@@ -430,14 +431,14 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl ...@@ -430,14 +431,14 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
sendParam.setFd_3adfef94dcdbb4(income.getEmpIdcard()); sendParam.setFd_3adfef94dcdbb4(income.getEmpIdcard());
// 生成月份 // 生成月份
if (Common.isEmpty(income.getCreateMonth()) || income.getCreateMonth().length() != 6) { if (Common.isEmpty(income.getCreateMonth()) || income.getCreateMonth().length() != 6) {
sendParam.setFd_3ae0c23b2e9a92("1970-02"); sendParam.setFd_3ae0c23b2e9a92(SocialConstants.YEAR_1970);
} else { } else {
sendParam.setFd_3ae0c23b2e9a92(income.getCreateMonth().substring(0, 4) sendParam.setFd_3ae0c23b2e9a92(income.getCreateMonth().substring(0, 4)
+ CommonConstants.CENTER_SPLIT_LINE_STRING + income.getCreateMonth().substring(4, 6)); + CommonConstants.CENTER_SPLIT_LINE_STRING + income.getCreateMonth().substring(4, 6));
} }
// 结算月份 // 结算月份
if (Common.isEmpty(income.getPayMonth()) || income.getPayMonth().length() != 6) { if (Common.isEmpty(income.getPayMonth()) || income.getPayMonth().length() != 6) {
sendParam.setFd_3ae0c23cb3fccc("1970-02"); sendParam.setFd_3ae0c23cb3fccc(SocialConstants.YEAR_1970);
} else { } else {
sendParam.setFd_3ae0c23cb3fccc(income.getPayMonth().substring(0, 4) sendParam.setFd_3ae0c23cb3fccc(income.getPayMonth().substring(0, 4)
+ CommonConstants.CENTER_SPLIT_LINE_STRING + income.getPayMonth().substring(4, 6)); + CommonConstants.CENTER_SPLIT_LINE_STRING + income.getPayMonth().substring(4, 6));
...@@ -491,14 +492,14 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl ...@@ -491,14 +492,14 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
sendParam.setFd_3adfef94dcdbb4(income.getEmpIdcard()); sendParam.setFd_3adfef94dcdbb4(income.getEmpIdcard());
// 生成月份 // 生成月份
if (Common.isEmpty(income.getCreateMonth()) || income.getCreateMonth().length() != 6) { if (Common.isEmpty(income.getCreateMonth()) || income.getCreateMonth().length() != 6) {
sendParam.setFd_3ae0c3032cffc8("1970-02"); sendParam.setFd_3ae0c3032cffc8(SocialConstants.YEAR_1970);
} else { } else {
sendParam.setFd_3ae0c3032cffc8(income.getCreateMonth().substring(0, 4) sendParam.setFd_3ae0c3032cffc8(income.getCreateMonth().substring(0, 4)
+ CommonConstants.CENTER_SPLIT_LINE_STRING + income.getCreateMonth().substring(4, 6)); + CommonConstants.CENTER_SPLIT_LINE_STRING + income.getCreateMonth().substring(4, 6));
} }
// 结算月份 // 结算月份
if (Common.isEmpty(income.getPayMonth()) || income.getPayMonth().length() != 6) { if (Common.isEmpty(income.getPayMonth()) || income.getPayMonth().length() != 6) {
sendParam.setFd_3ae0c3044e5958("1970-02"); sendParam.setFd_3ae0c3044e5958(SocialConstants.YEAR_1970);
} else { } else {
sendParam.setFd_3ae0c3044e5958(income.getPayMonth().substring(0, 4) sendParam.setFd_3ae0c3044e5958(income.getPayMonth().substring(0, 4)
+ CommonConstants.CENTER_SPLIT_LINE_STRING + income.getPayMonth().substring(4, 6)); + CommonConstants.CENTER_SPLIT_LINE_STRING + income.getPayMonth().substring(4, 6));
......
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