Преглед изворни кода

Merge branch 'V2.0.1' into test

zhaoxian пре 3 година
родитељ
комит
4a7c5d5b56

+ 22 - 27
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/mapper/xml/ExternalMaterialCollectionMapper.xml

@@ -76,13 +76,13 @@
                 AND stat_date <=#{endTime}
                 AND stat_date <=#{endTime}
             </if>
             </if>
             <if test="daTag != null">
             <if test="daTag != null">
-                AND da_tag like CONCAT('%', #{daTag}, '%')
+                AND da_tag like CONCAT('%"', #{daTag}, '"%')
             </if>
             </if>
             <if test="sceneTag != null">
             <if test="sceneTag != null">
-                AND scene_tag like CONCAT('%', #{sceneTag}, '%')
+                AND scene_tag like CONCAT('%"', #{sceneTag}, '"%')
             </if>
             </if>
             <if test="modalityTag != null">
             <if test="modalityTag != null">
-                AND modality_tag like CONCAT('%', #{modalityTag}, '%')
+                AND modality_tag like CONCAT('%"', #{modalityTag}, '"%')
             </if>
             </if>
             <if test="industry != null">
             <if test="industry != null">
                 AND industry = #{industry}
                 AND industry = #{industry}
@@ -115,13 +115,13 @@
                 AND stat_date &lt;=#{endTime}
                 AND stat_date &lt;=#{endTime}
             </if>
             </if>
             <if test="daTag != null">
             <if test="daTag != null">
-                AND da_tag like CONCAT('%', #{daTag}, '%')
+                AND da_tag like CONCAT('%"', #{daTag}, '"%')
             </if>
             </if>
             <if test="sceneTag != null">
             <if test="sceneTag != null">
-                AND scene_tag like CONCAT('%', #{sceneTag}, '%')
+                AND scene_tag like CONCAT('%"', #{sceneTag}, '"%')
             </if>
             </if>
             <if test="modalityTag != null">
             <if test="modalityTag != null">
-                AND modality_tag like CONCAT('%', #{modalityTag}, '%')
+                AND modality_tag like CONCAT('%"', #{modalityTag}, '"%')
             </if>
             </if>
             <if test="industry != null">
             <if test="industry != null">
                 AND industry = #{industry}
                 AND industry = #{industry}
@@ -133,7 +133,7 @@
                 AND plate_position LIKE CONCAT('%',#{platePosition}, '%')
                 AND plate_position LIKE CONCAT('%',#{platePosition}, '%')
             </if>
             </if>
         </where>
         </where>
-            ORDER BY create_time DESC
+        ORDER BY create_time DESC
     </select>
     </select>
 
 
 
 
@@ -151,32 +151,27 @@
 
 
 
 
     <select id="getMd5ByMediaType" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getMd5ByMediaType" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT user_id as 'userId',
-               signature as 'md5',
-               form_tag_list as 'formTagList',
-               mood_tag_list as 'moodTagList',
-               scene_tag_list as 'sceneTagList',
-               industry_id as 'industry',
-               DATE_FORMAT(hot_date,'%Y-%m-%d') as 'statDate' FROM application.hot_material_tag_info
+        SELECT user_id as 'userId', signature as 'md5', form_tag_list as 'formTagList', mood_tag_list as 'moodTagList', scene_tag_list as 'sceneTagList', industry_id as 'industry', DATE_FORMAT(hot_date, '%Y-%m-%d') as 'statDate'
+        FROM application.hot_material_tag_info
         where media_id = #{mediaType};
         where media_id = #{mediaType};
     </select>
     </select>
 
 
 
 
     <select id="getKuaiShouInternalMaterial" resultType="cn.com.ctop.common.module.utils.ExternalMaterialCollection">
     <select id="getKuaiShouInternalMaterial" resultType="cn.com.ctop.common.module.utils.ExternalMaterialCollection">
         SELECT
         SELECT
-            t2.signature as 'md5',
-            t2.photo_name as 'materialName',
-            t2.url,
-            t2.cover_url,
-            6 as 'materialSource',
-            t3.second,
-            t3.format,
-            IFNULL(t3.width,t2.width) as 'width',
-            IFNULL(t3.height,t2.height) as 'height',
-            t3.size,
-            4 as 'createType',
-            2 as 'mediaType'
-        FROM  ctop_kuaishou_video_get t2
+        t2.signature as 'md5',
+        t2.photo_name as 'materialName',
+        t2.url,
+        t2.cover_url,
+        6 as 'materialSource',
+        t3.second,
+        t3.format,
+        IFNULL(t3.width,t2.width) as 'width',
+        IFNULL(t3.height,t2.height) as 'height',
+        t3.size,
+        4 as 'createType',
+        2 as 'mediaType'
+        FROM ctop_kuaishou_video_get t2
         LEFT JOIN ctop_material_parameter t3 ON t2.signature= t3.material_id
         LEFT JOIN ctop_material_parameter t3 ON t2.signature= t3.material_id
         WHERE t2.signature IN
         WHERE t2.signature IN
         <foreach collection="md5List" item="item" separator=","
         <foreach collection="md5List" item="item" separator=","