Browse Source

fix on 2020.8.19

jiequan.bi 4 years ago
parent
commit
46c8c9becf

+ 0 - 1
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActivitiProcessController.java

@@ -95,7 +95,6 @@ public class ActivitiProcessController {
                 }
                 return false;
             }).collect(Collectors.toList());
-
         }
         if(null!=list&&!list.isEmpty()){
             List<ActZprocess> getList = new ArrayList<>();

+ 1 - 0
module-common/src/main/java/cn/com/ctop/common/module/message/handle/impl/EmailSendMsgHandle.java

@@ -34,6 +34,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
             helper.setSubject(es_title);
             helper.setText(es_content, true);
             mailSender.send(message);
+
         } catch (MessagingException e) {
             e.printStackTrace();
         }

+ 6 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KsVideoReportMapper.xml

@@ -4,22 +4,24 @@
 
     <select id="queryVideoReportBy" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
+        t1.signature,
         t2.url,
-        t2.cover_url as coverUrl,
+        t2.cover_url AS coverUrl,
         t2.material_name materialName,
         (
         SELECT
         project_name
         FROM
-        ctop_project t3
+        ctop_project t4
         WHERE
-        t3.id = t2.project_id
+        t4.id = t3.project_id
         ) AS projectName,
         t2.create_time AS createTime,
         ${filed}
         FROM
         ctop_kuaishou_report_daily_material t1
         LEFT JOIN ctop_material_info t2 ON t1.signature = t2. CODE
+        LEFT JOIN ctop_user_allocation t3 ON t3.account_id=t1.account_id
         WHERE
         t1.stat_date >= #{startDate}
         AND t1.stat_date &lt;= #{endDate}
@@ -32,6 +34,6 @@
         </if>
         AND t2.url!=""
         GROUP BY t1.signature
-        ORDER BY #{target} #{order}
+        ORDER BY ${target} ${order}
     </select>
 </mapper>

+ 0 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/ByteDanceVideoReportDailyMapper.java

@@ -25,8 +25,6 @@ public interface ByteDanceVideoReportDailyMapper extends BaseMapper<ByteDanceVid
 
     void updateHuanbiByDateAndSignature(@Param("date") Date date, @Param("signature") String signature, @Param("huanbi") BigDecimal huanbi);
 
-    List<ByteDanceVideoReportDaily> videoInfoListWeek(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("role") String role, @Param("userId") String userId, @Param("signature") String signature, @Param("companyId") String companyId, @Param("cost") BigDecimal cost);
-
     String getRoleCodeByUserId(@Param("userId") String userId);
 
     String getCompanyIdByUserId(@Param("userId") String userId);

+ 12 - 4
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceVideoReportMapper.xml

@@ -4,16 +4,24 @@
 
     <select id="queryVideoReportBy" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
+        t1.signature,
         t2.url,
         t2.cover_url as converUrl,
         t2.material_name AS materialName,
-        t1.project_name AS projectName,
+        (
+        SELECT
+        project_name
+        FROM
+        ctop_project t4
+        WHERE
+        t4.id = t3.project_id
+        ) AS projectName,
         t2.create_time as createTime,
         ${filed}
         FROM
         ctop_bytedance_video_report_daily t1
-        left join ctop_material_info t2
-        on t1.signature=t2.code
+        left join ctop_material_info t2 on t1.signature=t2.code
+        LEFT JOIN ctop_user_allocation t3 ON t3.account_id=t1.account_id
         WHERE
         t1.stat_datetime >= #{startDate}
         AND t1.stat_datetime &lt;= #{endDate}
@@ -26,6 +34,6 @@
         </if>
         AND t2.url!=""
         GROUP BY t1.signature
-        ORDER BY #{target} #{order}
+        ORDER BY ${target} ${order}
     </select>
 </mapper>