字段迁移到 项目表

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java

@@ -29,6 +29,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.DecimalMax;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -469,4 +470,14 @@ public class TSettleDomain extends BaseEntity {
 	@ExcelProperty("风险金的收取服务项目：1社保2公积金3商险4薪酬")
 	private String riskServerItem;
 
+	/**
+	 * 单位大病比例
+	 * hgw 2022-9-8 15:40:18
+	 * 从t_depart_settlement_info表迁移过来的
+	 */
+	@ExcelAttribute(name = "单位大病比例")
+	@DecimalMax(value = "100.00", message = "单位大病比例不能大于100.00")
+	@Schema(description = "单位大病比例", name = "unitSeriousIllnessProp")
+	private BigDecimal unitSeriousIllnessProp;
+
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -88,6 +88,7 @@
 		<result property="riskFundType" column="RISK_FUND_TYPE"/>
 		<result property="manageServerItem" column="MANAGE_SERVER_ITEM"/>
 		<result property="riskServerItem" column="RISK_SERVER_ITEM"/>
+		<result property="unitSeriousIllnessProp" column="UNIT_SERIOUS_ILLNESS_PROP"/>
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -159,7 +160,8 @@
 		a.RISK_FUND_FEE,
 		a.RISK_FUND_TYPE,
 		a.MANAGE_SERVER_ITEM,
-		a.RISK_SERVER_ITEM
+		a.RISK_SERVER_ITEM,
+		a.UNIT_SERIOUS_ILLNESS_PROP
 	</sql>
 
 	<resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
@@ -218,7 +220,7 @@
 		c.CUSTOMER_NAME as 'customerName',
 		c.CUSTOMER_CODE as 'customerCode',
 		c.INDUSTRY_BELONG as 'industryBelong',
-		t.COVER_NAME as 'businessSubjectName'
+		a.INVOICE_TITLE_SALARY as 'businessSubjectName'
 		FROM
 		t_settle_domain a
 		LEFT JOIN (
@@ -227,7 +229,6 @@
 		INDUSTRY_BELONG,
 		CUSTOMER_CODE from t_customer_info
 		) c ON a.CUSTOMER_ID = c.customerId
-		LEFT JOIN t_table_head_salary_cover t on a.id=t.DEPART_ID and t.type = 0
 		WHERE a.id=#{id} GROUP BY a.id
 	</select>
 

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
@@ -484,15 +485,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		String checkYearFinalStyle;  //薪资和年终奖扣税方案(0：合并；1：单独)
 		List<TSalaryTaxConfig> personTax = tSalaryTaxConfigService.getTaxConfigByPersonList(new TSalaryTaxConfig());
 		List<TSalaryTaxConfig> annousTax = tSalaryTaxConfigService.getTaxConfigByAnnualBonusList(new TSalaryTaxConfig());
-		//结算主体-薪资配置
-		TDepartSettlementInfo deptSet = null;
-		R<TDepartSettlementInfo> deptSetR = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
-				, "/tsettledomain/inner/getInnerBySettlementId", dept.getId(), TDepartSettlementInfo.class, SecurityConstants.FROM_IN);
-		if (deptSetR == null || deptSetR.getData() == null || Common.isEmpty(deptSetR.getData().getId())) {
-			return R.failed("请去EKP系统-项目模块编辑结算主体 " + dept.getDepartName() + "（" + dept.getDepartNo() + "）的结算配置！");
-		} else {
-			deptSet = deptSetR.getData();
-		}
 		int size = savList.size();
 		TSalaryAccountItem annousSai;
 		// 自有员工人数
@@ -608,12 +600,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 						if (modelPersonSocialFlag) {
 							personalDebt = personalDebt.add(this.saveNewItems(saiList, SalaryConstants.PERSONAL_SOCIAL,
 									SalaryConstants.PERSONAL_SOCIAL_JAVA,
-									this.getSocialOrFundMoneyForForecast(socialType, deptSet, a.getEmpIdcard(), socialEstmateList, socialForecastList, true, true, socialList, fundList, forecastSocialList, forecastFundList), CommonConstants.ONE_INT));
+									this.getSocialOrFundMoneyForForecast(socialType, dept, a.getEmpIdcard(), socialEstmateList, socialForecastList, true, true, socialList, fundList, forecastSocialList, forecastFundList), CommonConstants.ONE_INT));
 						}
 						if (modelUnitSocialFlag) {
 							this.saveNewItems(saiList, SalaryConstants.UNIT_SOCIAL,
 									SalaryConstants.UNIT_SOCIAL_JAVA,
-									this.getSocialOrFundMoneyForForecast(socialType, deptSet, a.getEmpIdcard(), socialEstmateList, socialForecastList, true, false, socialList, fundList, forecastSocialList, forecastFundList), CommonConstants.ZERO_INT);
+									this.getSocialOrFundMoneyForForecast(socialType, dept, a.getEmpIdcard(), socialEstmateList, socialForecastList, true, false, socialList, fundList, forecastSocialList, forecastFundList), CommonConstants.ZERO_INT);
 						}
 					}
 					if (Common.isEmpty(a.getIsDeductFund()) || SalaryConstants.IS_DEDUCT_ONE.equals(a.getIsDeductFund())) {
@@ -622,12 +614,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 						if (modelPersonFundFlag) {
 							personalDebt = personalDebt.add(this.saveNewItems(saiList, SalaryConstants.PERSONAL_FUND,
 									SalaryConstants.PERSONAL_FUND_JAVA,
-									this.getSocialOrFundMoneyForForecast(fundType, deptSet, a.getEmpIdcard(), fundEstmateList, fundForecastList, false, true, socialList, fundList, forecastSocialList, forecastFundList), CommonConstants.ONE_INT));
+									this.getSocialOrFundMoneyForForecast(fundType, dept, a.getEmpIdcard(), fundEstmateList, fundForecastList, false, true, socialList, fundList, forecastSocialList, forecastFundList), CommonConstants.ONE_INT));
 						}
 						if (modelUnitFundFlag) {
 							this.saveNewItems(saiList, SalaryConstants.UNIT_FUND,
 									SalaryConstants.UNIT_FUND_JAVA,
-									this.getSocialOrFundMoneyForForecast(fundType, deptSet, a.getEmpIdcard(), fundEstmateList, fundForecastList, false, false, socialList, fundList, forecastSocialList, forecastFundList), CommonConstants.ZERO_INT);
+									this.getSocialOrFundMoneyForForecast(fundType, dept, a.getEmpIdcard(), fundEstmateList, fundForecastList, false, false, socialList, fundList, forecastSocialList, forecastFundList), CommonConstants.ZERO_INT);
 						}
 					}
 				}
@@ -1054,14 +1046,14 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 	 * @Date: 2019/9/26 15:38
 	 * @return: java.math.BigDecimal
 	 **/
-	public BigDecimal getSocialOrFundMoneyForForecast(String socialFundType, TDepartSettlementInfo deptSet, String idNumber
+	public BigDecimal getSocialOrFundMoneyForForecast(String socialFundType, TSettleDomain dept, String idNumber
 			, List<TPaymentBySalaryVo> estmateList, List<TPaymentBySalaryVo> forecastList, boolean isSocial, boolean isPerson
 			, Set<String> socialList, Set<String> fundList, Set<String> forecastSocialList, Set<String> forecastFundList) {
 		BigDecimal money = SalaryConstants.B_ZERO;
 		BigDecimal sub = SalaryConstants.B_ZERO;
-		if (isSocial && deptSet.getUnitSeriousIllnessProp() != null
-				&& deptSet.getUnitSeriousIllnessProp().compareTo(SalaryConstants.B_ONEHUNDRED) < SalaryConstants.EQUAL) {
-			sub = (new BigDecimal("100").subtract(deptSet.getUnitSeriousIllnessProp()))
+		if (isSocial && dept.getUnitSeriousIllnessProp() != null
+				&& dept.getUnitSeriousIllnessProp().compareTo(SalaryConstants.B_ONEHUNDRED) < SalaryConstants.EQUAL) {
+			sub = (new BigDecimal("100").subtract(dept.getUnitSeriousIllnessProp()))
 					.divide(SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
 		}
 		if (CommonConstants.ZERO_STRING.equals(socialFundType) && estmateList != null && !estmateList.isEmpty()) {