Pārlūkot izejas kodu

兰兰 李超的管理消耗修改

zxa 2 gadi atpakaļ
vecāks
revīzija
577740fc59

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouOperationReportMapper.xml

@@ -285,7 +285,7 @@
         AND stat_date <= #{endDate}
     </select>
 
-    <select id="getTtManagers" resultType="java.math.BigDecimal">
+    <select id="getTtManagers" resultType="String">
         SELECT user_id
         FROM application.bytedance_operation_performance_base
         WHERE leader_id = #{userId}
@@ -294,7 +294,7 @@
         GROUP BY user_id
     </select>
 
-    <select id="getManagers" resultType="java.math.BigDecimal">
+    <select id="getManagers" resultType="String">
         SELECT user_id
         FROM application.kuaishou_operation_performance_base
         WHERE leader_id = #{userId}

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

@@ -549,7 +549,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                         "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")));
-                    managenCharge.add(baseMapper.getTtManageChargeCommission(managers, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate"))));
+                    managenCharge = managenCharge.add(baseMapper.getTtManageChargeCommission(managers, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate"))));
                 } else {
                     if ("off".equals(type)) {
                         managenCharge = baseMapper.getTtManageChargeCommission(Arrays.asList(userId), DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(DateUtils.formatDate(datum.getString("quitTime"), "yyyy-MM-dd")));
@@ -1144,7 +1144,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                         "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")));
-                    managenCharge.add(baseMapper.getManageChargeCommission(managers, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate"))));
+                    managenCharge = managenCharge.add(baseMapper.getManageChargeCommission(managers, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate"))));
                 } else {
                     if ("off".equals(type)) {
                         managenCharge = baseMapper.getManageChargeCommission(Arrays.asList(userId), DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(DateUtils.formatDate(datum.getString("quitTime"), "yyyy-MM-dd")));