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

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java

@@ -91,7 +91,15 @@ public interface CommonConstants {
 	 */
 	Integer SUCCESS = 200;
 
+	/**
+	 * 商险导出最大值
+	 */
+	Integer EXPORT_TWENTY_THOUSAND = 20000;
 
+	/**
+	 * 商险导入最大值
+	 */
+	Integer IMPORT_TWENTY_THOUSAND = 20000;
 
 	/**
 	 * 失败标记

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -1066,6 +1066,17 @@ public class InsurancesConstants {
 	public static final String SYSTEM_TRIGGER = "系统触发";
 
 
+	/**
+	 * 一次性导出不可超过20000条，请分批导出
+	 */
+	public static final String EXPORT_TOO_LONG = "一次性导出不可超过20000条，请分批导出";
+
+	/**
+	 * 一次性导入不可超过20000条，请分批导入
+	 */
+	public static final String IMPORT_TOO_LONG = "一次性导入不可超过20000条，请分批导入";
+
+
 
 
 

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceEkp.java

@@ -38,7 +38,7 @@ public class TInsuranceEkp implements Serializable {
 	/**
 	 * 单据类型 (0、与薪资合并结算 1、单独结算)
 	 */
-	private Integer settleType;
+	private String settleType;
 
     /**
      * 项目编码
@@ -138,7 +138,7 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 单据状态
      */
-    private Integer interactiveType;
+    private String interactiveType;
 
     /**
      * 重发标识

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -9,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
+import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.Dept;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
@@ -94,7 +95,7 @@ public class TInsuranceDetailController {
 	@PostMapping("/getInsuranceList")
 	@PreAuthorize("@pms.hasPermission('insurance_custserve_insure_export')")
 	public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param) {
-		return R.ok(tInsuranceDetailService.getInsuranceList(param));
+		return tInsuranceDetailService.getInsuranceList(param);
 	}
 
 	/**
@@ -255,6 +256,9 @@ public class TInsuranceDetailController {
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
+		if(param.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		return tInsuranceDetailService.insuranceHandleImport(user,param);
 	}
 
@@ -355,8 +359,8 @@ public class TInsuranceDetailController {
 	@Operation(summary = "已投保列表不分页查询", description = "已投保列表不分页查询")
 	@PostMapping("/getInsuredList")
 	@PreAuthorize("@pms.hasPermission('insurance_custserve_insured_export')")
-	public R<List<InsuredListVo>> getInsuredList(@RequestBody InsuredParam param) {
-		return R.ok(tInsuranceDetailService.getInsuredList(param),"查询成功");
+	public R getInsuredList(@RequestBody InsuredParam param) {
+		return tInsuranceDetailService.getInsuredList(param);
 	}
 
 	/**
@@ -382,8 +386,8 @@ public class TInsuranceDetailController {
 	@Operation(summary = "已减员列表导出", description = "已减员列表导出")
 	@PostMapping("/getInsuranceRefundList")
 	@PreAuthorize("@pms.hasPermission('insurance_custserve_reduction_export')")
-	public R<List<InsuranceRefundListVo>> getInsuranceRefundList(@RequestBody InsuranceRefundParam param) {
-		return R.ok(tInsuranceDetailService.getInsuranceRefundList(param));
+	public R getInsuranceRefundList(@RequestBody InsuranceRefundParam param) {
+		return tInsuranceDetailService.getInsuranceRefundList(param);
 	}
 
 
@@ -410,7 +414,7 @@ public class TInsuranceDetailController {
 	@Operation(summary = "导出减员列表", description = "导出减员列表")
 	@PostMapping("/getInsuranceRefundHandlingList")
 	@PreAuthorize("@pms.hasPermission('handle_down_export')")
-	public R<List<RefundExportListVo>> getInsuranceRefundHandlingList(@RequestBody RefundExportListParam param) {
+	public R getInsuranceRefundHandlingList(@RequestBody RefundExportListParam param) {
 		return tInsuranceDetailService.getInsuranceRefundHandlingList(param);
 	}
 

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java

@@ -54,9 +54,9 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 *
 	 * @author licancan
 	 * @param param
-	 * @return {@link List<InsuranceListVO>}
+	 * @return {@link R<List<InsuranceListVO>>}
 	 */
-	List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
+	R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param);
 
 	/**
 	 * 投保办理分页查询
@@ -206,7 +206,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param param 查询参数
 	 * @return {@link List< InsuredListVo>}
 	 */
-	List<InsuredListVo> getInsuredList(InsuredParam param);
+	R getInsuredList(InsuredParam param);
 
 	/**
 	 * 已减员列表分页查询
@@ -225,7 +225,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param param 查询参数
 	 * @return {@link List<  InsuranceRefundListVo >}
 	 */
-	List<InsuranceRefundListVo> getInsuranceRefundList(InsuranceRefundParam param);
+	R getInsuranceRefundList(InsuranceRefundParam param);
 
 	/**
 	 * 减员办理列表分页查询

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -208,16 +208,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * 投保不分页查询
 	 *
 	 * @param param
-	 * @return {@link List<InsuranceListVO>}
+	 * @return {@link R<List<InsuranceListVO>>}
 	 * @author licancan
 	 */
 	@Override
-	public List<InsuranceListVO> getInsuranceList(InsuranceListParam param) {
+	public R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param) {
 		YifuUser user = SecurityUtils.getUser();
 		List<String> deptList = getDeptNoList(user);
 		List<InsuranceListVO> insuranceList = new ArrayList<>();
 		if (CollectionUtils.isEmpty(deptList)){
-			return insuranceList;
+			return R.ok(insuranceList);
 		}
 		param.setDeptNoList(deptList);
 		insuranceList = baseMapper.getInsuranceList(param);
@@ -225,11 +225,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		setProjectNameByDeptNo(insuranceList);
 		// 购买月数
 		if (CollectionUtils.isNotEmpty(insuranceList)){
+			if(insuranceList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
+			}
 			insuranceList.stream().forEach(e ->{
 				e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
 			});
 		}
-		return insuranceList;
+		return R.ok(insuranceList);
 	}
 	/**
 	 * 投保办理分页查询
@@ -277,6 +280,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
 		}
+		if(paramList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		YifuUser user = SecurityUtils.getUser();
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
@@ -327,6 +333,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
 		}
+		if(paramList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		YifuUser user = SecurityUtils.getUser();
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
@@ -375,6 +384,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
 		}
+		if(paramList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		YifuUser user = SecurityUtils.getUser();
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
@@ -880,6 +892,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			insuranceExportList = baseMapper.getInsuranceExportList(param);
 		}
 		if (CollectionUtils.isNotEmpty(insuranceExportList)){
+			if(insuranceExportList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
+			}
 			List<TInsuranceDetail> detailList = new ArrayList<>();
 			//根据项目编码获取项目名称
 			List<String> collect = insuranceExportList.stream().map(e -> e.getDeptNo()).distinct().collect(Collectors.toList());
@@ -1372,6 +1387,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
 		}
+		if(paramList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		YifuUser user = SecurityUtils.getUser();
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
@@ -3110,6 +3128,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(!Common.isNotEmpty(insuranceRefundCheckList)){
 			return R.failed("当前导入的减员信息为空");
 		}
+		if(insuranceRefundCheckList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		Map<String, List<InsuranceRefundCheck>> refundMap = checkInsuranceRefundList(insuranceRefundCheckList,user);
 		List<InsuranceRefundCheck> successList = refundMap.get("successList");
 		List<TInsuranceOperate> operateList = new ArrayList<>();
@@ -3198,17 +3219,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @return {@link List< InsuredListVo>}
 	 */
 	@Override
-	public List<InsuredListVo> getInsuredList(InsuredParam param) {
+	public R getInsuredList(InsuredParam param) {
 		YifuUser user = SecurityUtils.getUser();
 		List<String> deptList = getDeptNoList(user);
 		List<InsuredListVo> insuredList = new ArrayList<>();
 		if (CollectionUtils.isEmpty(deptList)){
-			return insuredList;
+			return R.ok(insuredList);
 		}
 		param.setDeptNoList(deptList);
 		param.setDeptNoList(deptList);
 		insuredList = this.baseMapper.getInsuredList(param);
 		if (CollectionUtils.isNotEmpty(insuredList)){
+			if(insuredList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+				return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+			}
 			//根据项目编码获取项目名称
 			List<String> collect = insuredList.stream().map(InsuredListVo::getDeptNo).distinct().collect(Collectors.toList());
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
@@ -3224,7 +3248,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 		}
-		return insuredList;
+		return R.ok(insuredList);
 	}
 
 	/**
@@ -3271,16 +3295,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @return {@link List<  InsuranceRefundListVo >}
 	 */
 	@Override
-	public List<InsuranceRefundListVo> getInsuranceRefundList(InsuranceRefundParam param) {
+	public R getInsuranceRefundList(InsuranceRefundParam param) {
 		YifuUser user = SecurityUtils.getUser();
 		List<String> deptNoList = getDeptNoList(user);
 		List<InsuranceRefundListVo> pageList = new ArrayList<>();
 		if(CollectionUtils.isEmpty(deptNoList)){
-			return pageList;
+			return R.ok(pageList);
 		}
 		param.setDeptNoList(deptNoList);
 		List<InsuranceRefundListVo> insuranceRefundList = this.baseMapper.getInsuranceRefundList(param);
 		if (CollectionUtils.isNotEmpty(insuranceRefundList)){
+			if(insuranceRefundList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
+			}
 			//根据项目编码获取项目名称
 			List<String> collect = insuranceRefundList.stream().map(InsuranceRefundListVo::getDeptNo).distinct().collect(Collectors.toList());
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
@@ -3297,7 +3324,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 		}
-		return insuranceRefundList;
+		return  R.ok(insuranceRefundList);
 	}
 
 	/**
@@ -3348,7 +3375,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 */
 	@Override
 	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
-	public R<List<RefundExportListVo>> getInsuranceRefundHandlingList(RefundExportListParam param){
+	public R getInsuranceRefundHandlingList(RefundExportListParam param){
 		YifuUser user = SecurityUtils.getUser();
 		List<RefundExportListVo> refundExportList;
 		String regionSQL = getRegionSQL(user);
@@ -3360,6 +3387,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			refundExportList = baseMapper.getRefundExportList(param);
 		}
 		if (CollectionUtils.isNotEmpty(refundExportList)){
+			if(refundExportList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
+			}
 			List<TInsuranceDetail> detailList = new ArrayList<>();
 			List<TInsuranceRefund> refundList = new ArrayList<>();
 			//根据项目编码获取项目名称
@@ -3502,9 +3532,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	@Override
 	public R insuranceRefundImport(List<InsuranceHandleImportParam> insuranceRefundImportList) {
 		YifuUser user = SecurityUtils.getUser();
-		if (!Common.isNotEmpty(insuranceRefundImportList)) {
+		if (CollectionUtils.isEmpty(insuranceRefundImportList)) {
 			return R.failed(InsurancesConstants.INSURANCE_REFUND_IMPORT_LIST_IS_EMPTY);
 		}
+		if(insuranceRefundImportList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		Map<String, List<InsuranceHandleImportParam>> map = insuranceChangeCheck(insuranceRefundImportList, user,true);
 		List<InsuranceHandleImportParam> successList = map.get("successList");
 		List<InsuranceHandleImportParam> errorList = map.get("errorList");
@@ -3567,6 +3600,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (!Common.isNotEmpty(settleMonthCheckList)) {
 			return R.failed(InsurancesConstants.SETTLE_MONTH_CHANGE_LIST_IS_EMPTY);
 		}
+		if(settleMonthCheckList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		Map<String, List<SettleMonthChangeCheckParam>> map = settleMonthChangeCheck(settleMonthCheckList, user);
 		List<SettleMonthChangeCheckParam> successList = map.get("successList");
 		List<SettleMonthChangeCheckParam> errorList = map.get("errorList");
@@ -3651,6 +3687,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(!Common.isNotEmpty(deptChangeCheckList)){
 			return R.failed(InsurancesConstants.OPERATION_LIST_IS_EMPTY);
 		}
+		if(deptChangeCheckList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		Map<String, List<DeptChangeCheckParam>> stringListMap = deptChangeCheck(deptChangeCheckList,user);
 		List<DeptChangeCheckParam> successList = stringListMap.get("successList");
 		List<TInsuranceOperate> operateList = new ArrayList<>(16);
@@ -3764,7 +3803,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 									//推送预估单
 									interactiveParam.setEstimatePremium(success.getEstimatePremium());
-									interactiveParam.setActualPremium(null);
+									interactiveParam.setActualPremium(success.getActualPremium());
 									interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 									String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									if (StringUtils.isNotBlank(estimateBody)) {
@@ -3774,7 +3813,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 										tInsuranceSettleService.updateById(newInsuranceSettle);
 										//推送实缴单
 										interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
-										interactiveParam.setEstimatePremium(null);
+										interactiveParam.setEstimatePremium(success.getEstimatePremium());
 										interactiveParam.setActualPremium(success.getActualPremium());
 										String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 										if (StringUtils.isNotBlank(actualBody)) {
@@ -3829,7 +3868,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 								//推送预估单
 								interactiveParam.setEstimatePremium(success.getEstimatePremium());
-								interactiveParam.setActualPremium(null);
+								interactiveParam.setActualPremium(success.getActualPremium());
 								interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 								String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 								if (StringUtils.isNotBlank(estimateBody)) {
@@ -3839,7 +3878,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									tInsuranceSettleService.updateById(newInsuranceSettle);
 									//推送实缴单
 									interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
-									interactiveParam.setEstimatePremium(null);
+									interactiveParam.setEstimatePremium(success.getEstimatePremium());
 									interactiveParam.setActualPremium(success.getActualPremium());
 									String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									if (StringUtils.isNotBlank(actualBody)) {
@@ -5648,13 +5687,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 			param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
 			param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
-			pushType = CommonConstants.FIVE_INT;
+			pushType = CommonConstants.SIX_INT;
 		}
 		//4更新实际保费(用于登记保单保费场景推送过实缴保费)
 		if(CommonConstants.FOUR_INT == type){
 			param.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
 			param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
-			pushType = CommonConstants.SEVEN_INT;
+			pushType = CommonConstants.THREE_INT;
 		}
 		//作废
 		if(CommonConstants.FIVE_INT == type){

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEkpServiceImpl.java

@@ -6,6 +6,7 @@ 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.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants;
 import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
@@ -58,183 +59,191 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 	@Override
 	public R resend() {
 		List<TInsuranceEkp> ekpRefundList = this.baseMapper.getEkpRefundList();
-		List<TInsuranceEkp> failList = new ArrayList<>();
-		List<TInsuranceEkp> successLit = new ArrayList<>();
 		if (CollectionUtils.isNotEmpty(ekpRefundList)){
 			for (TInsuranceEkp tInsuranceEkp : ekpRefundList) {
 				TInsuranceDetail byId = tInsuranceDetailService.getById(tInsuranceEkp.getDetailId());
 				String defaultSettleId = byId.getDefaultSettleId();
-				if (tInsuranceEkp.getDefaultSettleId().equals(defaultSettleId)){
-					//ekp结算信息
-					SettleVo settleVo = tInsuranceDetailService.getInsuranceDetailSettleStatus(tInsuranceEkp.getDetailId(), tInsuranceEkp.getDefaultSettleId());
-					//商险结算信息
-					TInsuranceSettle insuranceSettle = tInsuranceSettleService.getById(tInsuranceEkp.getDefaultSettleId());
-					//预估推送状态
-					Integer isEstimatePush = insuranceSettle.getIsEstimatePush();
-					//实缴推送状态
-					Integer isActualPush = insuranceSettle.getIsActualPush();
-					//实缴结算状态
-					String actualStatus = settleVo.getActualStatus();
-					//预缴结算状态
-					String estimateStatus = settleVo.getEstimateStatus();
-					Integer pushType = tInsuranceEkp.getPushType();
-					//如果当前需要重发预估保费的数据已发送，则过滤掉执行下一条数据
-					if(CommonConstants.ONE_INT == pushType && CommonConstants.ONE_INT == isEstimatePush){
-						tInsuranceEkp.setResendFlag(CommonConstants.THREE_INT);
-						failList.add(tInsuranceEkp);
-						continue;
+				String s = null;
+				String settleType = tInsuranceEkp.getSettleType();
+				if(InsurancesConstants.ACTUAL_SETTLE_BILL.equals(settleType)){
+					settleType = CommonConstants.ONE_STRING;
 				}
-					//如果当前需要重发实际保费的数据已发送，则过滤掉执行下一条数据
-					if(CommonConstants.TWO_INT == pushType && CommonConstants.ONE_INT == isActualPush){
-						tInsuranceEkp.setResendFlag(CommonConstants.THREE_INT);
-						failList.add(tInsuranceEkp);
-						continue;
+				if(InsurancesConstants.ESTIMATE_SETTLE_BILL.equals(settleType)){
+					settleType = CommonConstants.ZERO_STRING;
 				}
+				Integer pushType = tInsuranceEkp.getPushType();
+				//商险结算信息
+				TInsuranceSettle insuranceSettle = tInsuranceSettleService.getById(tInsuranceEkp.getDefaultSettleId());
+				boolean settleIdEquals = tInsuranceEkp.getDefaultSettleId().equals(defaultSettleId);
+				//预估是否已发送
+				boolean estimatePush = Common.isEmpty(insuranceSettle) || insuranceSettle.getIsEstimatePush() == CommonConstants.ZERO_INT;
+				//实缴是否已发送
+				boolean actualPush = Common.isEmpty(insuranceSettle) || insuranceSettle.getIsActualPush() == CommonConstants.ZERO_INT;
+				//结算类型是否一致
+				boolean settleTypeEquals = settleType.equals(byId.getSettleType().toString());
 				EkpInteractiveParam ekpParam = new EkpInteractiveParam();
 				BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam);
-					//如果预估未结算
-					LambdaUpdateWrapper<TInsuranceSettle> updateWrapper = new LambdaUpdateWrapper<>();
-					String s = null;
-					if(InsurancesConstants.SETTLE_ZERO.equals(estimateStatus)){
-						//实缴未结算
-						if(InsurancesConstants.SETTLE_ZERO.equals(actualStatus)){
-							//如果是新增预估保费，则推送预估保费新增
+				LambdaUpdateWrapper<TInsuranceSettle> settleUpdate = new LambdaUpdateWrapper<>();
+				settleUpdate.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId());
+				LambdaUpdateWrapper<TInsuranceDetail> detailUpdate = new LambdaUpdateWrapper<>();
+				detailUpdate.eq(TInsuranceDetail :: getId,tInsuranceEkp.getDetailId());
+				LambdaUpdateWrapper<TInsuranceEkp> ekpUpdate = new LambdaUpdateWrapper<>();
+				ekpUpdate.eq(TInsuranceEkp :: getId,tInsuranceEkp.getId());
+				if(settleType.equals(CommonConstants.ZERO_STRING)){
+					ekpParam.setEstimateStatus(EkpConstants.HAVE);
+				}else{
+					ekpParam.setEstimateStatus(EkpConstants.NOTHING);
+				}
+				//预估新增重发
 				if(CommonConstants.ONE_INT == pushType){
+					//如果结算类型不一致，结算类型不为空且已预估发送，结算id不一致
+					if(!settleTypeEquals || !estimatePush || !settleIdEquals){
+						ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
+						update(ekpUpdate);
+						continue;
+					}else{
+						ekpParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
+						ekpParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 						s = ekpInsuranceUtil.sendToEkp(ekpParam);
 						if(StringUtils.isNotBlank(s)){
-									updateWrapper.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId())
-											.set(TInsuranceSettle :: getIsEstimatePush,CommonConstants.ONE_INT)
-											.set(TInsuranceSettle :: getEstimatePushTime, LocalDateTime.now());
-									tInsuranceSettleService.update(updateWrapper);
-								}
-							}
-							//如果是新增实缴保费，则推送实缴保费新增
-							if(CommonConstants.TWO_INT == pushType){
-								s = ekpInsuranceUtil.sendToEkp(ekpParam);
-								if(StringUtils.isNotBlank(s)) {
-									updateWrapper.eq(TInsuranceSettle::getId, tInsuranceEkp.getDefaultSettleId())
-											.set(TInsuranceSettle::getIsActualPush, CommonConstants.ONE_INT)
-											.set(TInsuranceSettle::getActualPushTime, LocalDateTime.now());
-									tInsuranceSettleService.update(updateWrapper);
+							settleUpdate.set(TInsuranceSettle :: getEstimatePushTime,LocalDateTime.now())
+									.set(TInsuranceSettle ::getIsEstimatePush,CommonConstants.ONE_INT);
+							tInsuranceSettleService.update(settleUpdate);
+							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+							update(ekpUpdate);
+						}else{
+							break;
 						}
 					}
-							//如果是变更结算信息，则推送变更结算信息
-							if(CommonConstants.THREE_INT == pushType){
-								s = ekpInsuranceUtil.sendToEkp(ekpParam);
-								if(StringUtils.isNotBlank(s)) {
-									updateWrapper.eq(TInsuranceSettle::getId, tInsuranceEkp.getDefaultSettleId())
-											.set(TInsuranceSettle::getIsActualPush, CommonConstants.ONE_INT)
-											.set(TInsuranceSettle::getActualPushTime, LocalDateTime.now());
-									tInsuranceSettleService.update(updateWrapper);
-									LambdaUpdateWrapper<TInsuranceDetail> detailLambdaUpdate = new LambdaUpdateWrapper<>();
-									detailLambdaUpdate.eq(TInsuranceDetail::getId, tInsuranceEkp.getDetailId())
-											.set(TInsuranceDetail::getSettleMonth, CommonConstants.ONE_INT);
-									tInsuranceSettleService.update(updateWrapper);
-								}
-							}
-							//如果是作废信息，则推送作废信息
-							if(CommonConstants.FOUR_INT == pushType){
-								s = ekpInsuranceUtil.sendToEkp(ekpParam);
 				}
-							if(CommonConstants.FIVE_INT == pushType || CommonConstants.SIX_INT == pushType){
-								tInsuranceEkp.setResendFlag(CommonConstants.TWO_INT);
-								failList.add(tInsuranceEkp);
+				//实缴新增重发
+				if(CommonConstants.TWO_INT == pushType){
+					//如果结算类型不一致，结算类型不为空且已发送，结算id不一致
+					if(!settleTypeEquals || !actualPush || !settleIdEquals){
+						ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
+						update(ekpUpdate);
 						continue;
-							}
-							//成功则更新，不成功则跳出循环
-							if(StringUtils.isNotBlank(s)) {
-								tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
-								updateById(tInsuranceEkp);
 					}else{
-								break;
-							}
-						}
-						//实缴结算中，已结算
-						if(InsurancesConstants.SETTLE_ONE.equals(actualStatus) || InsurancesConstants.SETTLE_TWO.equals(actualStatus)){
-							//如果是作废，则推送实缴红冲
-							if(CommonConstants.FOUR_INT == pushType){
-								BigDecimal actualPremium = ekpParam.getActualPremium();
-								ekpParam.setActualPremium(actualPremium.negate());
-								ekpParam.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
+						ekpParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 						ekpParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 						s = ekpInsuranceUtil.sendToEkp(ekpParam);
-								if(StringUtils.isNotBlank(s)) {
-									tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
-									updateById(tInsuranceEkp);
+						if(StringUtils.isNotBlank(s)){
+							settleUpdate.set(TInsuranceSettle :: getActualPushTime,LocalDateTime.now())
+									.set(TInsuranceSettle ::getIsActualPush,CommonConstants.ONE_INT);
+							tInsuranceSettleService.update(settleUpdate);
+							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+							update(ekpUpdate);
 						}else{
 							break;
 						}
 					}
-							if(CommonConstants.SIX_INT == pushType){
+				}
+				//ekp结算信息
+				SettleVo settleVo = tInsuranceDetailService.getInsuranceDetailSettleStatus(tInsuranceEkp.getDetailId(), tInsuranceEkp.getDefaultSettleId());
+				//实缴结算状态
+				String actualStatus = null;
+				//预缴结算状态
+				String estimateStatus = null;
+				if(!Common.isEmpty(settleVo) ){
+					estimateStatus = settleVo.getEstimateStatus();
+					actualStatus = settleVo.getActualStatus();
+				}
+				boolean eStatus = InsurancesConstants.SETTLE_ZERO.equals(estimateStatus);
+				boolean aStatus = InsurancesConstants.SETTLE_ZERO.equals(actualStatus);
+				//变更结算信息
+				if(CommonConstants.THREE_INT == pushType){
+					//如果结算类型不一致，结算类型不为空且已发送，结算id不一致
+					if(!settleTypeEquals  || !settleIdEquals || !eStatus || !aStatus){
+						ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
+						update(ekpUpdate);
+						continue;
+					}else{
+						ekpParam.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
 						s = ekpInsuranceUtil.sendToEkp(ekpParam);
-								if(StringUtils.isNotBlank(s)) {
-									tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
-									updateById(tInsuranceEkp);
+						if(StringUtils.isNotBlank(s)){
+							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+							update(ekpUpdate);
 						}else{
 							break;
 						}
-							}else{
-								//推送预估新增，实缴新增，变更结算信息，作废,则不进行重发
-								tInsuranceEkp.setResendFlag(CommonConstants.TWO_INT);
-								updateById(tInsuranceEkp);
 					}
 				}
-					}else{
-						//如果实缴未结算
-						if(InsurancesConstants.SETTLE_ZERO.equals(actualStatus)){
-							//如果是作废信息，则推送预估红冲信息
+				//推送作废信息
 				if(CommonConstants.FOUR_INT == pushType){
-								BigDecimal estimatePremium = ekpParam.getEstimatePremium();
-								ekpParam.setActualPremium(estimatePremium.negate());
-								ekpParam.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
+					//如果结算类型不一致，结算类型不为空且已发送，结算id不一致
+					if(eStatus && aStatus){
 						ekpParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+						ekpParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
 						s = ekpInsuranceUtil.sendToEkp(ekpParam);
-								if(StringUtils.isNotBlank(s)) {
-									tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
-									updateById(tInsuranceEkp);
+						if(StringUtils.isNotBlank(s)){
+							detailUpdate.set(TInsuranceDetail :: getDefaultSettleId,null);
+							tInsuranceDetailService.update(detailUpdate);
+							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+							update(ekpUpdate);
 						}else{
 							break;
 						}
-							} else if(CommonConstants.FIVE_INT == pushType){
-								//如果是预估红冲信息，则推送预估红冲信息
+					}
+					if(!eStatus || !aStatus){
+						ekpParam.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
+						//如果为合并结算,则推送预估红冲
+						if(settleType.equals(CommonConstants.ZERO_STRING) && actualPush){
+							BigDecimal estimatePremium = ekpParam.getEstimatePremium();
+							ekpParam.setEstimatePremium(estimatePremium.negate());
+							ekpParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 							s = ekpInsuranceUtil.sendToEkp(ekpParam);
-								if(StringUtils.isNotBlank(s)) {
-									tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
-									updateById(tInsuranceEkp);
+							if(StringUtils.isNotBlank(s)){
+								ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+								update(ekpUpdate);
 							}else{
 								break;
 							}
-							}else{
-								tInsuranceEkp.setResendFlag(CommonConstants.TWO_INT);
-								updateById(tInsuranceEkp);
 						}
-						}else{
-							//如果是实缴红冲信息，则推送实缴红冲信息
-							if(CommonConstants.SIX_INT == pushType){
+						//如果为合并结算,则推送实缴红冲
+						if(!actualPush){
+							ekpParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 							BigDecimal actualPremium = ekpParam.getActualPremium();
 							ekpParam.setActualPremium(actualPremium.negate());
-								ekpParam.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
-								ekpParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 							s = ekpInsuranceUtil.sendToEkp(ekpParam);
-								if(StringUtils.isNotBlank(s)) {
-									tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
-									updateById(tInsuranceEkp);
+							if(StringUtils.isNotBlank(s)){
+								ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+								update(ekpUpdate);
 							}else{
 								break;
 							}
+						}
 					}else{
-								tInsuranceEkp.setResendFlag(CommonConstants.TWO_INT);
-								updateById(tInsuranceEkp);
+						ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
+						update(ekpUpdate);
+						continue;
 					}
 				}
+				//推送预估红冲信息
+				if(CommonConstants.FIVE_INT == pushType){
+					ekpParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+					ekpParam.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
+					s = ekpInsuranceUtil.sendToEkp(ekpParam);
+					if(StringUtils.isNotBlank(s)){
+						ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+						update(ekpUpdate);
+					}else{
+						break;
+					}
 				}
+				//推送实缴红冲信息
+				if(CommonConstants.SIX_INT == pushType){
+					ekpParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
+					ekpParam.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
+					s = ekpInsuranceUtil.sendToEkp(ekpParam);
+					if(StringUtils.isNotBlank(s)){
+						ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+						update(ekpUpdate);
 					}else{
-					//结算id与当前不一致则不进行重发
-					tInsuranceEkp.setResendFlag(CommonConstants.THREE_INT);
-					failList.add(tInsuranceEkp);
+						break;
 					}
 				}
-			updateBatchById(failList);
+
+			}
 			return R.ok("发送成功");
 		}else{
 			return R.failed("无需要发送的信息");

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceEkpMapper.xml

@@ -32,6 +32,7 @@
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="pushTime" column="PUSH_TIME" jdbcType="TIMESTAMP"/>
 			<result property="pushType" column="PUSH_TYPE" jdbcType="TINYINT"/>
+		<result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
 
     </resultMap>
 
@@ -44,7 +45,7 @@
         POLICY_END,BUY_STANDARD,MEDICAL_QUOTA,
         DIE_DISABLE_QUOTA,ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
         SETTLE_MONTH,INTERACTIVE_TYPE,RESEND_FLAG,
-        CREATE_TIME,PUSH_TIME,PUSH_TYPE
+        CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE
     </sql>
 
 	<select id="getEkpRefundList" resultMap="BaseResultMap">

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/constants/OrderConstants.java

@@ -110,4 +110,8 @@ public class OrderConstants {
 	 * 附件超出上传上限
 	 */
 	public static final String ENCLOSURE_SIZE_ERROR = "附件超出上传上限";
+	/**
+	 * 一次性导出不可超过20000条，请分批导出
+	 */
+	public static final String EXPORT_TOO_LONG = "一次性导出不可超过20000条，请分批导出";
 }

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/controller/OrderController.java

@@ -60,7 +60,7 @@ public class OrderController {
 	@GetMapping("/getOrderList")
 	@PreAuthorize("@pms.hasPermission('order:order_getOrderList')")
 	public R<List<OrderListVO>> getOrderList(OrderListParam param) {
-		return R.ok(tOrderService.getOrderList(param));
+		return tOrderService.getOrderList(param);
 	}
 
 	/**

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/TOrderService.java

@@ -34,9 +34,9 @@ public interface TOrderService extends IService<TOrder> {
 	 *
 	 * @author licancan
 	 * @param param
-	 * @return {@link List<OrderListVO>}
+	 * @return {@link R<List<OrderListVO>>}
 	 */
-	List<OrderListVO> getOrderList(OrderListParam param);
+	R<List<OrderListVO>> getOrderList(OrderListParam param);
 
 	/**
 	 * 变更订单状态

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -83,7 +83,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 	 * @author licancan
 	 */
 	@Override
-	public List<OrderListVO> getOrderList(OrderListParam param) {
+	public R<List<OrderListVO>> getOrderList(OrderListParam param) {
 		YifuUser user = SecurityUtils.getUser();
 		List<OrderListVO> list;
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
@@ -91,7 +91,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		}else {
 			list = baseMapper.getOrderList(param,user.getUsername());
 		}
-		return list;
+		if (CollectionUtils.isNotEmpty(list)){
+			if(list.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+				return R.failed(OrderConstants.EXPORT_TOO_LONG);
+			}
+		}
+		return R.ok(list);
 	}
 
 	/**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/IncomeExportVo.java

 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -124,6 +125,7 @@ public class IncomeExportVo implements Serializable {
 	/**
 	 * 数据生成时间
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
 	@NotBlank(message = "数据生成时间 不能为空")
 	@ExcelAttribute(name = "数据生成时间", isNotEmpty = true, errorInfo = "数据生成时间 不能为空", isDate = true)
 	@Schema(description = "数据生成时间")

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

@@ -1868,7 +1868,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				// 五险派单 如果前面兼职工伤没派减 不可派增
 				flag =  (BigDecimalUtils.safeAdd(sf.getUnitPersionMoney(),sf.getUnitBigailmentMoney(),
 						sf.getUnitBirthMoney(),sf.getUnitMedicalMoney(),sf.getUnitUnemploymentMoney(),
-						sf.getUnitInjuryMoney()).compareTo(BigDecimalUtils.isNullToZero(sf.getUnitInjuryMoney())) == 0)
+						sf.getUnitInjuryMoney()).compareTo(BigDecimalUtils.isNullToZero(sf.getUnitInjuryMoney())) == 0
+						&& BigDecimalUtils.isNullToZero(sf.getUnitInjuryMoney()).compareTo(BigDecimal.ZERO) != 0 )
 						&& !(CommonConstants.TEN_STRING.equals(sf.getSocialStatus())
 						||  CommonConstants.THREE_STRING.equals(sf.getWorkInjuryHandle())
 						||  CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle()));

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

@@ -2223,6 +2223,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					}
 				}
 			}
+			if (CommonConstants.ZERO_STRING.equals(settleDomain.getSocialType())) {
+				continue;
+			}
 			EkpPushSocialParam socialParam = new EkpPushSocialParam();
 			//员工姓名
 			socialParam.setFd_3adfe8c79989d4(library.getEmpName());
@@ -2451,6 +2454,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					}
 				}
 			}
+			if (CommonConstants.ZERO_STRING.equals(settleDomain.getFundType())) {
+				continue;
+			}
 			EkpPushFundParam fundParam = new EkpPushFundParam();
 			//员工姓名
 			fundParam.setFd_3adfe8c79989d4(library.getEmpName());

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

@@ -2381,8 +2381,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			//订单类型
 			socialParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_THR);
 			//是否有预估
-			if (Common.isNotNull(settleDomain.getMrSettleType()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+			if (Common.isNotNull(settleDomain.getSocialType()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getSocialType())) {
 				socialParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
 			} else {
 				socialParam.setFd_3add9de0be85e4(CommonConstants.IS_FALSE);
@@ -2598,8 +2598,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			//订单类型
 			fundParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_THR);
 			//是否有预估
-			if (Common.isNotNull(settleDomain.getMrSettleType()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+			if (Common.isNotNull(settleDomain.getFundType()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getFundType())) {
 				fundParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
 			} else {
 				fundParam.setFd_3add9de0be85e4(CommonConstants.IS_FALSE);