明细接口改造

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

@@ -356,8 +356,8 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
 		//付款状态
 		socialInfo.setFd_3add9eed23894a("未付");
 		//单号
-		socialInfo.setFd_3adfe95c169c48("SB" + LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.DATE_PATTERN));
-//				+ "_" + socialParam.getFd_3b0afbe1f94a08());
+		socialInfo.setFd_3adfe95c169c48("SB" + LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.DATE_PATTERN)
+				+ "_" + socialParam.getFd_3b0afbe1f94a08());
 	}
 
 

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

@@ -693,8 +693,8 @@
 			 ,ifnull(withholidingPersonFund.SALARY_MONEY,'') fd_3b16ce4b7fc42a
 		     ,ifnull(withholidingUnitSocial.SALARY_MONEY,'') fd_3bcd41d857b764
 			 ,ifnull(withholidingUnitFund.SALARY_MONEY,'') fd_3bcd41d77e4812
-			 ,ifnull(withholidingUnitSocial.SALARY_MONEY,'0')+ifnull(withholidingPersonSocial.SALARY_MONEY,'0') social_sum
-			 ,ifnull(withholidingUnitFund.SALARY_MONEY,'0')+ifnull(withholidingPersonFund.SALARY_MONEY,'0') fund_sum
+			 ,round(ifnull(withholidingUnitSocial.SALARY_MONEY,'0')+ifnull(withholidingPersonSocial.SALARY_MONEY,'0'),2) social_sum
+			 ,round(ifnull(withholidingUnitFund.SALARY_MONEY,'0')+ifnull(withholidingPersonFund.SALARY_MONEY,'0'),2)  fund_sum
 			 ,concat(left(ifnull(a.DEDU_SOCIAL_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_SOCIAL_MONTH,'02'),2)) DEDU_SOCIAL_MONTH
 			 ,concat(left(ifnull(a.DEDU_PROVIDENT_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_PROVIDENT_MONTH,'02'),2)) DEDU_PROVIDENT_MONTH
 			,ifnull(s.BPO_FLAG,'') fd_3b178f0ded2114