焊工页面筛选

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

@@ -7,6 +7,7 @@ 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.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
@@ -65,7 +66,7 @@ public class WelderController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @RequestMapping(value = "/saveWelder", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
     public ResponseModel<OrgUsrDto> saveWelder(@RequestBody JSONObject jsonObject, @RequestParam String bizOrgType ,
@@ -129,12 +130,21 @@ public class WelderController extends BaseController {
     @GetMapping(value = "/getCompanyWelder")
     public ResponseModel<IPage> getCompanyWelder(
             @RequestParam(value = "current") int current,
-            @RequestParam(value = "size") int size
+            @RequestParam(value = "size") int size,
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false) String idNumber,
+            @RequestParam(required = false) String licensedProject
     ){
         Page page = new Page();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(orgServiceImpl.getCompanyWelder(page));
+        IPage companyWelder = orgServiceImpl.getCompanyWelder(page);
+
+        List<WelderDto> welderRecords = companyWelder.getRecords();
+        List<WelderDto> result = welderRecords.stream().filter(w -> !w.getName().equals(name) && !w.getIdNumber().equals(idNumber)
+                && !w.getLicensedProject().equals(licensedProject)).collect(Collectors.toList());
+        Page records = page.setRecords(result);
+        return ResponseHelper.buildResponse(records);
     }
 
     /**