收入优化

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

@@ -242,7 +242,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				, "/tsettledomain/inner/getSettleDomainVoById", tSalaryStandard.getDeptId()
 				, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
 		// 结算主体
-		TSettleDomainSelectVo dept = null;
+		TSettleDomainSelectVo dept;
 		if (sdr != null && sdr.getData() != null) {
 			dept = sdr.getData();
 		} else {
@@ -313,7 +313,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 							TIncomeDetailReturnVo vo = detailR.getData();
 							List<TIncomeDetail> detailList = vo.getDetailList();
 							for (TIncomeDetail incomeDetail : detailList) {
-								value = detailMap.get(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType());
+								value = detailMap.get(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+										+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType());
 								if (Common.isEmpty(value)) {
 									value = CommonConstants.ZERO_INT;
 								}
@@ -322,7 +323,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 								} else {
 									value--;
 								}
-								detailMap.put(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType(), value);
+								detailMap.put(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+										+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType(), value);
 							}
 						}
 					} else {
@@ -357,13 +359,13 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 		if (salaryAccountList != null && !salaryAccountList.isEmpty()) {
 			BigDecimal money;
 			for (TSalaryAccount account : salaryAccountList) {
-				value = detailMap.get(account.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + isManage
+				value = detailMap.get(account.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+						+ account.getDeptId() + CommonConstants.DOWN_LINE_STRING + isManage
 						+ CommonConstants.DOWN_LINE_STRING
 						+ CommonConstants.FOUR_STRING);
 				if (Common.isEmpty(value) || value == 0) {
 					detail = new TIncomeDetail();
 					detail.setPayMonth(account.getSalaryMonth());
-					detail.setCharges(String.valueOf(dept.getManagementFee()));
 					detail.setDeptId(account.getDeptId());
 					detail.setDeptName(account.getDeptName());
 					detail.setDeptNo(account.getDeptNo());
@@ -375,9 +377,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 					detail.setEmpName(account.getEmpName());
 					detail.setFeeMode(dept.getManagementType());
 					detail.setFeeType(isManage);
+					detail.setCharges(String.valueOf(dept.getManagementFee()));
 					money = dept.getManagementFee();
 					if (CommonConstants.TWO_STRING.equals(isManage)) {
 						money = dept.getRiskFundFee();
+						detail.setCharges(String.valueOf(dept.getRiskFundFee()));
 					}
 					if (CommonConstants.ONE_STRING.equals(feeType)) {
 						money = BigDecimalUtils.safeMultiply(account.getRelaySalary(), money, CommonConstants.ONE_OF_PERCENT);