社保公积金查询-导出

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/DateUtil.java

@@ -1247,6 +1247,15 @@ public class DateUtil {
           return sdf.format(cal.getTime());
      }
 
+	 public static Date addMonthByDate(Date date, int mnt) {
+          Calendar cal = Calendar.getInstance();
+		  if (date != null) {
+			  cal.setTime(date);
+		  }
+          cal.add(Calendar.MONTH, mnt);
+          return cal.getTime();
+     }
+
      /**
       * @param mnt 增减日的 值
       * @Description: 增减日

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

@@ -68,4 +68,13 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	 **/
 	R<String> updateToneForecastLibary(TSocialFundInfo socialFundInfo);
 
+	/**
+	 * @param socialFundInfo
+	 * @Description: 派单变更预估库
+	 * @Author: hgw
+	 * @Date: 2022/7/26 19:02
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	R<String> updateForecastLibaryByDispatch(TSocialFundInfo socialFundInfo);
+
 }

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

@@ -22,6 +22,7 @@ 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.Common;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
@@ -150,9 +151,9 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 			return R.failed("对应户、地市、有效期的基数配置已存在！");
 		}
 
-		// 将上一个无截止月的增加截止月
+		// 将上一个无截止月的增加截止月（本次起始月的上一个月）
 		if (lastBase != null) {
-			lastBase.setApplyEndDate(sysBaseSetInfo.getApplyStartDate());
+			lastBase.setApplyEndDate(DateUtil.addMonthByDate(sysBaseSetInfo.getApplyStartDate(), -1));
 			this.updateById(lastBase);
 		}
 		this.saveOrUpdateBaseAndFundPro(sysBaseSetInfo);

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

@@ -1179,6 +1179,22 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 **/
 	@Override
 	public R<String> updateToneForecastLibary(TSocialFundInfo socialFundInfo) {
+		return this.updateForecastLibaryCore(socialFundInfo);
+	}
+
+	@Override
+	public R<String> updateForecastLibaryByDispatch(TSocialFundInfo socialFundInfo) {
+		return this.updateForecastLibaryCore(socialFundInfo);
+	}
+
+	/**
+	 * @param socialFundInfo
+	 * @Description: 根据社保公积金信息表更新预估库
+	 * @Author: hgw
+	 * @Date: 2022/7/26 19:01
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	private R<String> updateForecastLibaryCore(TSocialFundInfo socialFundInfo) {
 		String empIdCard = socialFundInfo.getEmpIdcard();
 		//定义未推送的按条件查询得到的预估数据
 		List<TForecastLibrary> librarySocialList = null;