Quellcode durchsuchen

加入产品名称

yumeng vor 4 Jahren
Ursprung
Commit
cb205ba382

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

@@ -1,8 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.entity.Advertiser;
+import cn.com.ctop.common.module.entity.Product;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.SysUser;
+import cn.com.ctop.common.module.service.IProductService;
 import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.ISysRoleExtService;
 import cn.com.ctop.common.module.utils.Check;
@@ -159,6 +161,8 @@ public class ProjectMemberController {
         }
     }
 
+    @Autowired
+    private IProductService productService;
 
     @GetMapping(value = "/participateListV2")
     public Result<IPage<ProjectMember>> participateListV2(ProjectMember projectMember,
@@ -189,7 +193,6 @@ public class ProjectMemberController {
         queryWrapper.orderByDesc("create_time");
 
 
-
         Page<ProjectMember> page = new Page<>(pageNo, pageSize);
         IPage<ProjectMember> pageList = projectMemberService.page(page, queryWrapper);
         List<ProjectMember> projectMembers = pageList.getRecords();
@@ -206,6 +209,12 @@ public class ProjectMemberController {
                     SysUser designResponsible = sysUserService.getById(project.getDesignResponsibleId());
                     member.setDesignResponsibleName(designResponsible.getRealname());
                     Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
+
+                    Product product = productService.getById(project.getProductId());
+                    if (!Check.isNull(product)) {
+                        member.setProductId(product.getId());
+                        member.setProductName(product.getProductName());
+                    }
                     member.setAdvertiserName(advertiser.getName());
                     member.setAdvertiserId(project.getAdvertiserId());
                     member.setAdvertiserId(project.getAdvertiserId());

+ 7 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ProjectMember.java

@@ -28,7 +28,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value = "ctop_project_member对象", description = "项目成员")
-public class ProjectMember implements  Serializable{
+public class ProjectMember implements Serializable {
 
     /**
      * id
@@ -89,6 +89,12 @@ public class ProjectMember implements  Serializable{
     @TableField(exist = false)
     private String saleName;
 
+    @TableField(exist = false)
+    private Long productId;
+
+    @TableField(exist = false)
+    private String productName;
+
 
     /**
      * 创建时间