Browse Source

Merge branch 'zzy' into test

zhouzeyu@c-top.com.cn 3 years ago
parent
commit
c0ef29d208

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/MaterialReportOverViewMapper.java

@@ -147,7 +147,7 @@ public interface MaterialReportOverViewMapper {
 
 
     Map<String,String> optimalCombination(@Param("signature")String signature,@Param("targetType")String targetType);
     Map<String,String> optimalCombination(@Param("signature")String signature,@Param("targetType")String targetType);
 
 
-    Map<String,String> similarMaterialInfo(@Param("signature")String signature);
+    Map similarMaterialInfo(@Param("signature")String signature);
 
 
     Map<String,String> getSimilarMaterialList(@Param("signature")String signature);
     Map<String,String> getSimilarMaterialList(@Param("signature")String signature);
 }
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/MaterialReportOverViewMapper.xml

@@ -1312,7 +1312,7 @@
     </select>
     </select>
 
 
     <select id="similarMaterialInfo" resultType="java.util.Map">
     <select id="similarMaterialInfo" resultType="java.util.Map">
-           SELECT IFNULL(t2.signature,'') as signature,IFNULL(t2.photo_name,'') as photoName,IFNULL(t2.url,'')  as url,IFNULL(SUM(t3.charge),'') as charge
+           SELECT IFNULL(t2.signature,'') as signature,IFNULL(t2.photo_name,'') as photoName,IFNULL(t2.url,'')  as url, IFNULL(ROUND(SUM(t3.charge),2),0) as charge
 			 from
 			 from
          ctop_kuaishou_video_get t2
          ctop_kuaishou_video_get t2
         LEFT JOIN ctop_kuaishou_report_daily_material t3 on t2.signature=t3.signature
         LEFT JOIN ctop_kuaishou_report_daily_material t3 on t2.signature=t3.signature

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/MaterialReportOverViewServiceImpl.java

@@ -565,31 +565,31 @@ public class MaterialReportOverViewServiceImpl implements IMaterialReportOverVie
             String signature4 = map.get("s4");
             String signature4 = map.get("s4");
             String signature5 = map.get("s5");
             String signature5 = map.get("s5");
             if(signature1!=null&& !signature1.equals("")){
             if(signature1!=null&& !signature1.equals("")){
-                Map<String,String> info= materialReportOverViewMapper.similarMaterialInfo(signature1);
+                Map info= materialReportOverViewMapper.similarMaterialInfo(signature1);
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                     resultMap.add(info);
                     resultMap.add(info);
                 }
                 }
             }
             }
             if(signature2!=null&& !signature2.equals("")){
             if(signature2!=null&& !signature2.equals("")){
-                Map<String,String> info= materialReportOverViewMapper.similarMaterialInfo(signature2);
+                Map info= materialReportOverViewMapper.similarMaterialInfo(signature2);
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                     resultMap.add(info);
                     resultMap.add(info);
                 }
                 }
             }
             }
             if(signature3!=null&& !signature3.equals("")){
             if(signature3!=null&& !signature3.equals("")){
-                Map<String,String> info= materialReportOverViewMapper.similarMaterialInfo(signature3);
+                Map info= materialReportOverViewMapper.similarMaterialInfo(signature3);
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                     resultMap.add(info);
                     resultMap.add(info);
                 }
                 }
             }
             }
             if(signature4!=null&& !signature4.equals("")){
             if(signature4!=null&& !signature4.equals("")){
-                Map<String,String> info= materialReportOverViewMapper.similarMaterialInfo(signature4);
+                Map info= materialReportOverViewMapper.similarMaterialInfo(signature4);
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                     resultMap.add(info);
                     resultMap.add(info);
                 }
                 }
             }
             }
             if(signature5!=null&& !signature5.equals("")){
             if(signature5!=null&& !signature5.equals("")){
-                Map<String,String> info= materialReportOverViewMapper.similarMaterialInfo(signature5);
+                Map info= materialReportOverViewMapper.similarMaterialInfo(signature5);
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                 if(info.get("signature")!=null && !info.get("signature").equals("")){
                     resultMap.add(info);
                     resultMap.add(info);
                 }
                 }