Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/controller/BusinessController.java

@@ -29,7 +29,7 @@ public class BusinessController {
         return res;
     }
 
-    @GetMapping("/business/warehouse/list")
+    @GetMapping("/business/team/warehouse/list")
     public Result<?> getWarehouses(@Validated BusinessWarehousesDTO.Request reqDTO) {
         Result<?> res = null;
         try {

project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamsDTO.java

@@ -26,19 +26,19 @@ public class BusinessTeamsDTO {
         /**
          * 当前页码
          */
-        private String pageCurrent;
+        private Integer pageCurrent;
         /**
          * 总页数
          */
-        private String pages;
+        private Integer pages;
         /**
          * 每业条数
          */
-        private String pageSize;
+        private Integer pageSize;
         /**
          * 总条数
          */
-        private String total;
+        private Integer total;
     }
 
     @lombok.Data

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessTeamServiceImpl.java

@@ -42,11 +42,11 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
     @Override
     public Result<?> getTeams(BusinessTeamsDTO.Request req) {
 
-        List<BusinessTeamsDTO.Content> contens = new ArrayList<>();
+        List<BusinessTeamsDTO.Content> contents = new ArrayList<>();
         Pageable pageable = PageRequest.of(req.getPage() - 1, req.getSize());
-        Page<OrgTeamEntity> teams = orgTeamDao.findAllByGroupId(req.getLevelValue(), pageable);
-        List<String> teamIds = teams.stream().map(OrgTeamEntity::getTeamId).collect(Collectors.toList());
-        for (OrgTeamEntity e:teams){
+        Page<OrgTeamEntity> page = orgTeamDao.findAllByGroupId(req.getLevelValue(), pageable);
+        List<String> teamIds = page.getContent().stream().map(OrgTeamEntity::getTeamId).collect(Collectors.toList());
+        for (OrgTeamEntity e:page.getContent()){
             String engineers = orgTeamEngineerDao.findAllByTeamId(e.getTeamId()).stream().map(e2->{
                 return engineerInfoDao.getByEngineerCode(e2.getEngineerCode()).getName();
             }).collect(Collectors.toList()).toString();
@@ -56,7 +56,9 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
             content.setEngineers(engineers);
             // todo 工作队容量
         }
-        return Result.success(new BusinessTeamsDTO.Result().setContent(contens));
+        BusinessTeamsDTO.Result rs = new BusinessTeamsDTO.Result();
+        rs.setContent(contents).setTotal(page.getTotalPages()).setPageSize(page.getSize());
+        return Result.success(rs);
     }
 
     private List<String> getWorkdaysChinese(String workDays){