diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
index c54b487a5..77a69ca2e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
@@ -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);
+    }
+
 
      /**
      * 检查是否重复
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
index d13612990..92f069f30 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
@@ -128,6 +128,7 @@ public class EmisCommissionProfitController extends BaseController
         return getDataTable(list);
     }
 
+
     /**
      * app端员工计提统计汇总
      * @return
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java
index 7cb6beb03..e3a07c631 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java
@@ -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);
+
+
      /**
      * 检查是否重复
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java
index 3ee848cef..bd56ef11a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java
@@ -35,6 +35,13 @@ public interface IEmisCommissionDtlService
      */
     public List<EmisCommissionDtl> selectEmisCommissionDtlList(EmisCommissionDtl emisCommissionDtl);
 
+    /**
+     * 批次提成明细
+     * @param emisCommissionDtl
+     * @return
+     */
+    public List<EmisCommissionDtl> selectBatchCommissionDtlList(EmisCommissionDtl emisCommissionDtl);
+
 
     /**
      * 检查是否重复
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java
index edc35759c..c1362627d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java
@@ -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);
+    }
+
     /**
      * 检查是否重复
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml
index 0228e9ad2..713990973 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml
@@ -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>