Skip to content

Y
yifu-mvp
Commit 8e490f2f authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/fxj-dev' into fxj-dev

parents d9098b57 a3c30738
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1281 additions and 159 deletions
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/EkpDaprUtils.java
View file @ 8e490f2f
...@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R; ...@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprEkpProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprEkpProperties;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushFundParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushFundParam;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
...@@ -47,4 +48,15 @@ public class EkpDaprUtils { ...@@ -47,4 +48,15 @@ public class EkpDaprUtils {
public R<EkpSocialPushInfoVo> pushFundInfoToEkp(List<EkpPushFundParam> unPushList) { public R<EkpSocialPushInfoVo> pushFundInfoToEkp(List<EkpPushFundParam> unPushList) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpFundPush/inner/pushFundInfoToEkp", JSON.toJSONString(unPushList), EkpSocialPushInfoVo.class, SecurityConstants.FROM_IN); return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpFundPush/inner/pushFundInfoToEkp", JSON.toJSONString(unPushList), EkpSocialPushInfoVo.class, SecurityConstants.FROM_IN);
} }
/**
* @Author huyc
* @Description 新增工资明细数据
* @Date 10:23 2024/03/11
* @Param
* @return
**/
public R<Boolean> pushSalaryInfoToEkp(List<EkpSalaryParam> unPushList) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpSalaryPush/inner/pushSalaryInfoToEkp", JSON.toJSONString(unPushList), Boolean.class, SecurityConstants.FROM_IN);
}
} }
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/TEkpSalaryInfoController.java 0 → 100644
View file @ 8e490f2f
package com.yifu.cloud.plus.v1.ekp.controller;
import com.yifu.cloud.plus.v1.ekp.service.EkpSalaryInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 工资明细推送
* @author huyc
* @date 2024-03-11 10:04:12
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/ekpSalaryPush" )
@Tag(name = "工资明细推送")
public class TEkpSalaryInfoController {
private final EkpSalaryInfoService salaryInfoService;
/**
* @param unPushList
* @Description: 推送工资明细数据
* @Author: huyc
* @Date: 2024/2/29
* @return:
**/
@Inner
@PostMapping("/inner/pushSalaryInfoToEkp")
public Boolean pushSalaryInfoToEkp(@RequestBody List<EkpSalaryParam> unPushList) {
return salaryInfoService.pushSalaryInfoToEkp(unPushList);
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpSalaryInfoMapper.java 0 → 100644
View file @ 8e490f2f
package com.yifu.cloud.plus.v1.ekp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSalaryInfo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 工资明细表
*
* @author huyc
* @date 2024-03-11 11:21:56
*/
@Mapper
public interface EkpSalaryInfoMapper extends BaseMapper<EkpSalaryInfo> {
/**
* 获取所有项目信息
* @param
* @return
*/
List<EkpDeptInfoVo> getAllEkpDeptInfo();
/**
* 根据身份证和生成月份获取费用合计
* @param
* @return
*/
EkpSocialSumInfoVo getCostSumInfo(@Param("card") String empIdCard, @Param("month") String createMonth);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpSalaryInfoService.java 0 → 100644
View file @ 8e490f2f
package com.yifu.cloud.plus.v1.ekp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSalaryInfo;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 工资明细表
*
* @author huyc
* @date 2024-03-11 11:21:56
*/
public interface EkpSalaryInfoService extends IService<EkpSalaryInfo> {
@Transactional
@ShardingTransactionType(TransactionType.BASE)
Boolean pushSalaryInfoToEkp(List<EkpSalaryParam> unPushList);
}
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSalaryInfoMapper.xml 0 → 100644
View file @ 8e490f2f
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.ekp.mapper.EkpSalaryInfoMapper">
<resultMap id="ekpSalaryInfoMap" type="com.yifu.cloud.plus.v1.ekp.entity.EkpSalaryInfo">
<id property="fd_id" column="fd_id"/>
<result property="fd_3adfedf98ccba2" column="fd_3adfedf98ccba2"/>
<result property="fd_3adfedf9d2bf1c" column="fd_3adfedf9d2bf1c"/>
<result property="fd_3adfedfa4410aa" column="fd_3adfedfa4410aa"/>
<result property="fd_3adfedfacd65d6" column="fd_3adfedfacd65d6"/>
<result property="fd_3adfedfb174068" column="fd_3adfedfb174068"/>
<result property="fd_3adfedfb5a68a2" column="fd_3adfedfb5a68a2"/>
<result property="fd_3adfedfb8f76d4" column="fd_3adfedfb8f76d4"/>
<result property="fd_3adfedfbd23ab8" column="fd_3adfedfbd23ab8"/>
<result property="fd_3adfedfcb17f1e" column="fd_3adfedfcb17f1e"/>
<result property="fd_3adfedfc453cc4" column="fd_3adfedfc453cc4"/>
<result property="fd_3adfee063acff0" column="fd_3adfee063acff0"/>
<result property="fd_3adfee0690737c" column="fd_3adfee0690737c"/>
<result property="fd_3adfee01668666" column="fd_3adfee01668666"/>
<result property="fd_3adfedfed8bb28" column="fd_3adfedfed8bb28"/>
<result property="fd_3adfedff3a7430" column="fd_3adfedff3a7430"/>
<result property="fd_3adfee0009d070" column="fd_3adfee0009d070"/>
<result property="fd_3adfee01dea2fa" column="fd_3adfee01dea2fa"/>
<result property="fd_3adfee12cb8840" column="fd_3adfee12cb8840"/>
<result property="fd_3adfee1374ed7a" column="fd_3adfee1374ed7a"/>
<result property="fd_3adfee1e2b2f78" column="fd_3adfee1e2b2f78"/>
<result property="fd_3adfee1e88723e" column="fd_3adfee1e88723e"/>
<result property="fd_3adfee1ee24680" column="fd_3adfee1ee24680"/>
<result property="fd_3adfee1f32fa24" column="fd_3adfee1f32fa24"/>
<result property="fd_3adfee1f901c46" column="fd_3adfee1f901c46"/>
<result property="fd_3adfee1ff1ca6a" column="fd_3adfee1ff1ca6a"/>
<result property="fd_3adfee203f86b2" column="fd_3adfee203f86b2"/>
<result property="fd_3adfee20fe5ba4" column="fd_3adfee20fe5ba4"/>
<result property="fd_3adfee21802434" column="fd_3adfee21802434"/>
<result property="fd_3adfee4ba5ad36" column="fd_3adfee4ba5ad36"/>
<result property="fd_3adfee4c0c59ee" column="fd_3adfee4c0c59ee"/>
<result property="fd_3adfee5dd14866" column="fd_3adfee5dd14866"/>
<result property="fd_3adfee5e3d1638" column="fd_3adfee5e3d1638"/>
<result property="fd_3adfeeb34ea0ea" column="fd_3adfeeb34ea0ea"/>
<result property="fd_3adfeededfb5a6" column="fd_3adfeededfb5a6"/>
<result property="fd_3adfeed3a20598" column="fd_3adfeed3a20598"/>
<result property="fd_3adfeec6db8766" column="fd_3adfeec6db8766"/>
<result property="fd_3adfeef8ef38fc" column="fd_3adfeef8ef38fc"/>
<result property="fd_3adfeedd08222c" column="fd_3adfeedd08222c"/>
<result property="fd_3adfeec730ec44" column="fd_3adfeec730ec44"/>
<result property="fd_3adfeef9440ab2" column="fd_3adfeef9440ab2"/>
<result property="fd_3adfeedd5f3cb2" column="fd_3adfeedd5f3cb2"/>
<result property="fd_3adfeec782070a" column="fd_3adfeec782070a"/>
<result property="fd_3adfeef9b9fb3e" column="fd_3adfeef9b9fb3e"/>
<result property="fd_3adfeeddacf6d4" column="fd_3adfeeddacf6d4"/>
<result property="fd_3adfeec7ccdd1c" column="fd_3adfeec7ccdd1c"/>
<result property="fd_3adfeefa1eba32" column="fd_3adfeefa1eba32"/>
<result property="fd_3adfeede08d430" column="fd_3adfeede08d430"/>
<result property="fd_3aea309696d32e" column="fd_3aea309696d32e"/>
<result property="fd_3aea30866d0c30" column="fd_3aea30866d0c30"/>
<result property="fd_3aeadf182ef6a2" column="fd_3aeadf182ef6a2"/>
<result property="fd_3aeadf1992544c" column="fd_3aeadf1992544c"/>
<result property="fd_3aeadf17522642" column="fd_3aeadf17522642"/>
<result property="fd_3aeadf191c62a0" column="fd_3aeadf191c62a0"/>
<result property="fd_3aeadede4cea84" column="fd_3aeadede4cea84"/>
<result property="fd_3aeadee1cf1266" column="fd_3aeadee1cf1266"/>
<result property="fd_3aeadf1892fdb2" column="fd_3aeadf1892fdb2"/>
<result property="fd_3aeadf17b7d03a" column="fd_3aeadf17b7d03a"/>
<result property="fd_3af9d5874f8166" column="fd_3af9d5874f8166"/>
<result property="fd_3afaa69ad4d16a" column="fd_3afaa69ad4d16a"/>
<result property="fd_3afab16f356672" column="fd_3afab16f356672"/>
<result property="fd_3b10afe8c70742" column="fd_3b10afe8c70742"/>
<result property="fd_3b13b1b91f5b34" column="fd_3b13b1b91f5b34"/>
<result property="fd_3b13b1d1ff9678" column="fd_3b13b1d1ff9678"/>
<result property="fd_3b16cecc2bbd16" column="fd_3b16cecc2bbd16"/>
<result property="fd_3b16cecd47a856" column="fd_3b16cecd47a856"/>
<result property="fd_3b16e418905f52" column="fd_3b16e418905f52"/>
<result property="fd_3b16e418905f52_text" column="fd_3b16e418905f52_text"/>
<result property="fd_3b178f3e24cc32" column="fd_3b178f3e24cc32"/>
<result property="fd_3b3beee3ec7e12" column="fd_3b3beee3ec7e12"/>
<result property="fd_3b73c214e52982" column="fd_3b73c214e52982"/>
<result property="fd_3b84d6a6c7b8f0" column="fd_3b84d6a6c7b8f0"/>
<result property="fd_3b9893328ffb46" column="fd_3b9893328ffb46"/>
<result property="fd_3bbc0711464020" column="fd_3bbc0711464020"/>
<result property="fd_3bcd2e63600446" column="fd_3bcd2e63600446"/>
<result property="fd_3bcd2e64868de6" column="fd_3bcd2e64868de6"/>
<result property="fd_3bcd2e6259fdbe" column="fd_3bcd2e6259fdbe"/>
<result property="fd_3bcd2f1a073260" column="fd_3bcd2f1a073260"/>
<result property="fd_3bcd2f180f2a8c" column="fd_3bcd2f180f2a8c"/>
<result property="fd_3bcd3102f612ea" column="fd_3bcd3102f612ea"/>
<result property="fd_3bcd2ef618ee54" column="fd_3bcd2ef618ee54"/>
<result property="fd_3bcd3119a295be" column="fd_3bcd3119a295be"/>
<result property="fd_3bcdeed22ec8dc" column="fd_3bcdeed22ec8dc"/>
<result property="fd_3bcd34a8c296c8" column="fd_3bcd34a8c296c8"/>
<result property="fd_3bcd2ef8728fe0" column="fd_3bcd2ef8728fe0"/>
<result property="fd_3bcd2f18fd1840" column="fd_3bcd2f18fd1840"/>
<result property="fd_3bcd3100f45ca2" column="fd_3bcd3100f45ca2"/>
<result property="fd_3bcd2ef727ac6a" column="fd_3bcd2ef727ac6a"/>
<result property="fd_3bcd3101d95dd8" column="fd_3bcd3101d95dd8"/>
<result property="fd_3bcd311a72d000" column="fd_3bcd311a72d000"/>
<result property="fd_3bee2056eeb800" column="fd_3bee2056eeb800"/>
<result property="fd_3c3e5ff65115a2" column="fd_3c3e5ff65115a2"/>
</resultMap>
<!--tPaymentInfo合并查询-->
<select id="getAllEkpDeptInfo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo">
SELECT
a.fd_id as fdId,
a.fd_3b1480cd9dcb60 as settleType,
a.fd_3b15f64dd59a28 as isBpo,
a.fd_3b13b28d4123ee as socialType,
a.fd_3a2b38c61ef9aa as deptName,
a.fd_3a37fe508071fe as deptNo
from ekp_24a8e6a7fc143bb8c48a a
group by fd_3a37fe508071fe
</select>
<!--tPaymentInfo合并查询-->
<select id="getCostSumInfo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo">
SELECT
round(sum(ifnull(fd_3af9f2883941b4,0)),2) as ygSum,
round(sum(ifnull(fd_3af9f285ee1e38,0)),2) as ygPersonSum,
round(sum(ifnull(fd_3af9f3059e5b9c,0)),2) as sjSum,
round(sum(ifnull(fd_3adfeb4e8064a8,0)),2) as ygDwSum,
round(sum(ifnull(fd_3af9f2e9208e4e,0)),2) as sjDwSum,
round(sum(ifnull(fd_3af9f303037214,0)),2) as sjPersonSum,
round(sum(ifnull(fd_3adfeb7b624f06,0)),2) as ys,
round(sum(ifnull(fd_3b35a57aee1428,0)),2) as personYs,
round(sum(ifnull(fd_3b35a57b6e9d0a,0)),2) as dwYs,
round(sum(ifnull(fd_3adfeb7bd97464,0)),2) as yzc,
round(sum(ifnull(fd_3b35a5b03100c4,0)),2) as personYzc,
round(sum(ifnull(fd_3b35a5b0b04d54,0)),2) as dwYzc
from ekp_social_info
where fd_3adfe8c7e4cf7a = #{card} and fd_3adfe8cb96c41e = #{month}
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
View file @ 8e490f2f
...@@ -98,4 +98,8 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> { ...@@ -98,4 +98,8 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
int updateForecastStatusById(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary); int updateForecastStatusById(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
List<TForecastLibrary> selectTForecastSocialInfoList();
List<TForecastLibrary> selectTForecastFundInfoList();
} }
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
View file @ 8e490f2f
...@@ -259,6 +259,8 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> { ...@@ -259,6 +259,8 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
void updateBySocialPayment(@Param("id")String id); void updateBySocialPayment(@Param("id")String id);
void batchUpdateFundPaymentByList(@Param("idList") List<String> idList);
void updateBySocialPaymentList(@Param("idStr")String idStr); void updateBySocialPaymentList(@Param("idStr")String idStr);
void batchUpdateSocialPaymentByList(@Param("details") List<String> idStr); void batchUpdateSocialPaymentByList(@Param("details") List<String> idStr);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ 8e490f2f
...@@ -2416,22 +2416,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2416,22 +2416,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
.eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT) .eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT)
.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT)); .eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT));
if (count > 0) { if (count > 0) {
Map<String,TSettleDomainSelectVo> selectVoMap = this.getSelectVoMap(); Map<String, TSettleDomainSelectVo> selectVoMap = this.getSelectVoMap();
//获取所有未推送的社保预估明细数据 //获取所有未推送的社保预估明细数据
List<TForecastLibrary> unPushInfo = null; List<TForecastLibrary> unPushInfo = baseMapper.selectTForecastSocialInfoList();
int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT); int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT);
for (int j = 0; j < i; j++) { if (!unPushInfo.isEmpty()) {
unPushInfo= baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda() List<TForecastLibrary> pushList;
.eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT) int k = 0;
.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT) for (int j = 0; j < i; j++) {
.last(" limit 0, 10000")); if (j == i - 1) {
if (Common.isNotNull(unPushInfo)){ pushList = unPushInfo.subList(k, unPushInfo.size());
//推送数据封装并推送 } else {
initEkpPushSocialParam(unPushInfo,true,selectVoMap); pushList = unPushInfo.subList(k, k + 1000);
}
k = k + 1000;
if (Common.isNotNull(pushList)) {
//推送数据封装并推送
initEkpPushSocialParam(pushList, true, selectVoMap);
}
} }
} }
// unPushInfo.clear();
// selectVoMap.clear();
} }
} }
...@@ -2453,22 +2457,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2453,22 +2457,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
.eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT) .eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT)
.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT)); .eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT));
if (count > 0) { if (count > 0) {
Map<String,TSettleDomainSelectVo> selectVoMap = this.getSelectVoMap(); Map<String, TSettleDomainSelectVo> selectVoMap = this.getSelectVoMap();
//获取所有未推送的公积金预估明细数据 //获取所有未推送的社保预估明细数据
List<TForecastLibrary> unPushInfo = null; List<TForecastLibrary> unPushInfo = baseMapper.selectTForecastFundInfoList();
int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT); int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT);
for (int j = 0; j < i; j++) { if (!unPushInfo.isEmpty()) {
unPushInfo= baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda() List<TForecastLibrary> pushList;
.eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT) int k = 0;
.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT) for (int j = 0; j < i; j++) {
.last(" limit 0, 10000")); if (j == i - 1) {
if (Common.isNotNull(unPushInfo)){ pushList = unPushInfo.subList(k, unPushInfo.size());
//推送数据封装并推送 } else {
initEkpPushFundParam(unPushInfo,true,selectVoMap); pushList = unPushInfo.subList(k, k + 1000);
}
k = k + 1000;
if (Common.isNotNull(pushList)) {
//推送数据封装并推送
initEkpPushFundParam(pushList, true, selectVoMap);
}
} }
} }
// unPushInfo.clear();
// selectVoMap.clear();
} }
} }
...@@ -2483,7 +2491,23 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2483,7 +2491,23 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} else { } else {
selectVoMap = this.getSelectVoMap(); selectVoMap = this.getSelectVoMap();
} }
initEkpPushSocialParam(library,synFlag, selectVoMap); int i = (int) Math.ceil((double) library.size() / CommonConstants.ONE_THOUSAND_INT);
if (!library.isEmpty()) {
List<TForecastLibrary> pushList;
int k = 0;
for (int j = 0; j < i; j++) {
if (j == i - 1) {
pushList = library.subList(k, library.size());
} else {
pushList = library.subList(k, k + 1000);
}
k = k + 1000;
if (Common.isNotNull(pushList)) {
//推送数据封装并推送
initEkpPushSocialParam(pushList,synFlag, selectVoMap);
}
}
}
} }
} }
...@@ -2498,7 +2522,23 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2498,7 +2522,23 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
selectVoMap = this.getSelectVoMap(); selectVoMap = this.getSelectVoMap();
} }
//推送数据封装并推送 //推送数据封装并推送
initEkpPushFundParam(library,synFlag, selectVoMap); int i = (int) Math.ceil((double) library.size() / CommonConstants.ONE_THOUSAND_INT);
if (!library.isEmpty()) {
List<TForecastLibrary> pushList;
int k = 0;
for (int j = 0; j < i; j++) {
if (j == i - 1) {
pushList = library.subList(k, library.size());
} else {
pushList = library.subList(k, k + 1000);
}
k = k + 1000;
if (Common.isNotNull(pushList)) {
//推送数据封装并推送
initEkpPushFundParam(pushList,synFlag, selectVoMap);
}
}
}
} }
} }
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
View file @ 8e490f2f
...@@ -692,7 +692,7 @@ public class DoJointSocialTask { ...@@ -692,7 +692,7 @@ public class DoJointSocialTask {
error.setLinkId(unPushInfo.get(0).getId()); error.setLinkId(unPushInfo.get(0).getId());
error.setTitle("社保明细批量保存失败"); error.setTitle("社保明细批量保存失败");
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -703,7 +703,7 @@ public class DoJointSocialTask { ...@@ -703,7 +703,7 @@ public class DoJointSocialTask {
error.setLinkId(unPushInfo.get(0).getId()); error.setLinkId(unPushInfo.get(0).getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送社保实缴费用到EKP错误", e); log.error("推送社保实缴费用到EKP错误", e);
} }
log.info("推送社保实缴费用到EKP结束"); log.info("推送社保实缴费用到EKP结束");
...@@ -845,9 +845,8 @@ public class DoJointSocialTask { ...@@ -845,9 +845,8 @@ public class DoJointSocialTask {
R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushFundInfoToEkp(paramList); R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushFundInfoToEkp(paramList);
if (Common.isNotNull(info) && Common.isNotNull(info.getData())) { if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
EkpSocialPushInfoVo vo = info.getData(); EkpSocialPushInfoVo vo = info.getData();
List<String> idList = vo.getPaymentIds(); if (!Common.isEmpty(vo.getPaymentIds())) {
for (String id : idList) { paymentInfoMapper.batchUpdateFundPaymentByList(vo.getPaymentIds());
paymentInfoMapper.updateBySocialPayment(id);
} }
} else { } else {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -858,7 +857,7 @@ public class DoJointSocialTask { ...@@ -858,7 +857,7 @@ public class DoJointSocialTask {
error.setLinkId(unPushInfo.get(0).getId()); error.setLinkId(unPushInfo.get(0).getId());
error.setTitle("公积金批量插入失败"); error.setTitle("公积金批量插入失败");
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -869,7 +868,7 @@ public class DoJointSocialTask { ...@@ -869,7 +868,7 @@ public class DoJointSocialTask {
error.setLinkId(unPushInfo.get(0).getId()); error.setLinkId(unPushInfo.get(0).getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("公积金推送实缴费用到EKP错误", e); log.error("公积金推送实缴费用到EKP错误", e);
} }
log.info("公积金推送实缴费用到EKP结束"); log.info("公积金推送实缴费用到EKP结束");
...@@ -1151,7 +1150,7 @@ public class DoJointSocialTask { ...@@ -1151,7 +1150,7 @@ public class DoJointSocialTask {
error.setLinkId(unPushInfo.get(0).getId()); error.setLinkId(unPushInfo.get(0).getId());
error.setTitle("社保预估明细批量保存失败"); error.setTitle("社保预估明细批量保存失败");
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -1162,7 +1161,7 @@ public class DoJointSocialTask { ...@@ -1162,7 +1161,7 @@ public class DoJointSocialTask {
error.setLinkId(unPushInfo.get(0).getId()); error.setLinkId(unPushInfo.get(0).getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送社保预估费用到EKP错误", e); log.error("推送社保预估费用到EKP错误", e);
} }
log.info("推送社保预估费预估用到EKP结束"); log.info("推送社保预估费预估用到EKP结束");
...@@ -1335,7 +1334,7 @@ public class DoJointSocialTask { ...@@ -1335,7 +1334,7 @@ public class DoJointSocialTask {
error.setLinkId(unPushInfo.get(0).getId()); error.setLinkId(unPushInfo.get(0).getId());
error.setTitle("公积金预估明细批量保存失败"); error.setTitle("公积金预估明细批量保存失败");
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -1346,7 +1345,7 @@ public class DoJointSocialTask { ...@@ -1346,7 +1345,7 @@ public class DoJointSocialTask {
error.setLinkId(unPushInfo.get(0).getId()); error.setLinkId(unPushInfo.get(0).getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送公积金预估费用到EKP错误", e); log.error("推送公积金预估费用到EKP错误", e);
} }
log.info("推送公积金预估费用到EKP结束"); log.info("推送公积金预估费用到EKP结束");
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
View file @ 8e490f2f
...@@ -947,4 +947,15 @@ ...@@ -947,4 +947,15 @@
ID = #{tForecastLibrary.id} ID = #{tForecastLibrary.id}
</update> </update>
<select id="selectTForecastSocialInfoList" resultMap="tForecastLibraryMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_forecast_library a where a.data_push = 0 and a.data_type = 0
</select>
<select id="selectTForecastFundInfoList" resultMap="tForecastLibraryMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_forecast_library a where a.data_push = 0 and a.data_type = 1
</select>
</mapper> </mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @ 8e490f2f
...@@ -2526,6 +2526,14 @@ ...@@ -2526,6 +2526,14 @@
</foreach> </foreach>
</update> </update>
<!-- 批量更改社保公积金推送状态 -->
<update id="batchUpdateFundPaymentByList">
update t_payment_info a set a.PUSH_STATUS = '0',a.UPDATE_TIME = NOW() where a.id in
<foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
#{item}
</foreach>
</update>
<!-- 更改社保公积金推送状态 --> <!-- 更改社保公积金推送状态 -->
<update id="updateBySocialIncomePayment"> <update id="updateBySocialIncomePayment">
......
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