aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-05-13 19:35:17 +08:00
parent 2d31146315
commit ae0b09db47
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -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

8
emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
View File

@ -11,8 +11,8 @@
<result property="empName" column="emp_name" />
<result property="billMonth" column="bill_month" />
<result property="money" column="money" />
<result property="realMoney" column="real_money" />
<result property="monthMoney" column="month_money" />
<result property="realMoney" column="real_money" />
<result property="payedMoney" column="payed_money" />
<result property="blConfirmCenter" column="bl_confirm_center" />
<result property="confirmCenterDate" column="confirm_center_date" />
@ -89,7 +89,7 @@
</select>
<select id="selectEmisCommissionProfitById" parameterType="Long" resultMap="EmisCommissionProfitResult">
select id, profit_no, emp_code, emp_name, bill_month, money, real_money, payed_money, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
select id, profit_no, emp_code, emp_name, bill_month, money, monthMoney,real_money, payed_money, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_commission_profit a
where a.id = #{id}
</select>
@ -103,6 +103,7 @@
<if test="empName != null and empName != ''">emp_name,</if>
<if test="billMonth != null and billMonth != ''">bill_month,</if>
<if test="money != null">money,</if>
<if test="money != null">month_money,</if>
<if test="realMoney != null">real_money,</if>
<if test="payedMoney != null">payed_money,</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center,</if>
@ -131,6 +132,7 @@
<if test="empName != null and empName != ''">#{empName},</if>
<if test="billMonth != null and billMonth != ''">#{billMonth},</if>
<if test="money != null">#{money},</if>
<if test="realMoney != null">#{monthMoney},</if>
<if test="realMoney != null">#{realMoney},</if>
<if test="payedMoney != null">#{payedMoney},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">#{blConfirmCenter},</if>
@ -187,7 +189,7 @@
</update>
<update id="updateProfitMoney" parameterType="EmisCommissionProfit">
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}
</update>
<delete id="deleteEmisCommissionProfitById" parameterType="Long">