Bladeren bron

Merge remote-tracking branch 'origin/master'

songyh 3 jaren geleden
bovenliggende
commit
cf47146886

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

@@ -90,18 +90,60 @@ public class ProjectMemberController {
      * @param userId
      * @return
      */
+    @Autowired
+    private IProductService productService;
+
     @GetMapping(value = "/participateList")
     public Map<String, Object> participateList(String userId) {
         Map<String, Object> map = new HashMap<>();
         try {
+            QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
-                userId = null;
+                queryWrapper.eq("user_id", userId);
+            }
+            queryWrapper.groupBy("project_id");
+            queryWrapper.orderByDesc("create_time");
+            List<ProjectMember> projectMembers = projectMemberMapper.selectList(queryWrapper);
+            List<ProjectMember> projectMemberList = new ArrayList<>();
+            if (!Check.isNull(projectMembers)) {
+                for (ProjectMember projectMember : projectMembers) {
+                    if (Check.isNull(projectMember)) {
+                        continue;
+                    }
+                    Project project = projectService.getById(projectMember.getProjectId());
+                    if (!Check.isNull(project)) {
+                        SysUser responsible = sysUserService.getById(project.getResponsibleId());
+
+                        if (!Check.isNull(responsible)) {
+                            projectMember.setResponsibleName(responsible.getRealname());
+                        }
+
+                        SysUser designResponsible = sysUserService.getById(project.getDesignResponsibleId());
+                        if (!Check.isNull(designResponsible)) {
+                            projectMember.setDesignResponsibleName(designResponsible.getRealname());
+                        }
+
+                        projectMember.setProjectName(project.getProjectName());
+                        Product product = productService.getById(project.getProductId());
+                        if (!Check.isNull(product)) {
+                            projectMember.setProductId(product.getId());
+                            projectMember.setProductName(product.getProductName());
+                        }
+                        Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
+                        if (!Check.isNull(advertiser)) {
+                            projectMember.setAdvertiserName(advertiser.getName());
+                        }
+                        projectMember.setAdvertiserId(project.getAdvertiserId());
+                        projectMember.setMediaId(project.getMediaId());
+                        projectMember.setMaxBid(project.getMaxBid());
+                        projectMemberList.add(projectMember);
+                    }
+                }
             }
-            List <ProjectMember> projectMembers = projectMemberMapper.getlistByUserId(userId);
             map.put("code", 0);
             map.put("success", true);
-            map.put("result", projectMembers);
+            map.put("result", projectMemberList);
         } catch (Exception e) {
             e.printStackTrace();
             map.put("success", false);
@@ -281,7 +323,7 @@ public class ProjectMemberController {
                 throw new Exception("请选择项目");
             }
             Project project = projectService.getById(projectId);
-            if(Check.isNull(project)){
+            if (Check.isNull(project)) {
                 throw new Exception("项目不存在");
             }
             JSONArray memberArr = jsonObject.getJSONArray("memberArr");