MVP1.5-薪资导入优化（社保基数）

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

@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
 
+import java.util.List;
+
 /**
  * 公积金政策对应的缴费比例表
  *
@@ -36,4 +38,13 @@ public interface SysPayProportionService extends IService<SysPayProportion> {
 	 * @return
 	 */
 	IPage<SysPayProportion> getSysPayProportionPage(Page<SysPayProportion> page, SysPayProportion sysPayProportion);
+
+	/**
+	 * @param sysBaseSetId
+	 * @Description: 获取比例
+	 * @Author: hgw
+	 * @Date: 2023/2/13 15:24
+	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion>
+	 **/
+	List<SysPayProportion> getSysPayProportionByBaseId(String sysBaseSetId);
 }

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

@@ -157,6 +157,9 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 		SysBaseSetInfo old = this.getById(sysBaseSetInfo.getId());
 		if (old == null || Common.isEmpty(old.getId())) {
 			return R.failed("根据id未找到基数配置！" + sysBaseSetInfo.getId());
+		} else {
+			List<SysPayProportion> payProportionList = sysPayProportionService.getSysPayProportionByBaseId(sysBaseSetInfo.getId());
+			old.setFundProList(payProportionList);
 		}
 		SysBaseSetInfo baseSetInfo = null;
 		//	 where (b.apply_start_date < '2023-01' and ( b.apply_end_date > '2023-01' or b.apply_end_date is null) ) or b.apply_start_date > '2023-01'

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

@@ -24,6 +24,8 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.SysPayProportionMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.SysPayProportionService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 公积金政策对应的缴费比例表
  *
@@ -42,4 +44,9 @@ public class SysPayProportionServiceImpl extends ServiceImpl<SysPayProportionMap
 	public IPage<SysPayProportion> getSysPayProportionPage(Page<SysPayProportion> page, SysPayProportion sysPayProportion) {
 		return baseMapper.getSysPayProportionPage(page, sysPayProportion);
 	}
+
+	@Override
+	public List<SysPayProportion> getSysPayProportionByBaseId(String sysBaseSetId) {
+		return baseMapper.selectByPrimaryId(sysBaseSetId);
+	}
 }