Commit 6401005c authored by 李灿灿's avatar 李灿灿

Merge branch 'develop' into feature-licancan

parents 770b6306 9a999af7
...@@ -464,12 +464,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -464,12 +464,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if (null == lib) { if (null == lib) {
lib = new TForecastLibrary(); lib = new TForecastLibrary();
} }
lib.setSocialHousehold(tSocialInfo.getSocialHousehold());
lib.setSocialHouseholdName(tSocialInfo.getSocialHouseholdName());
lib.setDiffType(diffType); lib.setDiffType(diffType);
lib.setDataType(CommonConstants.ZERO_INT); lib.setDataType(CommonConstants.ZERO_INT);
lib.setEmpId(tSocialInfo.getEmpId()); lib.setEmpId(tSocialInfo.getEmpId());
lib.setEmpIdcard(tSocialInfo.getEmpIdcard()); lib.setEmpIdcard(tSocialInfo.getEmpIdcard());
lib.setEmpName(tSocialInfo.getEmpName()); lib.setEmpName(tSocialInfo.getEmpName());
lib.setEmpNo(tSocialInfo.getEmpNo()); lib.setEmpNo(tSocialInfo.getEmpNo());
lib.setEmpNatrue(tSocialInfo.getEmpType());
lib.setSocialCreateMonth(ServiceUtil.initCreateMonth(tSocialInfo.getCreateTime(), payMonth)); lib.setSocialCreateMonth(ServiceUtil.initCreateMonth(tSocialInfo.getCreateTime(), payMonth));
lib.setProvidentCreateMonth(lib.getSocialCreateMonth()); lib.setProvidentCreateMonth(lib.getSocialCreateMonth());
lib.setSocialPayMonth(payMonth); lib.setSocialPayMonth(payMonth);
...@@ -1253,12 +1256,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1253,12 +1256,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if (lib == null) { if (lib == null) {
lib = new TForecastLibrary(); lib = new TForecastLibrary();
} }
lib.setProvidentHousehold(providentFund.getProvidentHousehold());
lib.setProvidentHouseholdName(providentFund.getProvidentHouseholdName());
lib.setDiffType(diffType); lib.setDiffType(diffType);
lib.setDataType(CommonConstants.ONE_INT); lib.setDataType(CommonConstants.ONE_INT);
lib.setEmpId(providentFund.getEmpId()); lib.setEmpId(providentFund.getEmpId());
lib.setEmpIdcard(providentFund.getEmpIdcard()); lib.setEmpIdcard(providentFund.getEmpIdcard());
lib.setEmpName(providentFund.getEmpName()); lib.setEmpName(providentFund.getEmpName());
lib.setEmpNo(providentFund.getEmpNo()); lib.setEmpNo(providentFund.getEmpNo());
lib.setEmpNatrue(providentFund.getEmpType());
lib.setProvidentCreateMonth(ServiceUtil.initCreateMonth(providentFund.getCreateTime(), payMonth)); lib.setProvidentCreateMonth(ServiceUtil.initCreateMonth(providentFund.getCreateTime(), payMonth));
lib.setSocialCreateMonth(lib.getProvidentCreateMonth()); lib.setSocialCreateMonth(lib.getProvidentCreateMonth());
//同时处理社保日期 //同时处理社保日期
......
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