去掉了isSettle：倩倩说的

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java

@@ -513,12 +513,6 @@ public class TForecastLibrary extends BaseEntity {
 	@ExcelAttribute(name = "数据类型：预估/差额")
 	@ExcelProperty("数据类型：预估/差额")
 	private String diffType;
-	/**
-	 * 是否结算：0否/1是
-	 */
-	@ExcelAttribute(name = "是否结算")
-	@ExcelProperty("是否结算")
-	private String isSettle;
 
 	@TableField(exist = false)
 	private List<String> idList;

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

@@ -149,12 +149,11 @@ public class TForecastLibraryController {
 	@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_create')")
 	public R<String> createForecastlibary(@RequestParam String payMonths
 			, @RequestParam(value = "empIdCard", required = false) String empIdCard
-			, @RequestParam(value = "settleDomainIds", required = false) String settleDomainIds
-			,@RequestParam String isSettle) {
+			, @RequestParam(value = "settleDomainIds", required = false) String settleDomainIds) {
 		if (Common.isEmpty(empIdCard) && Common.isEmpty(settleDomainIds)) {
 			return R.failed("参数有误：身份证或项目ID不可为空！");
 		}
-		return tForecastLibraryService.createForecastlibary(payMonths, empIdCard, settleDomainIds, isSettle);
+		return tForecastLibraryService.createForecastlibary(payMonths, empIdCard, settleDomainIds);
 	}
 
 	/**

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

@@ -54,7 +54,7 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	 * @Date: 2022/7/18 17:11
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
 	 **/
-	R<String> createForecastlibary(String payMonths, String empIdCard, String settleDomainIds, String isSettle);
+	R<String> createForecastlibary(String payMonths, String empIdCard, String settleDomainIds);
 
 	/**
 	 * @param socialFundInfo

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

@@ -26,7 +26,6 @@ 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.*;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TAgentConfig;
@@ -39,7 +38,6 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
 import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryExportVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
@@ -182,7 +180,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
 	 **/
 	@Override
-	public R<String> createForecastlibary(String payMonths, String empIdCard, String settleDomainIds, String isSettle) {
+	public R<String> createForecastlibary(String payMonths, String empIdCard, String settleDomainIds) {
 		//定义未推送的按条件查询得到的预估数据
 		List<TForecastLibrary> librarySocialList = null;
 		//定义已推送的按条件查询得到的预估数据
@@ -287,7 +285,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			if (Common.isEmpty(library.getSocialId()) && Common.isEmpty(library.getProvidentId())) {
 				continue;
 			}
-			library.setIsSettle(isSettle);
 			if (Common.isNotNull(library.getId())) {
 				baseMapper.updateById(library);
 			} else {
@@ -1133,9 +1130,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				socialFund.setPersonalProvidentCardinal(socialSet.getUpperLimit());
 			}
 			//单边小数点处理逻辑
-			if (Common.isNotNull(socialSet.getFundPayPoint())){
-				socialFund.setUnitFundSum(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(socialFund.getUnitProvidengCardinal(), socialFund.getUnitProvidentPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())),Integer.valueOf(socialFund.getFundPayPoint())));
-				socialFund.setPersonalFundSum(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(socialFund.getPersonalProvidentCardinal(), socialFund.getPersonalProvidentPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())),Integer.valueOf(socialFund.getFundPayPoint())));
+			if (Common.isNotNull(socialSet.getFundPayPoint())) {
+				socialFund.setUnitFundSum(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(socialFund.getUnitProvidengCardinal(), socialFund.getUnitProvidentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())), Integer.valueOf(socialFund.getFundPayPoint())));
+				socialFund.setPersonalFundSum(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(socialFund.getPersonalProvidentCardinal(), socialFund.getPersonalProvidentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())), Integer.valueOf(socialFund.getFundPayPoint())));
 			}
 		}
 	}

yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml

@@ -97,7 +97,6 @@
 		<result property="dataPush" column="DATA_PUSH"/>
 		<result property="dataType" column="DATA_TYPE"/>
 		<result property="diffType" column="DIFF_TYPE"/>
-		<result property="isSettle" column="IS_SETTLE"/>
 		<result property="createBy" column="CREATE_BY"/>
 		<result property="createName" column="CREATE_NAME"/>
 		<result property="createTime" column="CREATE_TIME"/>
@@ -241,7 +240,6 @@
 		a.DATA_PUSH,
 		a.DATA_TYPE,
 		a.DIFF_TYPE,
-		a.IS_SETTLE,
 		a.CREATE_BY,
 		a.CREATE_NAME,
 		a.CREATE_TIME,
@@ -472,9 +470,6 @@
 			<if test="tForecastLibrary.diffType != null and tForecastLibrary.diffType.trim() != ''">
 				AND a.DIFF_TYPE = #{tForecastLibrary.diffType}
 			</if>
-			<if test="tForecastLibrary.isSettle != null and tForecastLibrary.isSettle.trim() != ''">
-				AND a.IS_SETTLE = #{tForecastLibrary.isSettle}
-			</if>
 			<if test="tForecastLibrary.createBy != null and tForecastLibrary.createBy.trim() != ''">
 				AND a.CREATE_BY = #{tForecastLibrary.createBy}
 			</if>