Pārlūkot izejas kodu

修改穿山甲代码逻辑

syh 5 gadi atpakaļ
vecāks
revīzija
88912f1dcd

+ 0 - 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java

@@ -384,13 +384,6 @@ public class AdvertiserController {
                 }
             }
         }
-        List<UserAllocation> allocations = userAllocationService.getByProjectId(projectId, systemType);
-        if (null != allocations && !allocations.isEmpty()) {
-            for (UserAllocation allocation : allocations) {
-                SheetInfoVo vo = advertiserService.getXxlStatisticInfo(projectId, systemType, allocation.getAccountId(), allocation.getAuthName());
-                sheets.add(vo);
-            }
-        }
         result.put("data", sheets);
         ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
         return result;
@@ -419,13 +412,6 @@ public class AdvertiserController {
                 }
             }
         }
-        List<UserAllocation> allocations = userAllocationService.getByProjectId(projectId, systemType);
-        if (null != allocations && !allocations.isEmpty()) {
-            for (UserAllocation allocation : allocations) {
-                SheetInfoVo vo = advertiserService.getXxlStatisticInfo(projectId, systemType, allocation.getAccountId(), allocation.getAuthName());
-                sheets.add(vo);
-            }
-        }
 
         OutputStream outputStream = response.getOutputStream();
         String date = DateUtils.formatDate(new Date());

+ 17 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/excelutil/entity/KuaishouXxlEntity.java

@@ -30,18 +30,23 @@ public class KuaishouXxlEntity extends BaseRowModel {
     @ExcelProperty(index = 4, value = "非双出价(元)")
     private BigDecimal singleBid;
     /**
+     * 非双出价
+     */
+    @ExcelProperty(index = 5, value = "详情页消耗(元)")
+    private BigDecimal detailCost;
+    /**
      * 激活数
      */
-    @ExcelProperty(index = 5, value = "激活数")
+    @ExcelProperty(index = 6, value = "激活数")
     private int active;
     /**
      * 激活成本
      */
-    @ExcelProperty(index = 6, value = "激活成本")
+    @ExcelProperty(index = 7, value = "激活成本")
     private BigDecimal activeCost;
-    @ExcelProperty(index = 7, value = "每日计划(组)")
+    @ExcelProperty(index = 8, value = "每日计划(组)")
     private int planNum;
-    @ExcelProperty(index = 8, value = "每日素材安排")
+    @ExcelProperty(index = 9, value = "每日素材安排")
     private String mat;
 
     public String getDate() {
@@ -107,4 +112,12 @@ public class KuaishouXxlEntity extends BaseRowModel {
     public void setMat(String mat) {
         this.mat = mat;
     }
+
+    public BigDecimal getDetailCost() {
+        return detailCost;
+    }
+
+    public void setDetailCost(BigDecimal detailCost) {
+        this.detailCost = detailCost;
+    }
 }