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-03-16 11:35:50 +08:00
parent 13e3f2ecb6
commit dfb63e5614
6 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
View File

@ -60,6 +60,20 @@ public class EmisCommissionDtlController extends BaseController
return getDataTable(list);
}
/**
* 按批次查询明细
* @param emisCommissionDtl
* @return
*/
@PreAuthorize("@ss.hasPermi('emis:emisCommissionDtl:list')")
@GetMapping("/listBatch")
public TableDataInfo listBatch(EmisCommissionDtl emisCommissionDtl)
{
startPage();
List<EmisCommissionDtl> list = emisCommissionDtlService.selectBatchCommissionDtlList(emisCommissionDtl);
return getDataTable(list);
}
/**
* 检查是否重复

1
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
View File

@ -128,6 +128,7 @@ public class EmisCommissionProfitController extends BaseController
return getDataTable(list);
}
/**
* app端员工计提统计汇总
* @return

8
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java
View File

@ -37,6 +37,14 @@ public interface EmisCommissionDtlMapper extends BaseMapper<EmisCommissionDtl>
public List<EmisCommissionDtl> selectEmisCommissionDtlList(EmisCommissionDtl emisCommissionDtl);
/**
* 批次提成明细
* @param emisCommissionDtl
* @return
*/
public List<EmisCommissionDtl> selectBatchCommissionDtlList(EmisCommissionDtl emisCommissionDtl);
/**
* 检查是否重复
*

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java
View File

@ -35,6 +35,13 @@ public interface IEmisCommissionDtlService
*/
public List<EmisCommissionDtl> selectEmisCommissionDtlList(EmisCommissionDtl emisCommissionDtl);
/**
* 批次提成明细
* @param emisCommissionDtl
* @return
*/
public List<EmisCommissionDtl> selectBatchCommissionDtlList(EmisCommissionDtl emisCommissionDtl);
/**
* 检查是否重复

13
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java
View File

@ -54,6 +54,19 @@ public class EmisCommissionDtlServiceImpl implements IEmisCommissionDtlService
return emisCommissionDtlMapper.selectEmisCommissionDtlList(emisCommissionDtl);
}
/**
* 查询批次提成明细表列表
*
* @param emisCommissionDtl 批次提成明细表
* @return 员工提成明细表
*/
@Override
public List<EmisCommissionDtl> selectBatchCommissionDtlList(EmisCommissionDtl emisCommissionDtl)
{
return emisCommissionDtlMapper.selectBatchCommissionDtlList(emisCommissionDtl);
}
/**
* 检查是否重复
*

6
emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml
View File

@ -55,12 +55,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEmisCommissionDtlList" parameterType="EmisCommissionDtl" resultMap="EmisCommissionDtlResult">
<include refid="selectEmisCommissionDtlVo"/>
<where>
del_flag='0'
del_flag='0' and bill_type='1'
<if test="id != null "> and id = #{id}</if>
<if test="feeType != null and feeType != ''"> and fee_type=#{feeType}</if>
<if test="money != null "> and money = #{money}</if>
<if test="billMonth != null and billMonth != ''"> and bill_month=#{billMonth},</if>
<if test="billType != null and billType != ''"> and bill_type=#{billType}</if>
<if test="billCode != null and billCode != ''"> and ( FIND_IN_SET(bill_code,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )</if>
<if test="feeRemark != null and feeRemark != ''"> and fee_remark like concat('%', #{feeRemark}, '%')</if>
<if test="empCode != null and empCode != ''"> and emp_code=#{empCode}</if>
@ -91,12 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBatchCommissionDtlList" parameterType="EmisCommissionDtl" resultMap="EmisBatchCommissionDtlResult">
<include refid="selectEmisCommissionDtlVo"/>
<where>
del_flag='0'
del_flag='0' and bill_type='2'
<if test="id != null "> and id = #{id}</if>
<if test="feeType != null and feeType != ''"> and fee_type=#{feeType}</if>
<if test="money != null "> and money = #{money}</if>
<if test="billMonth != null and billMonth != ''"> and bill_month=#{billMonth},</if>
<if test="billType != null and billType != ''"> and bill_type=#{billType}</if>
<if test="billCode != null and billCode != ''"> and ( FIND_IN_SET(bill_code,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )</if>
<if test="feeRemark != null and feeRemark != ''"> and fee_remark like concat('%', #{feeRemark}, '%')</if>
<if test="empCode != null and empCode != ''"> and emp_code=#{empCode}</if>