浏览代码

智能托管修改

yumeng 3 年之前
父节点
当前提交
271d30123c

+ 1 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/hosting/controller/KuaishouHostingTaskController.java

@@ -122,6 +122,7 @@ public class KuaishouHostingTaskController {
                                                             HttpServletRequest req) {
         Result<IPage<KuaishouHostingTask>> result = new Result<>();
         QueryWrapper<KuaishouHostingTask> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouHostingTask, req.getParameterMap());
+        queryWrapper.orderByDesc("create_time");
         Page<KuaishouHostingTask> page = new Page<KuaishouHostingTask>(pageNo, pageSize);
         IPage<KuaishouHostingTask> pageList = kuaishouHostingTaskService.page(page, queryWrapper);
         result.setSuccess(true);

+ 26 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/hosting/controller/KuaishouHostingTemplateController.java

@@ -1,5 +1,9 @@
 package cn.com.ctop.kuaishou.modules.hosting.controller;
 
+import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.IProjectService;
+import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
@@ -97,6 +101,12 @@ public class KuaishouHostingTemplateController {
         return result;
     }
 
+    @Autowired
+    private IUserAllocationService userAllocationService;
+
+
+    @Autowired
+    private IProjectService projectService;
 
     /**
      * 分页列表查询
@@ -123,6 +133,22 @@ public class KuaishouHostingTemplateController {
         queryWrapper.orderByDesc("create_time");
         Page<KuaishouHostingTemplate> page = new Page<KuaishouHostingTemplate>(pageNo, pageSize);
         IPage<KuaishouHostingTemplate> pageList = kuaishouHostingTemplateService.page(page, queryWrapper);
+        List<KuaishouHostingTemplate> records = pageList.getRecords();
+        if (!Check.isNull(records)) {
+            for (KuaishouHostingTemplate template : records) {
+                UserAllocation userAllocation = userAllocationService.getByAccountId(template.getAccountId());
+                if (Check.isNull(userAllocation)) {
+                    continue;
+                }
+                template.setAccountName(userAllocation.getAuthName());
+                template.setUserName(userAllocation.getUserName());
+                Project project = projectService.getById(userAllocation.getProjectId());
+                if (!Check.isNull(project)) {
+                    template.setProjectName(project.getProjectName());
+                }
+            }
+        }
+
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

+ 10 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/hosting/entity/KuaishouHostingTemplate.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.kuaishou.modules.hosting.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -362,4 +363,13 @@ public class KuaishouHostingTemplate {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
+
+    @TableField(exist = false)
+    private String projectName;
+    @TableField(exist = false)
+    private String accountName;
+    @TableField(exist = false)
+    private String userName;
+
+
 }