明细接口改造

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java

@@ -7,12 +7,14 @@ import com.yifu.cloud.plus.v1.ekp.mapper.EkpSalaryInfoMapper;
 import com.yifu.cloud.plus.v1.ekp.service.EkpSalaryInfoService;
 import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.BigDecimalUtils;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -68,13 +70,15 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
 				salaryInfo.setFd_3b13b1b91f5b34("全量未结算数据".equals(deptInfo.getSocialType()) ? "是" : "否");
 				//应收
 				salaryInfo.setFd_3adfee21802434("是".equals(salaryInfo.getFd_3b178f3e24cc32()) ? CommonConstants.ZERO_INTEGER.doubleValue() : salaryInfo.getFd_3adfee20fe5ba4());
+
 				//代扣费用应支出 = $个人社保$ Fd_3adfee1e88723e + $单位公积金$ Fd_3adfee1ee24680 + $个人公积金$ Fd_3adfee1f32fa24 + $单位社保$ Fd_3adfee1e2b2f78 + $个人代扣$ Fd_3adfee1374ed7a
-				Double[] numbers = {Common.isEmpty(salaryInfo.getFd_3adfee1e88723e()) ? 0 :salaryInfo.getFd_3adfee1e88723e(),
-						Common.isEmpty(salaryInfo.getFd_3adfee1ee24680()) ? 0 :salaryInfo.getFd_3adfee1e88723e(),
-						Common.isEmpty(salaryInfo.getFd_3adfee1f32fa24()) ? 0 :salaryInfo.getFd_3adfee1f32fa24(),
-						Common.isEmpty(salaryInfo.getFd_3adfee1e2b2f78()) ? 0 :salaryInfo.getFd_3adfee1e2b2f78(),
-						Common.isEmpty(salaryInfo.getFd_3adfee1374ed7a()) ? 0 :salaryInfo.getFd_3adfee1374ed7a()};
-				salaryInfo.setFd_3adfeeb34ea0ea(Arrays.stream(numbers).reduce(Double::sum).orElse(0.0));
+				BigDecimal zhichu1 = Common.isEmpty(salaryInfo.getFd_3adfee1e88723e()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1e88723e());
+				BigDecimal zhichu2 = Common.isEmpty(salaryInfo.getFd_3adfee1ee24680()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1ee24680());
+				BigDecimal zhichu3 = Common.isEmpty(salaryInfo.getFd_3adfee1f32fa24()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1f32fa24());
+				BigDecimal zhichu4 = Common.isEmpty(salaryInfo.getFd_3adfee1e2b2f78()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1e2b2f78());
+				BigDecimal zhichu5 = Common.isEmpty(salaryInfo.getFd_3adfee1374ed7a()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1374ed7a());
+//				salaryInfo.setFd_3adfeeb34ea0ea(Arrays.stream(numbers).reduce(Double::sum).orElse(0.0));
+				salaryInfo.setFd_3adfeeb34ea0ea(BigDecimalUtils.safeAdd(zhichu1,zhichu2,zhichu3,zhichu4,zhichu5).doubleValue());
 
 				//创建时间
 				salaryInfo.setCreateTime(DateUtil.getCurrentDateTime());
@@ -232,7 +236,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
 		//个税应支出
 		salaryInfo.setFd_3adfeec6db8766(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfee1f901c46()) ? null : Double.parseDouble(salaryParam.getFd_3adfee1f901c46()));
 		//实发合计应支出
-		salaryInfo.setFd_3adfeec730ec44(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfeec730ec44()) ? null : Double.parseDouble(salaryParam.getFd_3adfeec730ec44()));
+		salaryInfo.setFd_3adfeec730ec44(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfee20fe5ba4()) ? null : Double.parseDouble(salaryParam.getFd_3adfee20fe5ba4()));
 		//企业年金单位应支出
 		salaryInfo.setFd_3adfeec782070a(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfeec782070a()) ? null : Double.parseDouble(salaryParam.getFd_3adfeec782070a()));
 		//企业年金个人应支出

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

@@ -770,6 +770,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 		socialParam.setFd_3b3cab77923f44(s.getApplyNo() == null ? "" : s.getApplyNo());
 		//预估
 		socialParam.setYgFlag(CommonConstants.ONE_STRING);
+		//创建人姓名
+		socialParam.setFd_3b438e33f37378(account.getFd_3adfedfb5a68a2());
 		socialPushList.add(socialParam);
 	}
 
@@ -843,6 +845,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 		socialParam.setFd_3b178ea361cabe(s.getBpoFlag());
 		// 薪酬申请编号
 		socialParam.setFd_3b3cabde83d1d0(s.getApplyNo() == null ? "" : s.getApplyNo());
+		//创建人姓名
+		socialParam.setFd_3b43922217c6f8(account.getFd_3adfedfb5a68a2());
 		fundPushList.add(socialParam);
 	}