Kaynağa Gözat

账户列表修改销售查询

yangzian 4 yıl önce
ebeveyn
işleme
a290ac245e

+ 7 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementController.java

@@ -116,7 +116,13 @@ public class SettlementController {
                 "kuaishou_operations_manager".equals(roleCode) //快手运营经理
          ){
             //查询所有包含自己的下级
-            ids = materialReportOverViewService.recursiveQuerySubordinate(userId);
+           // ids = materialReportOverViewService.recursiveQuerySubordinate(userId);
+            //查询 销售及助理 关联对应的人员
+            List<String> saleIds = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(userId);
+            if (!Check.isNull(ids)){
+                ids.addAll(new HashSet<>(saleIds));
+            }
+
         }
         List<Map<String,Object>> list = settlementInfoService.getUserByIds(ids);
         return Result.successMsg("查询用户",list);

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/ReportSettlementMapper.java

@@ -80,7 +80,7 @@ public interface ReportSettlementMapper {
      * @return
      */
     List<Map<String,Object>> getProfitKuaiShouAgentAccount(@Param("startTime")String startTime ,@Param("endTime")String endTime);
-    Map<String,Object> getProfitKuaiShouAccountCost(@Param("accountId")String accountIds,@Param("startTime")String startTime ,@Param("endTime")String endTime);
+    Map<String,Object> getProfitKuaiShouAccountCost(@Param("accountId")String accountId,@Param("startTime")String startTime ,@Param("endTime")String endTime);
     List<Map<String,Object>> getProfitKuaiShouAccountCostSheet(@Param("accountIds")List<String> accountIds,@Param("startTime")String startTime ,@Param("endTime")String endTime);
     //快手 利润表 账户 时间段内的数据信息
     List<Map<String,Object>> getProfitKuaiShouCost(@Param("accountId")String accountId,@Param("startTime")String startTime ,@Param("endTime")String endTime);