Explorar el Código

解决代码冲突

syh hace 5 años
padre
commit
819794dd07

+ 12 - 38
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/MaterialTopMapper.xml

@@ -1,49 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.ctop.mapper.MaterialTopMapper">
-
-
-    <select id="queryMaterialTop" resultType="org.jeecg.modules.ctop.vo.MaterialTopVO">
-        SELECT
-        name,
-        stat_date ,
-        cost,
-        click,
-        show_num,
-        active,
-        register,
-        pay,
-        phone_convert ,
-        form_convert ,
-        convert_rate ,
-        residue,
-        play3s,
-        play10s
-        FROM
-        ctop_material_report_total_result
-        WHERE
-            stat_date &lt;= '${endDate}'
-          AND
-            stat_date &gt;= '${startDate}'
-        ORDER BY cost desc
-    </select>
     <select id="selectMapsPage" resultType="org.jeecg.modules.ctop.vo.MaterialTopVO">
         SELECT
         url,
         name,
         stat_date ,
-        cost,
-        click,
-        show_num,
-        active,
-        register,
-        pay,
-        phone_convert ,
-        form_convert ,
-        convert_rate ,
-        residue,
-        play3s,
-        play10s
+        sum(cost) as cost,
+        sum(click) as click,
+        sum(show_num) as show_num,
+        sum(active) as active,
+        sum(register) as register,
+        sum(pay) as pay,
+        sum(phone_convert) as phone_convert,
+        sum(form_convert) as form_convert,
+        convert_rate,
+        sum(residue) as residue,
+        sum(play3s) as play3s,
+        sum(play10s) as play10s
         FROM
         ctop_material_report_total_result
         where

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/MaterialTopServiceImpl.java

@@ -29,6 +29,7 @@ public class MaterialTopServiceImpl  implements IMaterialTopService {
         }else{
             wrapper.orderByDesc(target);
         }
+        wrapper.groupBy("code");
         Page<MaterialTopVO> page = new Page<>((pageNo-1)*pageSize,pageSize);
         IPage<MaterialTopVO> mapIPage = materialTopMapper.selectMapsPage(page, wrapper);
         return mapIPage;