农民工实名制--项目管理人员修改修改

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProjectManagementController.java

@@ -52,7 +52,7 @@ public class BsSgcJsjdBuiProjectManagementController extends BaseController
     @ApiOperation("项目管理人员列表")
     public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiProjectManagement> sp)
     {
-        return bsSgcJsjdBuiProjectManagementService.selectPage(sp);
+        return bsSgcJsjdBuiProjectManagementService.selectPage1(sp);
     }
 
     /**

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSupervisoryUnitManagementController.java

@@ -52,7 +52,7 @@ public class BsSgcJsjdBuiSupervisoryUnitManagementController extends BaseControl
     @ApiOperation("监管单位管理人员列表")
     public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiSupervisoryUnitManagement> sp)
     {
-        return bsSgcJsjdBuiSupervisoryUnitManagementService.selectPage(sp);
+        return bsSgcJsjdBuiSupervisoryUnitManagementService.selectPage1(sp);
     }
 
     /**

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProjectManagement.java

@@ -1,5 +1,6 @@
 package com.kms.build.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.jianwei.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 项目管理人员对象 bs_sgc_jsjd_bui_project_management
  *
@@ -49,4 +52,6 @@ public class BsSgcJsjdBuiProjectManagement extends BaseEntity
     @ApiModelProperty("职务")
     private String post;
 
+    @TableField(exist = false)
+    List<BsSgcJsjdBuiAttendanceConstruction>children;
 }

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSupervisoryUnitManagement.java

@@ -1,5 +1,6 @@
 package com.kms.build.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.jianwei.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 监管单位管理人员对象 bs_sgc_jsjd_bui_supervisory_unit_management
  *
@@ -65,4 +68,6 @@ public class BsSgcJsjdBuiSupervisoryUnitManagement extends BaseEntity
     @ApiModelProperty("更新者")
     private String updateUid;
 
+    @TableField(exist = false)
+    List<BsSgcJsjdBuiAttendanceSupervisor> children;
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java

@@ -1,10 +1,22 @@
 package com.kms.build.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+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.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.kms.build.domain.BsSgcJsjdBuiAttendanceConstruction;
+import com.kms.build.mapper.BsSgcJsjdBuiAttendanceConstructionMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiProjectManagementMapper;
 import com.kms.build.domain.BsSgcJsjdBuiProjectManagement;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 项目管理人员Service接口
  *
@@ -13,5 +25,22 @@ import com.kms.build.domain.BsSgcJsjdBuiProjectManagement;
  */
 @Service
 public class BsSgcJsjdBuiProjectManagementService extends BaseService<BsSgcJsjdBuiProjectManagementMapper, BsSgcJsjdBuiProjectManagement>{
+    @Autowired
+    BsSgcJsjdBuiAttendanceConstructionMapper bsSgcJsjdBuiAttendanceConstructionMapper;
 
+    public IPage<BsSgcJsjdBuiProjectManagement> selectPage1(SearchParam<BsSgcJsjdBuiProjectManagement> sp){
+        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+        List<BsSgcJsjdBuiProjectManagement>records = page.getRecords();
+        List<BsSgcJsjdBuiProjectManagement>bsSgcJsjdBuiProjectManagements=new ArrayList<>();
+        for (BsSgcJsjdBuiProjectManagement bs:records){
+            LambdaQueryWrapper<BsSgcJsjdBuiAttendanceConstruction>lw=new LambdaQueryWrapper<>();
+            List<BsSgcJsjdBuiAttendanceConstruction> bsSgcJsjdBuiAttendanceConstructions = bsSgcJsjdBuiAttendanceConstructionMapper.selectList(lw.eq(BsSgcJsjdBuiAttendanceConstruction::getIdNo, bs.getIdNo()));
+            if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiAttendanceConstructions)){
+                bs.setChildren(bsSgcJsjdBuiAttendanceConstructions);
+            }
+            bsSgcJsjdBuiProjectManagements.add(bs);
+        }
+        page.setRecords(bsSgcJsjdBuiProjectManagements);
+        return page;
+    }
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java

@@ -1,10 +1,25 @@
 package com.kms.build.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+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.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.kms.build.domain.BsSgcJsjdBuiAttendanceConstruction;
+import com.kms.build.domain.BsSgcJsjdBuiAttendanceSupervisor;
+import com.kms.build.domain.BsSgcJsjdBuiProjectManagement;
+import com.kms.build.mapper.BsSgcJsjdBuiAttendanceConstructionMapper;
+import com.kms.build.mapper.BsSgcJsjdBuiAttendanceSupervisorMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiSupervisoryUnitManagementMapper;
 import com.kms.build.domain.BsSgcJsjdBuiSupervisoryUnitManagement;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 监管单位管理人员Service接口
  *
@@ -13,5 +28,22 @@ import com.kms.build.domain.BsSgcJsjdBuiSupervisoryUnitManagement;
  */
 @Service
 public class BsSgcJsjdBuiSupervisoryUnitManagementService extends BaseService<BsSgcJsjdBuiSupervisoryUnitManagementMapper, BsSgcJsjdBuiSupervisoryUnitManagement>{
+    @Autowired
+    BsSgcJsjdBuiAttendanceSupervisorMapper bsSgcJsjdBuiAttendanceSupervisorMapper;
 
+    public IPage<BsSgcJsjdBuiAttendanceSupervisor> selectPage1(SearchParam<BsSgcJsjdBuiSupervisoryUnitManagement> sp){
+        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+        List<BsSgcJsjdBuiSupervisoryUnitManagement> records = page.getRecords();
+        List<BsSgcJsjdBuiSupervisoryUnitManagement>bsSgcJsjdBuiSupervisoryUnitManagements=new ArrayList<>();
+        for (BsSgcJsjdBuiSupervisoryUnitManagement bs:records){
+            LambdaQueryWrapper<BsSgcJsjdBuiAttendanceSupervisor> lw=new LambdaQueryWrapper<>();
+            List<BsSgcJsjdBuiAttendanceSupervisor> bsSgcJsjdBuiAttendanceSupervisors = bsSgcJsjdBuiAttendanceSupervisorMapper.selectList(lw.eq(BsSgcJsjdBuiAttendanceSupervisor::getIdNo, bs.getIdNo()));
+            if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiAttendanceSupervisors)){
+                bs.setChildren(bsSgcJsjdBuiAttendanceSupervisors);
+            }
+            bsSgcJsjdBuiSupervisoryUnitManagements.add(bs);
+        }
+        page.setRecords(bsSgcJsjdBuiSupervisoryUnitManagements);
+        return page;
+    }
 }