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

@@ -1691,7 +1691,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				String policyNo = success.getPolicyNo();
 				boolean booleanInvoiceNo = StringUtils.isNotBlank(invoiceNo) && !invoiceNo.equals(detail.getInvoiceNo());
 				boolean booleanPolicyNo = StringUtils.isNotBlank(policyNo) && !policyNo.equals(detail.getPolicyNo());
-				boolean isEquals = Common.isNotNull(detail.getActualPremium()) && new BigDecimal(success.getActualPremium()).compareTo(detail.getActualPremium()) == 0;
+				boolean isEquals = Common.isNotNull(detail.getActualPremium()) && Common.isNotNull(success.getActualPremium()) && new BigDecimal(success.getActualPremium()).compareTo(detail.getActualPremium()) == 0;
 				//如果当前保费为空，且保单号或发票号不一样
 				if((StringUtils.isBlank(success.getActualPremium()) || isEquals) && (booleanInvoiceNo || booleanPolicyNo)){
 					if(StringUtils.isNotBlank(detail.getDefaultSettleId())){

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

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLDecoder;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -995,10 +996,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					|| SalaryConstants.ENTERPRISE_ANNUITY_JAVA.equals(item.getJavaFiedName())
 					|| SalaryConstants.WITHHOLIDING_PERSON_SOCIAL.equals(item.getJavaFiedName())
 					|| SalaryConstants.WITHHOLIDING_PERSON_FUND.equals(item.getJavaFiedName())) {
-				sum = sum.add(item.getSalaryMoney()).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+				sum = sum.add(item.getSalaryMoney()).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 			}
 		}
-		sum = realSalary.subtract(sum).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		sum = realSalary.subtract(sum).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		if (sum.compareTo(SalaryConstants.B_ZERO) < SalaryConstants.EQUAL) {
 			sum = SalaryConstants.B_ZERO;
 		}
@@ -1104,7 +1105,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 	 **/
 	private BigDecimal getSocialFundMoney(TSalaryAccount a, List<TPaymentBySalaryVo> estmateList, boolean isSocial
 			, boolean isPerson, Set<String> socialList, Set<String> fundList, BigDecimal money, BigDecimal sub) {
-		money = money.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		money = money.setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		for (TPaymentBySalaryVo m : estmateList) {
 			if (Common.isNotNull(a.getEmpIdcard()) && a.getEmpIdcard().equals(m.getEmpIdcard())) {
 				//社保
@@ -1276,7 +1277,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		if (res.compareTo(SalaryConstants.B_ZERO) < SalaryConstants.EQUAL) {
 			return SalaryConstants.B_ZERO;
 		}
-		res = res.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		res = res.setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		a.setSalaryTax(res);
 		return res;
 	}
@@ -1340,12 +1341,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 							BigDecimalUtils.safeMultiply(actualSalarySum, new BigDecimal("0.32")), new BigDecimal("7000"))
 					, new BigDecimal("0.68"));
 		}
-		nowTax = nowTax.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		nowTax = nowTax.setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		if (sumTax.compareTo(BigDecimal.ZERO) != 0) {
-			nowTax = BigDecimalUtils.safeSubtract(nowTax, sumTax).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+			nowTax = BigDecimalUtils.safeSubtract(nowTax, sumTax).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		}
 
-		BigDecimal relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTax).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		BigDecimal relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTax).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		// 本次个人应发合计
 		TSalaryAccountItem sai = new TSalaryAccountItem();
 		sai.setCnName(SalaryConstants.RELAY_SALARY);
@@ -1656,6 +1657,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		BigDecimal actualSalarySum = BigDecimal.ZERO;
 		// 历史个税合计
 		BigDecimal sumTax = BigDecimal.ZERO;
+		// 个人承担部分历史个税合计
+		BigDecimal sumOtherTax;
 		// 历史应发合计
 		BigDecimal sumSalaryTax = BigDecimal.ZERO;
 		// 本次实发
@@ -1686,29 +1689,35 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		if (SalaryConstants.IS_PERSON_OTHER.equals(a.getIsPersonTax())) {
 			nowTaxT = getNowTax(actualSalarySumNow);
 			if (actualSalarySum.compareTo(actualSalarySumNow) != 0) {
-				actualSalarySumT = BigDecimalUtils.safeAdd(nowTaxT, sumSalaryTax, actualSalarySumNow).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+				//计算历史税费
+				sumOtherTax = getNowTaxNew(sumSalaryTax);
+				//计算本月实发合计
+				actualSalarySumT = BigDecimalUtils.safeAdd(nowTaxT, sumSalaryTax, actualSalarySumNow).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
+				//累计税费
 				nowTaxY = getNowTaxNew(actualSalarySumT);
-				if (sumTax.compareTo(BigDecimal.ZERO) != 0) {
-					nowTaxY = BigDecimalUtils.safeSubtract(nowTaxY, sumTax).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+				if (sumOtherTax.compareTo(BigDecimal.ZERO) != 0) {
+					nowTaxY = BigDecimalUtils.safeSubtract(nowTaxY, sumOtherTax).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 				}
 				salaryTax = BigDecimalUtils.safeSubtract(nowTaxY, nowTaxT);
 			} else {
 				nowTaxY = nowTaxT;
 			}
-			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxT).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+			//公司应发
+			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxT).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 
 			a.setSalaryTax(salaryTax);
 			a.setSalaryTaxUnit(nowTaxT);
 			a.setActualSalary(BigDecimalUtils.safeSubtract(actualSalarySumNow, salaryTax));
 		} else if (SalaryConstants.IS_COMPANY.equals(a.getIsPersonTax())) {
-			getNowTax(actualSalarySumNow);
 			nowTaxY = getNowTax(actualSalarySum);
 			a.setActualSalary(actualSalarySumNow);
-			if (sumTax.compareTo(BigDecimal.ZERO) != 0) {
-				nowTaxY = BigDecimalUtils.safeSubtract(nowTaxY, sumTax).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+			if (sumSalaryTax.compareTo(BigDecimal.ZERO) != 0) {
+				//历史应发税费
+				sumOtherTax = getNowTax(sumSalaryTax);
+				nowTaxY = BigDecimalUtils.safeSubtract(nowTaxY, sumOtherTax).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 			}
 			a.setSalaryTaxUnit(nowTaxY);
-			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		} else {
 
 			// TODO-@胡 ：个人承担全部税费，实发要变为应发，推算出实发、个税
@@ -1753,7 +1762,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 							BigDecimalUtils.safeMultiply(actualSalarySum, new BigDecimal("0.32")), new BigDecimal("7000"))
 					, new BigDecimal("0.68"));
 		}
-		nowTax = nowTax.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		nowTax = nowTax.setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		return nowTax;
 	}
 
@@ -1776,7 +1785,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			nowTax = BigDecimalUtils.safeSubtract(BigDecimalUtils.safeMultiply(actualSalarySum, new BigDecimal("0.32"))
 					, new BigDecimal("7000"));
 		}
-		nowTax = nowTax.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		nowTax = nowTax.setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		return nowTax;
 	}
 
@@ -1930,7 +1939,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		//个人税费
 		BigDecimal nowTaxT = getNowTaxRemu(actualSalarySumNow);
 		BigDecimal relaySalary;
-		relaySalary = BigDecimalUtils.safeSubtract(actualSalarySumNow, nowTaxT).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		relaySalary = BigDecimalUtils.safeSubtract(actualSalarySumNow, nowTaxT).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		a.setSalaryTax(nowTaxT);
 		a.setActualSalary(relaySalary);
 		a.setRelaySalaryUnit(actualSalarySumNow);
@@ -1957,7 +1966,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			//x*0.16*0.7
 			nowTax = BigDecimalUtils.safeMultiply(actualSalarySum, new BigDecimal("0.112"));
 		}
-		nowTax = nowTax.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		nowTax = nowTax.setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		return nowTax;
 	}
 

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

@@ -55,6 +55,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -200,7 +201,6 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 			response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName  , "UTF-8"));
 			// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
 			ExcelWriter excelWriter = EasyExcel.write(out, TStatisticsBonusImportVo.class).build();
-			int index = 0;
 			//个税配置
 			List<TSalaryTaxConfig> personTax = tSalaryTaxConfigService.getTaxConfigByPersonList(new TSalaryTaxConfig());
 			//年终奖配置
@@ -245,13 +245,12 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 					isTax = BigDecimal.ZERO;
 					twlSalaryTax = BigDecimal.ZERO;
 					//12月是否发薪
-					Boolean isSend = false;
+					boolean isSend = false;
 					//年终奖单独扣税12月税费
 					finalSalaryNoSalary = BigDecimal.ZERO;
 					//年终奖合并扣税12月税费
 					finalSalaryWithSalary = BigDecimal.ZERO;
 					//12月份应纳税所得额扣除费用
-					BigDecimal deductTaxSalary = infoVo.getDeductTaxSalary();
 					//12月社保公积金扣费
 					socialFundTax = BigDecimal.ZERO;
 					//专项扣除列表
@@ -523,30 +522,29 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 			//本次薪资纳税额
 			res = BigDecimal.ZERO;
 			//本次年终奖纳税额
-			anRes = BigDecimal.ZERO;;
+			anRes = BigDecimal.ZERO;
 			//年终奖金额
 			BigDecimal annous = BigDecimalUtils.safeSubtract(wSalary,i);
 			//计算个税
-			if (i.compareTo(BigDecimal.ZERO) == SalaryConstants.MORE_THAN ) {
+			if (i.compareTo(BigDecimal.ZERO) > 0 ) {
 				BigDecimal sumI = BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(i,ySalary),
 						BigDecimalUtils.safeAdd(sumDeductSalary));
 				for (TSalaryTaxConfig sub : personTax) {
-					if (sumI.compareTo(sub.getMinIncome()) == SalaryConstants.MORE_THAN
+					if (sumI.compareTo(sub.getMinIncome()) > 0
 							&& sumI.compareTo(sub.getMaxIncome()) != SalaryConstants.MORE_THAN) {
-						//sumI = realDeduSalary * ((double) ((i.getTaxRate() * 1.0) / 100)) - sumTax - sub.getQuick();
 						//累计个税
 						res = BigDecimalUtils.safeSubtract(sumI.multiply(new BigDecimal(sub.getWithholdingRate()).divide(
-								SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP)), sub.getQuickDeducation());
+								SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, RoundingMode.HALF_UP)), sub.getQuickDeducation());
 						//本次个税
 						BigDecimal bcTax = res.subtract(BigDecimalUtils.safeAdd(sumTax,twlSalaryTax));
-						if (bcTax.compareTo(BigDecimal.ZERO) == SalaryConstants.MORE_THAN ||
+						if (bcTax.compareTo(BigDecimal.ZERO) > 0 ||
 								bcTax.compareTo(BigDecimal.ZERO) == SalaryConstants.EQUAL) {
 							res = BigDecimalUtils.safeAdd(bcTax,twlSalaryTax);
 						} else {
 							res = BigDecimalUtils.safeAdd(twlSalaryTax,sumTax);
 						}
 						res = BigDecimalUtils.safeSubtract(sumI.multiply(new BigDecimal(sub.getWithholdingRate()).divide(
-										SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP)),
+										SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, RoundingMode.HALF_UP)),
 										BigDecimalUtils.safeAdd(sumTax,sub.getQuickDeducation()));
 						break;
 					}
@@ -556,15 +554,15 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 			}
 			//计算年终奖税
 			//年终奖
-			if (annous != null && annous.compareTo(SalaryConstants.B_ZERO) == SalaryConstants.MORE_THAN
+			if (annous != null && annous.compareTo(SalaryConstants.B_ZERO) > 0
 					&& annousTax != null && annousTax.size() > CommonConstants.ZERO_INT) {
-				BigDecimal month = annous.divide(SalaryConstants.B_TWELVE, SalaryConstants.TAX_FEE_PLACES, BigDecimal.ROUND_HALF_UP);
+				BigDecimal month = annous.divide(SalaryConstants.B_TWELVE, SalaryConstants.TAX_FEE_PLACES, RoundingMode.HALF_UP);
 				// 应纳税额
 				for (TSalaryTaxConfig sub : annousTax) {
-					if (month.compareTo(sub.getMinIncome()) == SalaryConstants.MORE_THAN
+					if (month.compareTo(sub.getMinIncome()) > 0
 							&& month.compareTo(sub.getMaxIncome()) != SalaryConstants.MORE_THAN) {
 						anRes = annous.multiply(new BigDecimal(sub.getWithholdingRate()).divide(
-										SalaryConstants.B_ONEHUNDRED, SalaryConstants.TAX_FEE_PLACES, BigDecimal.ROUND_HALF_UP))
+										SalaryConstants.B_ONEHUNDRED, SalaryConstants.TAX_FEE_PLACES, RoundingMode.HALF_UP))
 								.subtract(sub.getQuickDeducation());
 						break;
 					}

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

@@ -74,7 +74,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="接单分公司")
 	@Size(max = 50, message = "接单分公司不可超过50位")
-	@ExcelAttribute(name = "接单分公司", maxLength = 50)
+	@ExcelAttribute(name = "接单分公司", isNotEmpty = true ,errorInfo = "接单分公司不能为空", maxLength = 50)
 	private String company;
 
     /**