Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainUpdVo.java

+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author fxj
+ * @Date 2022/11/23
+ * @Description
+ * @Version 1.0
+ */
+@Data
+public class TSettleDomainUpdVo implements Serializable {
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String departNo;
+
+	/**
+	 * 服务状态：0正常 1停止服务 2冻结
+	 */
+	@Schema(description = "服务状态：0正常 1停止服务 2冻结")
+	private String stopFlag;
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java

@@ -327,13 +327,19 @@ public class TSettleDomainController {
 	/**
 	 * 修改项目表--EKP调用接口
 	 * @author  hyc
-	 * @param jsonObject
+	 * @param jsonStr
 	 * @return R
 	 */
 	@Operation(summary = "更新项目服务状态--EKP调用接口", description = "更新项目服务状态--EKP调用接口")
 	@SysLog("更新项目服务状态--EKP调用接口")
 	@PostMapping("/updateProjectStopStatus")
-	public R updateProjectStopStatus(@RequestBody JSONObject jsonObject) {
-		return tSettleDomainService.updateProjectStopStatus(jsonObject);
+	public R updateProjectStopStatus(@RequestBody String jsonStr) {
+		try {
+			jsonStr = URLDecoder.decode(jsonStr, CommonConstants.UTF8).replace("=", "");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		List<TSettleDomainUpdVo> list= JSONObject.parseArray(jsonStr, TSettleDomainUpdVo.class);
+		return tSettleDomainService.updateProjectStopStatus(list);
 	}
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java

@@ -17,7 +17,6 @@
 
 package com.yifu.cloud.plus.v1.yifu.archives.service;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -104,6 +103,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
 
 	R updateProjectInfo(List<TSettleDomainEkpVo> list);
 
-	R updateProjectStopStatus(JSONObject jsonObject);
+	R updateProjectStopStatus(List<TSettleDomainUpdVo> list);
 
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -17,7 +17,6 @@
 package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -200,31 +199,36 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 	}
 
 	@Override
-	public R updateProjectStopStatus(JSONObject jsonObject) {
-		if (Common.isEmpty(jsonObject.getString("deptNo")) ||
-				Common.isEmpty(jsonObject.getString("stopFlag"))) {
+	public R updateProjectStopStatus(List<TSettleDomainUpdVo> list) {
+		if (Common.isNotNull(list)) {
+			TSettleDomain settleDomain;
+			for (TSettleDomainUpdVo settleDomainUpdVo : list) {
+				if (Common.isEmpty(settleDomainUpdVo.getDepartNo()) ||
+						Common.isEmpty(settleDomainUpdVo.getStopFlag())) {
 					return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
 				}
-		String deptNo = jsonObject.getString("deptNo");
-		String stopFlag = jsonObject.getString("stopFlag");
-		if (!CommonConstants.ONE_STRING.equals(stopFlag) && !CommonConstants.TWO_STRING.equals(stopFlag) &&
-				!CommonConstants.ZERO_STRING.equals(stopFlag)) {
+				if (!CommonConstants.ONE_STRING.equals(settleDomainUpdVo.getStopFlag()) &&
+						!CommonConstants.TWO_STRING.equals(settleDomainUpdVo.getStopFlag()) &&
+						!CommonConstants.ZERO_STRING.equals(settleDomainUpdVo.getStopFlag())) {
 					return R.failed("服务状态传参错误");
 				}
-		TSettleDomain settleDomain;
 				settleDomain = baseMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
-				.eq(TSettleDomain::getDepartNo,deptNo)
-				.eq(TSettleDomain::getDeleteFlag,CommonConstants.ZERO_STRING)
+						.eq(TSettleDomain::getDepartNo, settleDomainUpdVo.getDepartNo())
+						.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
 						.last(CommonConstants.LAST_ONE_SQL));
 				if (Common.isEmpty(settleDomain)) {
 					return R.failed("不存在该项目");
 				}
-		if (settleDomain.getStopFlag().equals(stopFlag)) {
+				if (settleDomain.getStopFlag().equals(settleDomainUpdVo.getStopFlag())) {
 					return R.failed("不可重复变更项目服务状态");
 				}
-		settleDomain.setStopFlag(stopFlag);
+				settleDomain.setStopFlag(settleDomainUpdVo.getStopFlag());
 				baseMapper.updateById(settleDomain);
+			}
 			return R.ok();
+		}else {
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
 	}
 
 	private String checkInfo(TSettleDomain domain) {

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -505,6 +505,11 @@ public class TSalaryAccount extends BaseEntity {
 	@ExcelProperty(value = "累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 
+	@ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "累计个人养老金")
+	private BigDecimal sumPrivatePension;
+
 	@ExcelAttribute(name = "年终奖单独扣税税费", isFloat = true,max = "999999999.99")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value = "年终奖单独扣税税费")

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSpecialDeducationSum.java

@@ -188,6 +188,15 @@ public class TSpecialDeducationSum extends BaseEntity {
 	@ExcelProperty(value = "累计婴幼儿照护费用")
      private BigDecimal sumBabyMoney;
 
+	 /**
+      * 累计个人养老金
+      * hgw 2022-12-13 17:15:48 樊青青提的需求
+      */
+     @ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")
+     @HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "累计个人养老金")
+     private BigDecimal sumPrivatePension;
+
      /**
       * 企业(职业)年金
       */

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

@@ -687,6 +687,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					sdSum = sdSum.add(this.saveNewItems(saiList, SalaryConstants.SUM_BABY_MONEY,
 							SalaryConstants.SUM_BABY_MONEY_JAVA, sds.getSumBabyMoney(), CommonConstants.ZERO_INT));
 					a.setSumBabyMoney(sds.getSumBabyMoney());
+					//累计个人养老
+					sdSum = sdSum.add(this.saveNewItems(saiList, SalaryConstants.SUM_PRIVATE_PENSION,
+							SalaryConstants.SUM_PRIVATE_PENSION_JAVA, sds.getSumPrivatePension(), CommonConstants.ZERO_INT));
+					a.setSumBabyMoney(sds.getSumBabyMoney());
 					//累计专项扣除总额
 					this.saveNewItems(saiList, SalaryConstants.SPECIAL_DEDU_MONEY_SUM,
 							SalaryConstants.SPECIAL_DEDU_MONEY_SUM_JAVA, sdSum, CommonConstants.ZERO_INT);

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

@@ -292,25 +292,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 									sumTax = sumTax.add(item.getSalaryMoney());
 								}
 							}
-							if (SalaryConstants.PERSONAL_SOCIAL_JAVA.equals(item.getJavaFiedName())) {
-								isTax = isTax.add(item.getSalaryMoney());
-							}
-							if (SalaryConstants.PERSONAL_FUND_JAVA.equals(item.getJavaFiedName())) {
-								isTax = isTax.add(item.getSalaryMoney());
-							}
-							if (SalaryConstants.EXEMPTION_PERSION_TAX_JAVA.equals(item.getJavaFiedName())) {
-								isTax = isTax.add(item.getSalaryMoney());
-							}
-							if (SalaryConstants.WITHHOLIDING_PERSON_SOCIAL.equals(item.getJavaFiedName())) {
-								isTax = isTax.add(item.getSalaryMoney());
-							}
-							if (SalaryConstants.WITHHOLIDING_PERSON_FUND.equals(item.getJavaFiedName())) {
-								isTax = isTax.add(item.getSalaryMoney());
-							}
-							if (SalaryConstants.ENTERPRISE_ANNUITY_JAVA.equals(item.getJavaFiedName())) {
-								isTax = isTax.add(item.getSalaryMoney());
-							}
-							if (SalaryConstants.ONLY_CHILD_JAVA.equals(item.getJavaFiedName())) {
+							if (CommonConstants.ONE_INT == item.getIsTax()) {
 								isTax = isTax.add(item.getSalaryMoney());
 							}
 						}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java

@@ -131,6 +131,9 @@ public class SalaryConstants {
      //累计婴幼儿照护费用
      public static final String SUM_BABY_MONEY = "累计婴幼儿照护费用";
      public static final String SUM_BABY_MONEY_JAVA = "sumBabyMoney";
+	 //累计个人养老金
+	 public static final String SUM_PRIVATE_PENSION = "累计个人养老金";
+     public static final String SUM_PRIVATE_PENSION_JAVA = "sumPrivatePension";
 
      public static final String ANNUAL_BONUS_TAX = "年终奖单独扣税";
      //年终奖扣税

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -91,6 +91,7 @@
 	<result property="sumSupportElderlyMoney" column="SUM_SUPPORT_ELDERLY_MONEY"/>
 	<result property="sumContinuingEducationMoney" column="SUM_CONTINUING_EDUCATION_MONEY"/>
 	<result property="sumBabyMoney" column="SUM_BABY_MONEY"/>
+	<result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
 
   </resultMap>
 
@@ -235,7 +236,8 @@
 				a.SUM_HOUSING_RENT_MONEY,
 				a.SUM_SUPPORT_ELDERLY_MONEY,
 				a.SUM_CONTINUING_EDUCATION_MONEY,
-				a.SUM_BABY_MONEY
+				a.SUM_BABY_MONEY,
+				a.SUM_PRIVATE_PENSION
 	</sql>
     <sql id="tSalaryAccount_where">
         <if test="tSalaryAccount != null">

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSpecialDeducationSumMapper.xml

@@ -28,6 +28,7 @@
         <result property="sumSupportElderlyMoney" column="SUM_SUPPORT_ELDERLY_MONEY"/>
         <result property="sumContinuingEducationMoney" column="SUM_CONTINUING_EDUCATION_MONEY"/>
         <result property="sumBabyMoney" column="SUM_BABY_MONEY"/>
+        <result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
         <result property="enterpriseAnnuity" column="ENTERPRISE_ANNUITY"/>
         <result property="takingRisks" column="TAKING_RISKS"/>
         <result property="taxDeferredInsurance" column="TAX_DEFERRED_INSURANCE"/>
@@ -64,6 +65,7 @@
         SUM_SUPPORT_ELDERLY_MONEY,
         SUM_CONTINUING_EDUCATION_MONEY,
         SUM_BABY_MONEY,
+        SUM_PRIVATE_PENSION,
         ENTERPRISE_ANNUITY,
         TAKING_RISKS,
         TAX_DEFERRED_INSURANCE,