Переглянути джерело

兰兰UserID 改为陈思宇

zhaoxian 1 рік тому
батько
коміт
d645d603f3

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/ManagerSaleValueMapper.xml

@@ -107,9 +107,9 @@
         AND user_id in (
         select user_id
         from `application`.app_user_manage
-        where manage_id IN ('b07f2bdd0f914f1dab2b4e841764911f','00d630a129e4487cba5427788a1f08ce')
+        where manage_id IN ('4afe739502ae4258a18c36a000d7ff20','00d630a129e4487cba5427788a1f08ce')
         UNION ALL
-        select 'b07f2bdd0f914f1dab2b4e841764911f'
+        select '4afe739502ae4258a18c36a000d7ff20'
         UNION ALL
         select '00d630a129e4487cba5427788a1f08ce'
         )

+ 3 - 3
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/ManagerSaleValueServiceImpl.java

@@ -126,7 +126,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         //运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
         List<Long> oneAccountIds = null;
         String lichaoId = "f6a6843879c949618e4a859140c8a127";
-        //运营二部:陈思宇及其下级 陈思宇id:b07f2bdd0f914f1dab2b4e841764911f,00d630a129e4487cba5427788a1f08ce
+        //运营二部:陈思宇及其下级 陈思宇id:4afe739502ae4258a18c36a000d7ff20,00d630a129e4487cba5427788a1f08ce
         List<Long> twoAccountIds = null;
         //1 头条
         if ("1".equals(mediaId)) {
@@ -157,7 +157,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
                 result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
                 result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
 
-                //运营二部:陈思宇及其下级 陈思宇id:b07f2bdd0f914f1dab2b4e841764911f
+                //运营二部:陈思宇及其下级 陈思宇id:4afe739502ae4258a18c36a000d7ff20
                 twoAccountIds = baseMapper.querySalesDirectorAccountIds2(companyId, mediaId, saleTeaMber);
                 JSONObject twoResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, twoAccountIds, companyId, days);
                 result.put("twoCharge", twoResult.getBigDecimal("totalCharge"));
@@ -194,7 +194,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
                 result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
                 result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
 
-                //运营二部:陈思宇及其下级 陈思宇id:b07f2bdd0f914f1dab2b4e841764911f,00d630a129e4487cba5427788a1f08ce
+                //运营二部:陈思宇及其下级 陈思宇id:4afe739502ae4258a18c36a000d7ff20,00d630a129e4487cba5427788a1f08ce
                 //专查询 陈思宇组 并去除 郭浩和王雪莹账户
                 twoAccountIds = baseMapper.querySalesDirectorAccountIds2(companyId, mediaId, saleTeaMber);
                 JSONObject twoResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, twoAccountIds, companyId, days);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsNewGroupReportCtrl.java

@@ -55,7 +55,7 @@ public class KsNewGroupReportCtrl {
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
         String userId = requestBody.getString("userId");
         //TODO 没有维护快手事业部负责人角色,增加判断
-        if ("b07f2bdd0f914f1dab2b4e841764911f".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
+        if ("4afe739502ae4258a18c36a000d7ff20".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
             accountIds = newPlanReportService.getAccountIdsByMedia();
         } else {
             if (!userId.isEmpty()) {

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouOperationReportServiceImpl.java

@@ -561,7 +561,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
             if (roleName.contains("经理")) {
                 BigDecimal managenCharge = null;
                 //陈思宇和李超 就这俩人定制化
-                if ("b07f2bdd0f914f1dab2b4e841764911f".equals(userId) ||
+                if ("4afe739502ae4258a18c36a000d7ff20".equals(userId) ||
                         "f6a6843879c949618e4a859140c8a127".equals(userId)) {
                     List<String> managers = baseMapper.getTtManagers(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
                     managenCharge = baseMapper.getTtManageChargeCommission(Arrays.asList(userId), DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
@@ -1174,7 +1174,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
             if (roleName.contains("经理")) {
                 BigDecimal managenCharge = null;
                 //陈思宇和李超 就这俩人定制化
-                if ("b07f2bdd0f914f1dab2b4e841764911f".equals(userId) ||
+                if ("4afe739502ae4258a18c36a000d7ff20".equals(userId) ||
                         "f6a6843879c949618e4a859140c8a127".equals(userId)) {
                     List<String> managers = baseMapper.getManagers(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
                     managenCharge = baseMapper.getManageChargeCommission(Arrays.asList(userId), DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));