新增 通过 单位id获取单位下的所有人员列表

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

@@ -135,27 +135,27 @@ public class WelderController extends BaseController {
     }
 
     /**
-     * 根据sequenceNbr查询焊工信息
+     * 根据sequenceNbr查询人员信息
      *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询项目焊工信息表", notes = "根据sequenceNbr查询项目焊工信息表")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询人员信息", notes = "根据sequenceNbr查询人员信息")
     public ResponseModel<Map> selectOneById(@PathVariable String sequenceNbr) {
         return ResponseHelper.buildResponse(orgServiceImpl.getdetialInfo(sequenceNbr));
     }
 
     /**
-     * 根据sequenceNbr删除焊工信息
+     * 根据sequenceNbr删除人员信息表
      *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr删除项目焊工信息表", notes = "根据sequenceNbr删除项目焊工信息表")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr删除人员信息表", notes = "根据sequenceNbr删除人员信息表")
     public void deleteOneById(@PathVariable String sequenceNbr) throws Exception {
         orgServiceImpl.delectInfo(sequenceNbr);
     }

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

@@ -334,7 +334,34 @@ public class OrgServiceImpl {
                 throw new Exception("该企业/部门下还有人员，不可删除！");
             }
         }
+    }
+
+    /**
+     * 获取企业下的人员信息列表
+     * @param companyId 单位/企业id
+     * @return
+     */
+    public IPage getPersonInfo(String companyId,IPage page){
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr :: getSequenceNbr ,companyId);
+        OrgUsr orgUsrCompany = orgUsrServiceImpl.getOne(wrapper);
 
+        LambdaQueryWrapper<OrgUsr> welderWrapper = new LambdaQueryWrapper<>();
+        welderWrapper.likeRight(OrgUsr :: getBizOrgCode,orgUsrCompany.getBizOrgCode()).eq(OrgUsr :: getBizOrgType, OrgEnum.普通人员.getKey());
+        List<OrgUsr> orgUsrList = new ArrayList<>();
+        if(ValidationUtil.isEmpty(page)){
+            orgUsrList = orgUsrServiceImpl.list(welderWrapper);
+            page = new Page();
+        }else{
+            orgUsrList = orgUsrServiceImpl.page(page,welderWrapper).getRecords();
+        }
 
+        List<Map> mapList = new ArrayList<>();
+        for (OrgUsr orgUsr : orgUsrList) {
+            Map map = getdetialInfo(String.valueOf(orgUsr.getSequenceNbr()));
+            mapList.add(map);
+        }
+        page.setRecords(mapList);
+        return page;
     }
 }