提交

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -1829,9 +1829,11 @@ public class SalaryManagementController {
 		double leave_early_cs = 0;//早退次数
 		double late_sc = 0;//迟到时长
 		double leave_early_sc = 0;//早退时长
-		double achievement_bonus = 0;//绩效奖金
-		double performance_commission = 0;//业绩提成
-		double pre_taxmakediff = 0;//税前补差
+		
+		double achievement_bonus = 0;//绩效奖金##
+		double performance_commission = 0;//业绩提成###
+		double pre_taxmakediff = 0;//税前补差###
+		
 		double matter_leave_deduction = 0;//事假扣款
 		double sick_leave_deduction = 0;//病假扣款
 		double secretary_ling = 0;//司龄
@@ -1873,6 +1875,11 @@ public class SalaryManagementController {
 					sick_leave_num = balance.getNum();
 				}//病假
 				if(xzx.getIsCustom() == 0 && xzx.getOptionid() == 12) { absenteeism_days = xzb.getXzxjg(); }//旷工天数
+				
+				if(xzx.getIsCustom() == 0 && xzx.getOptionid() == 46) { achievement_bonus = xzb.getXzxjg(); }//绩效奖金
+				if(xzx.getIsCustom() == 0 && xzx.getOptionid() == 47) { performance_commission = xzb.getXzxjg(); }//业绩提成
+				if(xzx.getIsCustom() == 0 && xzx.getOptionid() == 49) { pre_taxmakediff = xzb.getXzxjg(); }//税前补差
+				
 				if(xzx.getIsCustom() == 0 && xzx.getOptionid() == 72) { other_deductions = xzb.getXzxjg(); }//其他扣除
 				if(xzx.getIsCustom() == 0 && xzx.getOptionid() == 13) { late_cs = xzb.getXzxjg(); }//迟到次数
 				if(xzx.getIsCustom() == 0 && xzx.getOptionid() == 14) { leave_early_cs = xzb.getXzxjg(); }//早退次数
@@ -2006,8 +2013,8 @@ public class SalaryManagementController {
 				
 				//应发工资
 				if(xzx.getRulestate().equals(2) && xzx.getIsCustom() == 0 && xzx.getOptionid() == 48) {
-					String formula = xzx.getGsgs();//#基本工资#+#岗位津贴#+#绩效奖金#+#业绩提成#+#税前补差#-#事假扣款#-#病假扣款#
-					String qaz = formula.replace("#基本工资#", String.valueOf(base_pay)).replace("#岗位津贴#", String.valueOf(post_allowance)).replace("#绩效奖金#", String.valueOf(achievement_bonus))
+					String formula = xzx.getGsgs();//#基本工资#+#绩效奖金#+#业绩提成#+#税前补差#-#事假扣款#-#病假扣款#
+					String qaz = formula.replace("#基本工资#", String.valueOf(base_pay)).replace("#绩效奖金#", String.valueOf(achievement_bonus))
 							.replace("#业绩提成#", String.valueOf(performance_commission)).replace("#税前补差#", String.valueOf(pre_taxmakediff))
 							.replace("#事假扣款#", String.valueOf(matter_leave_deduction)).replace("#病假扣款#", String.valueOf(sick_leave_deduction));
 				    double result = SalaryTool.formatDouble(Double.valueOf(String.valueOf(js.eval(qaz))));
@@ -2018,8 +2025,8 @@ public class SalaryManagementController {
 					double result = 0;
 					//计薪规则组项中自定义项
 					List<XcglAssoJsgzzx> zdyx =  XcglAssoJsgzzx.builder().build().selectList(new QueryWrapper<XcglAssoJsgzzx>().lambda().eq(XcglAssoJsgzzx::getXzzid, calcomtiondto.getPay_group_id()).eq(XcglAssoJsgzzx::getIsCustom, 1));
-					String formula = xzx.getGsgs();//#基本工资#+#岗位津贴#+#绩效奖金#+#业绩提成#+#税前补差#-#事假扣款#-#病假扣款#?
-					String qaz = formula.replace("#基本工资#", String.valueOf(base_pay)).replace("#岗位津贴#", String.valueOf(post_allowance)).replace("#绩效奖金#", String.valueOf(achievement_bonus))
+					String formula = xzx.getGsgs();//#基本工资#+#绩效奖金#+#业绩提成#+#税前补差#-#事假扣款#-#病假扣款#?
+					String qaz = formula.replace("#基本工资#", String.valueOf(base_pay)).replace("#绩效奖金#", String.valueOf(achievement_bonus))
 							.replace("#业绩提成#", String.valueOf(performance_commission)).replace("#税前补差#", String.valueOf(pre_taxmakediff))
 							.replace("#事假扣款#", String.valueOf(matter_leave_deduction)).replace("#病假扣款#", String.valueOf(sick_leave_deduction));
 						

src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml

@@ -248,21 +248,26 @@
 	 </select>
 	
 	<select id="MonthlySummaryLeave" resultMap="BalanceSheetDataMap">
-		<!-- select res.leave_type_id as leaverulesid,res.duration as balancedays from kqgl_asso_relation_summary res 
-			where res.user_id = #{userid}
-			and res.approval_type = 2
-			and res.org_code = #{orgcode}
-			and SUBSTR(res.app_time,1,7) = #{apptime}
-			GROUP BY res.leave_type_id,res.duration -->
-			
-			select aa.leaverulesid,SUM(aa.balancedays) as balancedays from (
+			<!-- select aa.leaverulesid,SUM(aa.balancedays) as balancedays from (
 				select res.leave_type_id as leaverulesid,res.duration as balancedays from kqgl_asso_relation_summary res 
 				where res.user_id = #{userid}
 				and res.approval_type = 2
 				and res.org_code = #{orgcode}
 				and SUBSTR(res.app_time,1,7) = #{apptime}
 				GROUP BY res.leave_type_id,res.duration) as aa
-			GROUP BY aa.leaverulesid
+			GROUP BY aa.leaverulesid -->
+			
+			select aa.leaverulesid,SUM(aa.balancedays) as balancedays from (
+				select res.leave_type_id as leaverulesid,
+								res.duration as balancedays 
+				 from kqgl_asso_relation_summary res
+				where res.user_id = #{userid}
+					and res.approval_type = 2
+					and res.org_code = #{orgcode}
+					and SUBSTR(res.app_time,1,7) = #{apptime}
+					and res.ordernum = 1
+				) as aa
+				GROUP BY aa.leaverulesid
 	</select>
 	
 	<select id="FormMonthlySummaryLeave" resultMap="BalanceSheetDataMap">