Forráskód Böngészése

Merge branch 'V2.0.1' into test

zhaoxian 3 éve
szülő
commit
74a75b6068

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

@@ -34,7 +34,6 @@
         where manage_id = #{userId}
     </select>
 
-
     <select id="getCompanyAccountIds" resultType="Long">
         SELECT t1.account_id
         FROM `jeecg-boot`.ctop_user_allocation t1
@@ -342,7 +341,7 @@
 
     <select id="queryTtManydaysChargeAndRoi" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        IFNULL( this.charge, 0.00) AS 'charge',
+        IFNULL( this.charge, 0.00) AS 'totalCharge',
         CONCAT( CAST( IFNULL( ROUND(( this.charge - last.charge ) / last.charge* 100,2),0) AS CHAR),'%') AS
         'chargeRoi'
         FROM
@@ -379,7 +378,7 @@
 
     <select id="queryKsManydaysChargeAndRoi" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        IFNULL( this.charge, 0.00) AS 'charge',
+        IFNULL( this.charge, 0.00) AS 'totalCharge',
         CONCAT( CAST( IFNULL( ROUND(( this.charge - last.charge ) / last.charge* 100,2),0) AS CHAR),'%') AS
         'chargeRoi'
         FROM

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

@@ -79,7 +79,6 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
             if (Check.isNull(saleTeaMber)) {
                 saleTeaMber = Arrays.asList(userId);
-                return Result.error("未查询到人员!");
             }
             //账户集合
             List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber);
@@ -128,7 +127,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             //月消耗
             String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds);
             result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
-            result.put("monthCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
+            result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
             //现金消耗 + 环比ROI
             JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
             result.put("realCharged", realCharged.getBigDecimal("realCharged"));
@@ -140,7 +139,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             //月消耗
             String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds);
             result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
-            result.put("monthCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
+            result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
             //现金消耗 + 环比ROI
             JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
             result.put("realCharged", realCharged.getBigDecimal("realCharged"));