diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 8c248c438..7edd949d3 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -502,6 +502,21 @@ public class EmisCommonController extends EmisBaseController
}
}
+ @GetMapping(value = "/reCalcEmpProfitSumMoney")
+ public AjaxResult reCalcEmpProfitSumMoney(String empName,String billMonth)
+ {
+
+ try {
+ emisCommissionProfitService.reCalcEmpProfitSumMoney(empName, billMonth);
+ return AjaxResult.success("计算成功");
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ return AjaxResult.error("计算异常:"+ex.getMessage());
+ }
+
+ }
+
/**
* 对外物流轨迹信息
* @param appId
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
index dad5d70d3..df47b09f4 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
@@ -11,8 +11,8 @@
-
+
@@ -89,7 +89,7 @@
@@ -103,6 +103,7 @@
emp_name,
bill_month,
money,
+ month_money,
real_money,
payed_money,
bl_confirm_center,
@@ -131,6 +132,7 @@
#{empName},
#{billMonth},
#{money},
+ #{monthMoney},
#{realMoney},
#{payedMoney},
#{blConfirmCenter},
@@ -187,7 +189,7 @@
- update emis_commission_profit set money = #{money} where emp_name = #{empName} and bill_month = #{billMonth}
+ update emis_commission_profit set money = #{money},month_money = #{monthMoney} where emp_name = #{empName} and bill_month = #{billMonth}