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

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

@@ -6166,7 +6166,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 		}
 		//判断是否存在当月的商险收入数据
-		Boolean isExist = false;
+		boolean isExist = false;
 		List<TIncomeDetail> incomeDetailList = new ArrayList<>();
 		TIncomeDetail incomeDetail = new TIncomeDetail();
 		incomeDetail.setEmpIdcard(insuranceDetail.getEmpIdcardNo());

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

@@ -188,60 +188,6 @@ public class TPaymentInfoExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("公积金缴纳地")
 	private String providentPayAddr;
 
-	/**
-	 * 公积金缴纳地-省
-	 */
-	@ExcelAttribute(name = "公积金缴纳地-省", isArea = true)
-	@Schema(description ="公积金缴纳地-省")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金缴纳地-省")
-	private String fundProvince;
-
-	/**
-	 * 公积金缴纳地-市
-	 */
-	@ExcelAttribute(name = "公积金缴纳地-市",isArea = true, parentField = "fundProvince")
-	@Schema(description ="公积金缴纳地-市")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金缴纳地-市")
-	private String fundCity;
-
-	/**
-	 * 公积金缴纳地-县
-	 */
-	@ExcelAttribute(name = "公积金缴纳地-县",isArea = true, parentField = "fundCity")
-	@Schema(description ="公积金缴纳地-县")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金缴纳地-县")
-	private String fundTown;
-
-	/**
-	 * 社保缴纳地-省
-	 */
-	@ExcelAttribute(name = "社保缴纳地-省",isArea = true)
-	@Schema(description ="社保缴纳地-省")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保缴纳地-省")
-	private String socialProvince;
-
-	/**
-	 * 社保缴纳地-市
-	 */
-	@ExcelAttribute(name = "社保缴纳地-市", isArea = true, parentField = "socialProvince")
-	@Schema(description ="社保缴纳地-市")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保缴纳地-市")
-	private String socialCity;
-
-	/**
-	 * 社保缴纳地-县
-	 */
-	@ExcelAttribute(name = "社保缴纳地-县", isArea = true, parentField = "socialCity")
-	@Schema(description ="社保缴纳地-县")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保缴纳地-县")
-	private String socialTown;
-
 	/**
 	 * 社保合计
 	 */

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

@@ -16,6 +16,8 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -43,10 +45,18 @@ public class TPaymentInfoSearchVo extends TPaymentInfo {
 	private List<String> idList;
 
 	/**
-	 * 创建时间区间 [开始时间，结束时间]
+	 * 开始时间（查询专用）
 	 */
-	@Schema(description = "创建时间区间")
-	private LocalDateTime[] createTimes;
+	@ExcelAttribute(name = "创建开始时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeStart;
+	/**
+	 * 截止时间（查询专用）
+	 */
+	@ExcelAttribute(name = "创建截止时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeEnd;
+
 	/**
 	 * @Author fxj
 	 * 查询数据起

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -402,8 +402,10 @@ public class TPaymentInfoController {
 	@Operation(summary = "手动推送社保缴费库明细的数据", description = "手动推送社保缴费库明细的数据")
 	@SysLog("手动推送社保缴费库明细的数据")
 	@PostMapping("/pushPaymentSocialFundInfo")
-	public R<Boolean> pushPaymentSocialFundInfo() {
-		tPaymentInfoService.pushPaymentSocialFundInfo();
+	public R<Boolean> pushPaymentSocialFundInfo(@RequestParam(name = "socialHouse", required = false) String socialHouse,
+												@RequestParam(name = "fundHouse", required = false) String fundHouse,
+												@RequestParam(name = "settleDomainId", required = false) String settleDomainId) {
+		tPaymentInfoService.pushPaymentSocialFundInfo(socialHouse,fundHouse,settleDomainId);
 		return R.ok();
 	}
 
@@ -418,4 +420,17 @@ public class TPaymentInfoController {
 	public R<String> changeDeptByEkp(@RequestBody ChangeDeptVo changeDeptVo) {
 		return tPaymentInfoService.changeDeptByEkp(changeDeptVo);
 	}
+
+	/**
+	 * @Description: 批量标识可以推送的数据
+	 * @Author: huyc
+	 * @Date: 2022/11/16
+	 * @return: R
+	 **/
+	@Operation(summary = "批量标识可以推送的数据", description = "批量标识可以推送的数据")
+	@SysLog("批量标识可以推送的数据")
+	@PostMapping("/batchUpdatePaymentInfo")
+	public R<Boolean> batchUpdatePaymentInfo(@RequestBody TPaymentInfoSearchVo searchVo) {
+		return tPaymentInfoService.batchUpdatePaymentInfo(searchVo);
+	}
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java

@@ -24,7 +24,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptDetailVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
@@ -91,13 +90,6 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 	 **/
 	TPaymentInfoVo getAllInfoById(String id);
 
-	/**
-	 * 查询要删除的数据
-	 * @param queryEntity
-	 * @return
-	 **/
-	List<TPaymentInfo> selectListForDelete(@Param("queryEntity")TPaymentInfo queryEntity);
-
 	/*
 	* 已存在社保缴费库数据  非删除状态
 	* @param months
@@ -164,4 +156,11 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 	 **/
 	int changePaymentDept(@Param("idSet") Set<String> idSet, @Param("dept") TSettleDomainSelectVo dept);
 
+	/**
+	 * 缴费库未打标数据查询
+	 * @param searchVo 缴费库
+	 * @return
+	 */
+	List<String> getTPaymentInfoList(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo);
+
 }

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

@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 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.TPaymentInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
 
 import javax.servlet.http.HttpServletResponse;
@@ -65,7 +66,7 @@ public interface TIncomeService extends IService<TIncome> {
 	 * @Date: 2022/9/9 11:42
 	 * @return:
 	 **/
-	void saveBathDetail(List<TIncomeDetail> tIncomeDetail);
+	boolean saveBathDetail(TIncomeDetail tIncomeDetail, TPaymentInfo paymentInfo);
 
 	void pushDetail();
 

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

@@ -148,7 +148,14 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 
 	TPaymentVo getPaymentSocialAndFound(TPaymentInfo info);
 
-	void pushPaymentSocialFundInfo();
+	void pushPaymentSocialFundInfo(String socialHouse,String fundHouse,String settleDomainId);
+
+	/**
+	 * 批量标识可以推送的数据
+	 * @Author huyc
+	 * @Date 2022-11-16 10:06:13
+	 **/
+	R<Boolean> batchUpdatePaymentInfo(TPaymentInfoSearchVo searchVo);
 
 	/**
 	 * @param changeDeptVo

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

@@ -4231,7 +4231,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 
 		//判断是否存在当月的公积金收入数据
-		Boolean isExist = false;
+		boolean isExist = false;
 		TIncomeDetail incomeDetail = new TIncomeDetail();
 		incomeDetail.setEmpIdcard(library.getEmpIdcard());
 		incomeDetail.setPayMonth(library.getProvidentPayMonth());
@@ -4243,12 +4243,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			for (TIncomeDetail income : detailList) {
 				sumMoney = BigDecimalUtils.safeAdd(income.getMoney(),sumMoney);
 			}
-			if (sumMoney.compareTo(BigDecimal.ZERO) == CommonConstants.ONE_INT) {
+			if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {
 				isExist = true;
 			}
 		}
 
-		int isSum = 0;
 		if (Common.isNotNull(settleDomain)) {
 			// 含有社保，则计算收入
 			if (Common.isNotNull(settleDomain.getManageServerItem()) && settleDomain.getManageServerItem()

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

@@ -51,11 +51,13 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService;
+import com.yifu.cloud.plus.v1.yifu.social.util.DoJointSocialTask;
 import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryExportVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
@@ -95,6 +97,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 
 	private final TSendEkpErrorService tSendEkpErrorService;
 
+	@Autowired
+	private DoJointSocialTask doJointSocialTask;
+
 	/**
 	 * 预估费用简单分页查询
 	 *
@@ -2371,9 +2376,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	}
 
 	public void initEkpPushSocialParam(List<TForecastLibrary> unPushInfo) {
-		List<String> pushList = new ArrayList<>();
-		Map<String,Integer> map = new HashMap<>();
-		Map<String,String> idMap = new HashMap<>();
 		R<TSettleDomainListVo> listVo;
 		List<TSettleDomainSelectVo> settleDomainR;
 		for (TForecastLibrary library : unPushInfo) {
@@ -2605,60 +2607,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			socialParam.setFd_3b0afbe1f94a08(library.getId());
 			// 薪酬申请编号
 			socialParam.setFd_3b3cab77923f44(CommonConstants.EMPTY_STRING);
-			String body = ekpSocialUtil.sendToEKP(socialParam);
-			if (Common.isNotNull(body) && body.length() == 32) {
-				//更新推送状态为已推送的列表
-				pushList.add(library.getId());
-				if (pushList.size() >= CommonConstants.FIVES_INT) {
-					baseMapper.updatePushStatus(pushList);
-					pushList.clear();
-				}
-			}else {
-				if (map.get(body) > 0) {
-					int i = map.get(body) + 1;
-					map.put(body,i);
-					idMap.put(body,library.getId());
-					//单个异常超过十次，保存异常内容
-					if (i >= 10) {
-						baseMapper.updatePushStatus(pushList);
-						for (String key: map.keySet()) {
-							TSendEkpError error = new TSendEkpError();
-							error.setCreateTime(new Date());
-							error.setCreateDay(DateUtil.getThisDay());
-							error.setType(CommonConstants.TWO_STRING);
-							error.setLinkId(library.getId());
-							error.setTitle(key);
-							error.setNums(map.get(key));
-							tSendEkpErrorService.save(error);
-						}
-						break;
-					}
-				} else {
-					map.put(body,1);
-					idMap.put(body,library.getId());
-				}
-			}
-		}
-		for (String key: map.keySet()) {
-			TSendEkpError error = new TSendEkpError();
-			error.setCreateTime(new Date());
-			error.setCreateDay(DateUtil.getThisDay());
-			error.setType(CommonConstants.TWO_STRING);
-			error.setTitle(key);
-			error.setLinkId(idMap.get(key));
-			error.setNums(map.get(key));
-			tSendEkpErrorService.save(error);
-		}
-		//更新推送状态
-		if (Common.isNotNull(pushList)) {
-			baseMapper.updatePushStatus(pushList);
+			doJointSocialTask.asynchronousEkpForecastSocial(socialParam, library);
 		}
 	}
 
 	public void initEkpPushFundParam(List<TForecastLibrary> unPushInfo) {
-		List<String> pushList = new ArrayList<>();
-		Map<String,Integer> map = new HashMap<>();
-		Map<String,String> idMap = new HashMap<>();
 		R<TSettleDomainListVo> listVo;
 		List<TSettleDomainSelectVo> settleDomainR;
 		for (TForecastLibrary library : unPushInfo) {
@@ -2788,53 +2741,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			fundParam.setFd_3b0afbaf10df2c(library.getId());
 			// 薪酬申请编号
 			fundParam.setFd_3b3cabde83d1d0(CommonConstants.EMPTY_STRING);
-			String body = ekpFundUtil.sendToEKP(fundParam);
-			if (Common.isNotNull(body) && body.length() == 32) {
-				//更新推送状态为已推送的列表
-				pushList.add(library.getId());
-				if (pushList.size() >= CommonConstants.FIVES_INT) {
-					baseMapper.updatePushStatus(pushList);
-					pushList.clear();
-				}
-			}else {
-				if (map.get(body) > 0) {
-					int i = map.get(body) + 1;
-					map.put(body,i);
-					idMap.put(body,library.getId());
-					//单个异常超过十次，保存异常内容
-					if (i >= 10) {
-						baseMapper.updatePushStatus(pushList);
-						for (String key: map.keySet()) {
-							TSendEkpError error = new TSendEkpError();
-							error.setCreateTime(new Date());
-							error.setCreateDay(DateUtil.getThisDay());
-							error.setType(CommonConstants.TWO_STRING);
-							error.setLinkId(library.getId());
-							error.setTitle(key);
-							error.setNums(map.get(key));
-							tSendEkpErrorService.save(error);
-						}
-						break;
-					}
-				} else {
-					map.put(body,1);
-					idMap.put(body,library.getId());
-				}
-			}
-		}
-		for (String key: map.keySet()) {
-			TSendEkpError error = new TSendEkpError();
-			error.setCreateTime(new Date());
-			error.setCreateDay(DateUtil.getThisDay());
-			error.setType(CommonConstants.TWO_STRING);
-			error.setLinkId(idMap.get(key));
-			error.setTitle(key);
-			error.setNums(map.get(key));
-			tSendEkpErrorService.save(error);
-		}
-		//更新推送状态
-		if (Common.isNotNull(pushList)) {
-			baseMapper.updatePushStatus(pushList);
+			doJointSocialTask.asynchronousEkpForecastFund(fundParam, library);
 		}
 	}
 
@@ -2883,35 +2790,28 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			}
 		}
 
-		int isSum = 0;
 		if (Common.isNotNull(settleDomain)) {
 			// 含有社保，则计算收入
 			if (Common.isNotNull(settleDomain.getManageServerItem()) && ((settleDomain.getManageServerItem().contains(CommonConstants.ONE_STRING)
 					&& CommonConstants.ONE_STRING.equals(sourceType)) || (settleDomain.getManageServerItem().contains(CommonConstants.TWO_STRING)
 					&& CommonConstants.TWO_STRING.equals(sourceType)))) {
 				//预估模式
-				if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
-					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-						if (!isExist) {
-							createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
-									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
-									settleDomain.getManagementFee(), sourceType);
-						}
-					}
+				if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag()) &&
+						CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) && !isExist) {
+					createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
+							settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
+							settleDomain.getManagementFee(), sourceType);
 				}
 			}
 			if (Common.isNotNull(settleDomain.getRiskServerItem()) && ((settleDomain.getRiskServerItem().contains(CommonConstants.ONE_STRING)
 					&& CommonConstants.ONE_STRING.equals(sourceType)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING)
 					&& CommonConstants.TWO_STRING.equals(sourceType)))) {
 				//预估模式
-				if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
-					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-						if (!isExist) {
-							createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
-									settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
-									settleDomain.getRiskFundFee(), sourceType);
-						}
-					}
+				if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag()) &&
+						CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) && !isExist) {
+					createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
+							settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
+							settleDomain.getRiskFundFee(), sourceType);
 				}
 			}
 		}