Parcourir la source

Merge branch 'zzy' into test

zhouzeyu@c-top.com.cn il y a 3 ans
Parent
commit
aa1be76f33

+ 4 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialReportOverViewV3Mapper.xml

@@ -699,10 +699,10 @@
             LEFT JOIN
             (select material_id from application.app_material_tag_busi_info
             <if test='materialType==1'>
-                where  parent_id=60155
+                where  parent_id=60156
             </if>
             <if test='materialType==2'>
-                where  parent_id=60156
+                where  parent_id=60155
             </if>
             GROUP BY material_id) t2 on t.material_id=t2.material_id
         </if>
@@ -821,10 +821,10 @@
             LEFT JOIN
             (select material_id from application.app_material_tag_busi_info
             <if test='materialType==1'>
-                where  parent_id=60155
+                where  parent_id=60156
             </if>
             <if test='materialType==2'>
-                where  parent_id=60156
+                where  parent_id=60155
             </if>
             GROUP BY material_id) t2 on t.material_id=t2.material_id
         </if>

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

@@ -373,7 +373,7 @@ public class MaterialReportOverViewV2ServiceImpl implements IMaterialReportOverV
         List<JSONObject> excelData = materialReportOverViewV3Mapper.queryBytedanceMaterialReport(filed,
                 Long.parseLong(requestBody.getString("startDate").replace("-", "")),
                 Long.parseLong(requestBody.getString("endDate").replace("-", "")),
-                requestBody.getJSONArray("projects"),
+                projects,
                 requestBody.getString("md5"),
                 requestBody.getString("dimension"),
                 requestBody.getString("leaderId"),
@@ -431,7 +431,7 @@ public class MaterialReportOverViewV2ServiceImpl implements IMaterialReportOverV
         List<JSONObject> excelData = materialReportOverViewV3Mapper.queryKuaishouMaterialReport(filedAll,
                 Long.parseLong(requestBody.getString("startDate").replace("-", "")),
                 Long.parseLong(requestBody.getString("endDate").replace("-", "")),
-                requestBody.getJSONArray("projects"),
+                projects,
                 requestBody.getString("md5"),
                 requestBody.getString("dimension"),
                 requestBody.getString("leaderId"),