diff --git a/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java b/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java index 86a9cfa0bfb362d8ceb2ec80d536b13047502de5..6071fa339f1ef206796dcd7f593f1f4fa5d17ef4 100644 --- a/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java +++ b/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java @@ -1295,10 +1295,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap tInsuranceSettleService.save(settle); detail.setDefaultSettleId(settle.getId()); successList.add(detail); - if (detail.getBuyType() != CommonConstants.FOUR_INT) { - //生æˆæ”¶å…¥æ•°æ® - createInsuranceInfo(detail); - } + //生æˆæ”¶å…¥æ•°æ® + createInsuranceInfo(detail); }else { //按天 //计算起æ¢æ—¶é—´çš„天数 @@ -1331,10 +1329,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap tInsuranceSettleService.save(settle); detail.setDefaultSettleId(settle.getId()); successList.add(detail); - if (detail.getBuyType() != CommonConstants.FOUR_INT) { - //生æˆæ”¶å…¥æ•°æ® - createInsuranceInfo(detail); - } + //生æˆæ”¶å…¥æ•°æ® + createInsuranceInfo(detail); } } //实缴 @@ -6119,9 +6115,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap BigDecimal sumMoney = BigDecimal.ZERO; for (TIncomeDetail income : incomeDetailList) { sumMoney = BigDecimalUtils.safeAdd(income.getMoney(), sumMoney); - if (sumMoney.compareTo(BigDecimal.ZERO) > 0) { - isExist = true; - } + } + if (sumMoney.compareTo(BigDecimal.ZERO) > 0) { + isExist = true; } } diff --git a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java index 8793290855c093ba2481888f2ccaf90175eea557..86ad1aac0142caafeaccb59b2769f38d5bc13439 100644 --- a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java +++ b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java @@ -185,7 +185,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc List<THaveSalaryNoSocialExportVo> list = new ArrayList<>(); // TODO List<String> settleDomainIds =null; - List<String> ids = null; + List<String> ids = Common.getList(searchVo.getIds()); String sql = null; int count = noPageCountDiy(searchVo,settleDomainIds,ids,sql); ServletOutputStream out = null; diff --git a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java index 7a1e684941f8cc2c4a294560a307d071939cc7c7..26f0b0875563e656713536799bcaf753cb310a52 100644 --- a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java +++ b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; +import com.yifu.cloud.plus.v1.yifu.common.core.util.BigDecimalUtils; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil; @@ -95,6 +96,10 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, if (Common.isNotNull(list)) { ExcelUtil<TSalaryAccount> util = new ExcelUtil<>(TSalaryAccount.class); for (TSalaryAccount vo : list) { + if (CommonConstants.THREE_STRING.equals(vo.getFormType())){ + vo.setRelaySalary(vo.getRelaySalaryUnit()); + vo.setSalaryTax(BigDecimalUtils.safeAdd(vo.getSalaryTax(),vo.getSalaryTaxUnit())); + } util.convertEntity(vo, null, null, null); } } diff --git a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java index 2cafe8a1a5d234e3780e0e636473537b1e5d1860..1adb9bf7bf624e56d19fe1844e50c2636ad7ee78 100644 --- a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java +++ b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java @@ -317,6 +317,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap , fundHistoryMap, socialPushMap, fundPushMap, saveLibraryMap, isReduceSocial, isReduceFund, false); if (coreR != null) return coreR; boolean isSaveAndUpdate = false; + + TSocialFundInfo socialFundInfo; + TSocialFundInfo socialFundInfoF; + + List<TForecastLibrary> libraryFundInfoListSocial = new ArrayList<>(); + List<TForecastLibrary> libraryFundInfoListFund = new ArrayList<>(); + for (TForecastLibrary library : saveLibraryMap.values()) { if (Common.isEmpty(library.getSocialId()) && Common.isEmpty(library.getProvidentId())) { continue; @@ -333,31 +340,41 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap } } //生æˆç¤¾ä¿æ”¶å…¥ - TSocialFundInfo socialFundInfo = socialFundInfoMapper.selectOne(Wrappers.<TSocialFundInfo>query().lambda() - .eq(TSocialFundInfo::getEmpIdcard, empIdCard) - .eq(TSocialFundInfo::getSettleDomain, library.getSettleDomainId()) - .eq(TSocialFundInfo::getSocialHousehold, library.getSocialHousehold())); - if (Common.isNotNull(socialFundInfo)) { - if (Common.isNotNull(socialFundInfo.getSocialId()) - && CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus()) - || CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) { - //办ç†æˆåŠŸç”Ÿæˆæ”¶å…¥ - createIncomeInfo(library); + socialFundInfo = socialFundInfoMapper.selectOne(Wrappers.<TSocialFundInfo>query().lambda() + .eq(TSocialFundInfo::getEmpIdcard, empIdCard) + .eq(TSocialFundInfo::getSettleDomain, library.getSettleDomainId()) + .eq(TSocialFundInfo::getSocialHousehold, library.getSocialHousehold())); + if (Common.isNotNull(socialFundInfo) && Common.isNotNull(socialFundInfo.getSocialId()) + && CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus()) + || CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) { + //办ç†æˆåŠŸç”Ÿæˆæ”¶å…¥ + createIncomeInfo(library); + if (CommonConstants.ZERO_INT == library.getDataPush()) { + libraryFundInfoListSocial.add(library); } } //生æˆå…¬ç§¯é‡‘收入 - TSocialFundInfo socialFundInfoF = socialFundInfoMapper.selectOne(Wrappers.<TSocialFundInfo>query().lambda() + socialFundInfoF = socialFundInfoMapper.selectOne(Wrappers.<TSocialFundInfo>query().lambda() .eq(TSocialFundInfo::getEmpIdcard, empIdCard) .eq(TSocialFundInfo::getSettleDomain, library.getSettleDomainId()) .eq(TSocialFundInfo::getProvidentHousehold, library.getProvidentHousehold())); - if (Common.isNotNull(socialFundInfoF)) { - if (Common.isNotNull(socialFundInfoF.getFundId()) - && CommonConstants.THREE_STRING.equals(socialFundInfoF.getFundStatus())) { - //办ç†æˆåŠŸç”Ÿæˆæ”¶å…¥ - createIncomeInfo(library); + if (Common.isNotNull(socialFundInfoF) && Common.isNotNull(socialFundInfoF.getFundId()) + && CommonConstants.THREE_STRING.equals(socialFundInfoF.getFundStatus())) { + //办ç†æˆåŠŸç”Ÿæˆæ”¶å…¥ + createIncomeInfo(library); + if (CommonConstants.ZERO_INT == library.getDataPush()) { + libraryFundInfoListFund.add(library); } } } + //推é€ç¤¾ä¿æ˜Žç»† + if (Common.isNotNull(libraryFundInfoListSocial)) { + pushForecastInfo(libraryFundInfoListSocial); + } + //推é€å…¬ç§¯é‡‘明细 + if (Common.isNotNull(libraryFundInfoListFund)) { + pushForecastFundInfo(libraryFundInfoListFund); + } if (isSaveAndUpdate) { return R.ok(null, "执行æˆåŠŸï¼"); } else { @@ -1498,6 +1515,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap @Override public R<String> updateForecastLibaryByDispatchReduce(TSocialFundInfo socialFundInfo, int forecastFlag) { String empIdCard = socialFundInfo.getEmpIdcard(); + List<TForecastLibrary> libraryFundInfoListSocial = new ArrayList<>(); + List<TForecastLibrary> libraryFundInfoListFund = new ArrayList<>(); if (Common.isNotNull(empIdCard)) { Date minStartDate = this.getMinSocialDate(socialFundInfo); BigDecimal zero = BigDecimal.ZERO; @@ -1514,11 +1533,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap if (socialReduceDate != null) { // å˜åœ¨ç¤¾ä¿æ´¾å‡ä¸”处于派å‡æœŸé—´å†…ï¼Œæœªè¢«é¢„ä¼°ç»“ç®—ï¼Œå·¥èµ„ç»“ç®—å¼•ç”¨åˆ™æ¸…ç©ºç›¸å…³æ•°æ® if (DateUtil.formatDateInt(socialReduceDate) <= Integer.parseInt(library.getSocialPayMonth())) { - this.calculateSocialType(zero, library); + this.calculateSocialType(zero, library, libraryFundInfoListSocial); } } else { if (DateUtil.formatDateInt(minStartDate) <= Integer.parseInt(library.getSocialPayMonth())) { - this.calculateSocialType(zero, library); + this.calculateSocialType(zero, library, libraryFundInfoListSocial); } } } @@ -1539,22 +1558,30 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap if (fundReduceDate != null) { // å˜åœ¨ç¤¾ä¿æ´¾å‡ä¸”处于派å‡æœŸé—´å†…ï¼Œæœªè¢«é¢„ä¼°ç»“ç®—ï¼Œå·¥èµ„ç»“ç®—å¼•ç”¨åˆ™æ¸…ç©ºç›¸å…³æ•°æ® if (DateUtil.formatDateInt(fundReduceDate) <= Integer.parseInt(library.getProvidentPayMonth())) { - this.calculateFundType(zero, library); + this.calculateFundType(zero, library,libraryFundInfoListFund); } } else { if (DateUtil.formatDateInt(minStartDate) <= Integer.parseInt(library.getProvidentPayMonth())) { - this.calculateFundType(zero, library); + this.calculateFundType(zero, library,libraryFundInfoListFund); } } } } } } + //推é€ç¤¾ä¿æ˜Žç»† + if (Common.isNotNull(libraryFundInfoListSocial)) { + pushForecastInfo(libraryFundInfoListSocial); + } + //推é€å…¬ç§¯é‡‘明细 + if (Common.isNotNull(libraryFundInfoListFund)) { + pushForecastFundInfo(libraryFundInfoListFund); + } } return R.ok(); } - private void calculateSocialType(BigDecimal zero, TForecastLibrary library) { + private void calculateSocialType(BigDecimal zero, TForecastLibrary library,List<TForecastLibrary> libraryFundInfoListSocial) { if (library.getDataPush() == CommonConstants.ONE_INT || CommonConstants.ONE_STRING.equals(library.getSalarySocialFlag())) { // åŠ è´Ÿæ•° TForecastLibrary negateLib = new TForecastLibrary(); @@ -1580,6 +1607,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap negateLib.setSumAll(BigDecimalUtils.safeSubtract(false, zero, library.getSumAll())); negateLib.setDiffType(SocialConstants.DIFF_TYPE_TWO); baseMapper.insert(negateLib); + libraryFundInfoListSocial.add(negateLib); } else { // åˆ é™¤ baseMapper.deleteById(library.getId()); @@ -1603,7 +1631,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap } } - private void calculateFundType(BigDecimal zero, TForecastLibrary library) { + private void calculateFundType(BigDecimal zero, TForecastLibrary library, List<TForecastLibrary> libraryFundInfoListFund) { if (library.getDataPush() == CommonConstants.ONE_INT || CommonConstants.ONE_STRING.equals(library.getSalaryFundFlag())) { // åŠ è´Ÿæ•° TForecastLibrary negateLib = new TForecastLibrary(); @@ -1617,7 +1645,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap negateLib.setPersonalFundSum(BigDecimalUtils.safeSubtract(false, zero, library.getPersonalFundSum())); negateLib.setSumAll(BigDecimalUtils.safeSubtract(false, zero, library.getSumAll())); negateLib.setDiffType(SocialConstants.DIFF_TYPE_TWO); - baseMapper.insert(negateLib); + libraryFundInfoListFund.add(negateLib); } else { // åˆ é™¤ baseMapper.deleteById(library.getId()); @@ -2192,13 +2220,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap isSaveAndUpdate = true; } + List<TForecastLibrary> libraryFundInfoListSocial = new ArrayList<>(); + List<TForecastLibrary> libraryFundInfoListFund = new ArrayList<>(); //社ä¿æ”¶å…¥ if (Common.isNotNull(socialFundInfo.getSocialId()) && CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus()) || CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) { //获å–æ‰€æœ‰çš„é¢„ä¼°æ•°æ® - List<TForecastLibrary> librarySocialInfoList = null; + List<TForecastLibrary> librarySocialInfoList; librarySocialInfoList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda() .eq(TForecastLibrary::getEmpIdcard, empIdCard) .eq(TForecastLibrary::getSettleDomainId, socialFundInfo.getSettleDomain()) @@ -2208,6 +2238,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap for (TForecastLibrary library : librarySocialInfoList) { //办ç†æˆåŠŸç”Ÿæˆæ”¶å…¥ createIncomeInfo(library); + if (CommonConstants.ZERO_INT == library.getDataPush()) { + libraryFundInfoListSocial.add(library); + } } } } @@ -2217,7 +2250,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap && CommonConstants.THREE_STRING.equals(socialFundInfo.getFundStatus())) { //获å–æ‰€æœ‰çš„é¢„ä¼°æ•°æ® - List<TForecastLibrary> libraryFundInfoList = null; + List<TForecastLibrary> libraryFundInfoList; libraryFundInfoList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda() .eq(TForecastLibrary::getEmpIdcard, empIdCard) .eq(TForecastLibrary::getSettleDomainId, socialFundInfo.getSettleDomain()) @@ -2227,9 +2260,20 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap for (TForecastLibrary library : libraryFundInfoList) { //办ç†æˆåŠŸç”Ÿæˆæ”¶å…¥ createIncomeInfo(library); + if (CommonConstants.ZERO_INT == library.getDataPush()) { + libraryFundInfoListFund.add(library); + } } } } + //推é€ç¤¾ä¿æ˜Žç»† + if (Common.isNotNull(libraryFundInfoListSocial)) { + pushForecastInfo(libraryFundInfoListSocial); + } + //推é€å…¬ç§¯é‡‘明细 + if (Common.isNotNull(libraryFundInfoListFund)) { + pushForecastFundInfo(libraryFundInfoListFund); + } if (isSaveAndUpdate) { return R.ok(null, "执行æˆåŠŸï¼"); } else {