1.大中型提成计算添加数据权限

2.大中型绩效分配按照认领时间排序

biz-base/src/main/java/com/dayou/controller/FinanceRealFundController.java

@@ -171,6 +171,7 @@ public class FinanceRealFundController extends BaseController {
      * @param vo
      * @return
      */
+    @DataPermission
     @GetMapping("/commission/major/evaluator")
     public RestResponse<List<UserCommissionTotalAmountVO>> majorEvaluatorCommission(UserCommissionTotalAmountVO vo){
         List<UserCommissionTotalAmountVO> ret = financeRealFundService.majorEvaluatorCommission(vo);
@@ -236,6 +237,7 @@ public class FinanceRealFundController extends BaseController {
      * @param vo
      * @return
      */
+    @DataPermission
     @GetMapping("/commission/major/market")
     public RestResponse<List<UserCommissionTotalAmountVO>> majorMarketCommission(UserCommissionTotalAmountVO vo){
         List<UserCommissionTotalAmountVO> ret = financeRealFundService.majorMarketCommission(vo);

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -559,6 +559,14 @@
 
                 ) mpa ON ( mpa.major_id = m.id AND mpa.major_production_id = mp.id)
                 LEFT JOIN user u ON u.id = mpa.user_id
+        <where>
+            <if test="vo!=null and vo.userIds!=null and vo.userIds.size!=0">
+                mpa.user_id in
+                <foreach collection="vo.userIds" open="(" close=")" separator="," item="userId">
+                    #{userId}
+                </foreach>
+            </if>
+        </where>
 
         GROUP BY
             mpa.user_id
@@ -770,7 +778,14 @@
 
         ) mpa ON ( mpa.major_id = m.id AND cd.id = mpa.declare_id AND (mpa.major_production_id is null or mpa.major_production_id = mp.id ))
         LEFT JOIN user u ON u.id = mpa.user_id
-
+        <where>
+            <if test="vo!=null and vo.userIds!=null and vo.userIds.size!=0">
+                mpa.user_id in
+                <foreach collection="vo.userIds" open="(" close=")" separator="," item="userId">
+                    #{userId}
+                </foreach>
+            </if>
+        </where>
         GROUP BY
         mpa.user_id
         having 1=1

dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -629,7 +629,7 @@
           AND mp.deleted = 0
           AND mp.NAME IS NOT NULL
           and m.department_id in (select distinct department_id from post where name='评估部经理' and  id in (select post_id from user_post where user_id = #{currentUserId}))
-        order by isAllot ASC;
+        order by claimTimes DESC, isAllot ASC;
     </select>
 
     <select id="validateProd" parameterType="java.lang.Long" resultType="com.dayou.vo.ProdValidateVO">

domain/src/main/java/com/dayou/vo/UserCommissionTotalAmountVO.java

@@ -6,6 +6,8 @@ import com.github.liangbaika.validate.enums.Check;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 类说明：
@@ -38,4 +40,11 @@ public class UserCommissionTotalAmountVO {
     private String userType;
     @Excel(name = "业务类型")
     private String businessType;
+
+    /**
+     * 所属员工查询条件
+     */
+    private Set<Long> userIds;
+
+    private List<Long> departmentIds;
 }