Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -199,36 +199,6 @@ public class ProjectController extends BaseController {
 		return ResponseHelper.buildResponse(projectServiceImpl.list(wrapper));
 	}
 
-	/**
-	 * 当前登陆人所在公司/单位/企业 下的 所有焊工人员分页查询
-	 * @param current 当前页
-	 * @param current 每页大小
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "GET", value = "当前登陆人所在公司/单位/企业下的所有焊工人员分页列表", notes = "当前登陆人所在公司/单位/企业下的所有焊工人员分页查询列表")
-	@GetMapping(value = "/getCompanyWelder")
-	public ResponseModel<IPage> getCompanyWelder(
-		@RequestParam(value = "current") int current,
-		@RequestParam(value = "size") int size
-	){
-		Page page = new Page();
-		page.setCurrent(current);
-		page.setSize(size);
-		return ResponseHelper.buildResponse(orgServiceImpl.getCompanyWelder(page));
-	}
 
-	/**
-	 * 根据sequenceNbr查询项目焊工信息
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/getdetialInfo/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询项目焊工信息表", notes = "根据sequenceNbr查询项目焊工信息表")
-	public ResponseModel<Map> getdetialInfo(@PathVariable String sequenceNbr) {
-		return ResponseHelper.buildResponse(orgServiceImpl.getdetialInfo(sequenceNbr));
-	}
 }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -2,11 +2,15 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.WelderServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +34,11 @@ public class WelderController extends BaseController {
     @Autowired
     ProjectMapper projectMapper;
 
+    @Autowired
+    ProjectServiceImpl projectService;
 
+    @Autowired
+    WelderServiceImpl welderServiceImpl;
     /**
      * 新增焊工信息
      *
@@ -67,5 +75,16 @@ public class WelderController extends BaseController {
 
         return ResponseHelper.buildResponse(jsonObjectList);
     }
+    /**
+     * 项目焊工人员分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "项目焊工人员分页查询列表", notes = "项目焊工人员分页查询列表")
+    @GetMapping(value = "/getpageInfo")
+    public ResponseModel<IPage<Map>> getpageInfo(){
+        return ResponseHelper.buildResponse(welderServiceImpl.getpageInfo());
+    }
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

+package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class WelderServiceImpl {
+
+    @Autowired
+    OrgServiceImpl orgService;
+
+    @Autowired
+    ProjectServiceImpl projectService;
+
+    @Autowired
+    ProjectResourceServiceImpl projectResourceService;
+
+
+    @BusinessIdentify
+    public List<Map> getInfo(){
+        ReginParams reginParams = orgService.getReginParams();
+        ReginParams.BusinessInfo businessInfo = reginParams.getBusinessInfo();
+        Long companySequenceNbr = businessInfo.getCompanySequenceNbr();
+        //默认建设单位
+        LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+        projectWrapper.eq(Project::getConstructionUnitId,companySequenceNbr);
+        List<Project> projectList = projectService.list(projectWrapper);
+        List<Long> projectIdList = new ArrayList<>();
+        List<Long> welderIdList = new ArrayList<>();
+        for(Project project:projectList){
+            projectIdList.add(project.getSequenceNbr());
+        }
+        for(Long projectId:projectIdList){
+            LambdaQueryWrapper<ProjectResource> projectResourceWrapper = new LambdaQueryWrapper<>();
+            projectResourceWrapper.eq(ProjectResource::getType, ProjectResourceEnum.焊工资源.getCode())
+                    .eq(ProjectResource::getProjectId,projectId);
+            List<ProjectResource> projectResourceList = projectResourceService.list(projectResourceWrapper);
+            for(ProjectResource projectResource : projectResourceList){
+                welderIdList.add(projectResource.getResourceId());
+            }
+        }
+        List<Map> mapList = new ArrayList<>();
+        for(Long welderId:welderIdList){
+            mapList.add(orgService.getdetialInfo(String.valueOf(welderId)));
+        }
+        return mapList;
+    }
+
+    public IPage<Map> getpageInfo(){
+        IPage<Map> page = new Page<>();
+        page.setSize(getInfo().size());
+        page.setCurrent(1L);
+        page.setRecords(getInfo());
+        page.setTotal(getInfo().size());
+        return page;
+    }
+}