add:产品线项目经理

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto;
 import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl;
 import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,9 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -70,5 +69,25 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
         return Result.success("200",list);
     }
 
+
+    @GetMapping("/queryProjectManager")
+    @ApiOperation("查询产品线项目经理")
+    public ResponseMessage queryProjectManager(){
+        List<SarStandProjectLibrary> list1 = sarStandProjectLibraryService.queryProjectManager();
+        // 创建一个新的list集合，用于存储去重后的元素
+        List<productLineDto> listTemp = new ArrayList();
+        for (SarStandProjectLibrary sarStandProjectLibrary:list1){
+            productLineDto p = new productLineDto();
+            p.setProductLine(sarStandProjectLibrary.getProductLine());
+            p.setProjectManager(sarStandProjectLibrary.getProjectManager());
+            List<SarStandProjectLibrary> list2 = sarStandProjectLibraryService.queryByProductLine(sarStandProjectLibrary.getProductLine());
+            p.setSarStandProjectLibraries(list2);
+            listTemp.add(p);
+        }
+        System.out.println(listTemp);
+
+        return Result.success("200",listTemp);
+    }
+
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java

@@ -60,6 +60,9 @@ public class SarStandProjectLibrary extends BaseEntity {
     @ApiModelProperty(value = "项目级别")
     private String projectLevel;
 
+    @ApiModelProperty(value = "产品线")
+    private String productLine;
+
     private String projectManager;
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java

@@ -3,7 +3,8 @@ package com.adc.da.slrs.sarStandProjectLibrary.entity;
 
 import lombok.Data;
 
-import java.util.Date;
+import java.util.List;
+
 
 /**
  * //TODO
@@ -35,4 +36,7 @@ public class SarStandProjectLibraryDto {
     private String projectLevel;
 
     private String projectManager;
+
+    private String productLine;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java

@@ -0,0 +1,15 @@
+package com.adc.da.slrs.sarStandProjectLibrary.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class productLineDto {
+
+    private String projectManager;
+
+    private String productLine;
+
+    private List<SarStandProjectLibrary> sarStandProjectLibraries;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service;
 
 import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
@@ -10,4 +11,6 @@ public interface SarStandProjectLibraryService {
     IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     List<SarStandProjectLibrary> queryById(String id);
+    List<SarStandProjectLibrary> queryProjectManager();
+    List<SarStandProjectLibrary> queryByProductLine(String productLine);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
 import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto;
 import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,6 +44,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         sar.setCurrentNode(sarDto.getCurrentNode());
         sar.setProjectLevel(sar.getProjectLevel());
         sar.setProjectManager(sarDto.getProjectManager());
+        sar.setProductLine(sarDto.getProductLine());
         SimpleDateFormat formater = new SimpleDateFormat();
         formater.applyPattern("yyyy-MM-dd");
         try {
@@ -66,6 +68,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 .like(StringUtils.isNotEmpty(sar.getCurrentNode()),"current_node",sar.getCurrentNode())
                 .like(StringUtils.isNotEmpty(sar.getProjectLevel()),"project_level",sar.getProjectLevel())
                 .like(StringUtils.isNotEmpty(sar.getProjectManager()),"project_manager",sar.getProjectManager())
+                .like(StringUtils.isNotEmpty(sar.getProductLine()),"product_line",sar.getProductLine())
                 .ge(sar.getProjectStartDate()!=null,"project_start_date",sar.getProjectStartDate())
                 .le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate());
         return getSarStandProjectLibraryIPage(current, pageSize, wrapper);
@@ -83,6 +86,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         sar.setCurrentNode(sarDto.getCurrentNode());
         sar.setProjectLevel(sar.getProjectLevel());
         sar.setProjectManager(sarDto.getProjectManager());
+        sar.setProductLine(sarDto.getProductLine());
         SimpleDateFormat formater = new SimpleDateFormat();
         formater.applyPattern("yyyy-MM-dd");
         try {
@@ -106,6 +110,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 .like(StringUtils.isNotEmpty(sar.getCurrentNode()),"current_node",sar.getCurrentNode())
                 .like(StringUtils.isNotEmpty(sar.getProjectLevel()),"project_level",sar.getProjectLevel())
                 .like(StringUtils.isNotEmpty(sar.getProjectManager()),"project_manager",sar.getProjectManager())
+                .like(StringUtils.isNotEmpty(sar.getProductLine()),"product_line",sar.getProductLine())
                 .ge(sar.getProjectStartDate()!=null,"project_start_date",sar.getProjectStartDate())
                 .le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate());
         return getSarStandProjectLibraryIPage(current, pageSize, wrapper);
@@ -119,6 +124,23 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         return list;
     }
 
+    @Override
+    public List<SarStandProjectLibrary> queryProjectManager() {
+        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
+        wrapper.select("product_line","project_manager");
+        wrapper.groupBy("product_line");
+        List<SarStandProjectLibrary> list = sarStandProjectLibraryDao.selectList(wrapper);
+        return list;
+    }
+
+    @Override
+    public List<SarStandProjectLibrary> queryByProductLine(String productLine) {
+        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
+        wrapper.eq("product_line",productLine);
+        List<SarStandProjectLibrary> list = sarStandProjectLibraryDao.selectList(wrapper);
+        return list;
+    }
+
     private IPage<SarStandProjectLibrary> getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper<SarStandProjectLibrary> wrapper) {
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);