Explorar el Código

Merge branch 'V1.1.5' of http://git.tjyourong.com.cn/ctop/adsp-boot into V1.1.5

zhaoxian hace 4 años
padre
commit
b1c225910d

+ 10 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -264,11 +264,18 @@ public class ProjectMemberController {
                 Project project = projectService.getById(member.getProjectId());
                 if (!Check.isNull(project)) {
                     SysUser responsible = sysUserService.getById(project.getResponsibleId());
-                    member.setResponsibleName(responsible.getRealname());
+                    if (!Check.isNull(responsible)) {
+                        member.setResponsibleName(responsible.getRealname());
+                    }
                     SysUser designResponsible = sysUserService.getById(project.getDesignResponsibleId());
-                    member.setDesignResponsibleName(designResponsible.getRealname());
+                    if (!Check.isNull(designResponsible)) {
+                        member.setDesignResponsibleName(designResponsible.getRealname());
+                    }
                     Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
-                    member.setProjectName(project.getProjectName());
+                    if (!Check.isNull(advertiser)) {
+                        member.setProjectName(project.getProjectName());
+                    }
+
                     Product product = productService.getById(project.getProductId());
                     if (!Check.isNull(product)) {
                         member.setProductId(product.getId());

+ 5 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/AiKuaishouAdvertiserStrategyController.java

@@ -113,6 +113,11 @@ public class AiKuaishouAdvertiserStrategyController {
         if (aiKuaishouAdvertiserStrategyEntity == null) {
             result.error500("未找到对应实体");
         } else {
+            Integer singleAppId = aiKuaishouAdvertiserStrategy.getSingleAppid();
+            if (null != singleAppId && singleAppId == 1) {
+                Integer appId = Integer.parseInt(JSONArray.parseArray(aiKuaishouAdvertiserStrategy.getAppIdArray()).getString(0));
+                aiKuaishouAdvertiserStrategy.setAppId(appId);
+            }
             boolean ok = aiKuaishouAdvertiserStrategyService.updateById(aiKuaishouAdvertiserStrategy);
             if (ok) {
                 result.success("修改成功!");

+ 8 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsVideoReportCtrl.java

@@ -293,16 +293,17 @@ public class KsVideoReportCtrl {
 
             JSONArray columns2 = new JSONArray();
             columns2.add(0, "materialName");
-            columns2.add(1, "channel");
-            columns2.add(2, "designLeader");
-            columns2.add(3, "clip");
-            columns2.add(4, "plan");
-            columns2.add(5, "shot");
-            columns2.add(6, "createTime");
+            columns2.add(1, "signature");
+            columns2.add(2, "projectName");
+            columns2.add(3, "channel");
+            columns2.add(4, "designLeader");
+            columns2.add(5, "clip");
+            columns2.add(6, "plan");
+            columns2.add(7, "shot");
+            columns2.add(8, "createTime");
             for (int i = 0; i < columns.size(); i++) {
                 columns2.add(columns2.size(), columns.getString(i));
             }
-
             columns2.add(columns2.size(), "url");
             List<String> titles = getfileIds(AccountReportConstants.kuaishouVideoReportDict, columns2);
             List<JSONObject> listData = ksVideoReportService.getKuaiShouVideoReportByMap(requestMap);

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

@@ -32,7 +32,6 @@
             AND t1.stat_date &lt;= #{endDate}
         </if>
         GROUP BY t1.signature
-        ORDER BY ${target} ${order}
         ) t1
         LEFT JOIN ctop_etl_kuaishou_video_info t2
         ON t1.signature = t2.video_code
@@ -50,6 +49,7 @@
         <if test="shotId !=null and shotId != ''">
             AND t2.shot_id = #{shotId}
         </if>
+        ORDER BY ${target} ${order}
     </select>
 
 

+ 0 - 2
module-kuaishou/src/main/resources/json_template/kuaishou_video_report_filed_dict.json

@@ -5,7 +5,6 @@
   "channel": {
     "comment": "来源"
   },
-
   "plan": {
     "comment": "编导"
   },
@@ -21,7 +20,6 @@
   "createTime": {
     "comment": "上线时间"
   },
-
   "coverUrl": {
     "comment": "封面链接"
   },