From 5da023545fb5ea8a366156f1707ec53daa2218c4 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Mon, 24 Jun 2024 16:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E6=B0=91=E5=B7=A5=E5=AE=9E=E5=90=8D?= =?UTF-8?q?=E5=88=B6--=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SgcJsjdBuiProjectManagementController.java | 2 +- ...uiSupervisoryUnitManagementController.java | 2 +- .../domain/BsSgcJsjdBuiProjectManagement.java | 5 +++ ...BsSgcJsjdBuiSupervisoryUnitManagement.java | 5 +++ .../BsSgcJsjdBuiProjectManagementService.java | 29 +++++++++++++++++ ...jdBuiSupervisoryUnitManagementService.java | 32 +++++++++++++++++++ 6 files changed, 73 insertions(+), 2 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProjectManagementController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProjectManagementController.java index 6b62d42d..678d7a79 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProjectManagementController.java +++ b/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 sp) { - return bsSgcJsjdBuiProjectManagementService.selectPage(sp); + return bsSgcJsjdBuiProjectManagementService.selectPage1(sp); } /** diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSupervisoryUnitManagementController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSupervisoryUnitManagementController.java index 4b2fa725..24a3218e 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSupervisoryUnitManagementController.java +++ b/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 sp) { - return bsSgcJsjdBuiSupervisoryUnitManagementService.selectPage(sp); + return bsSgcJsjdBuiSupervisoryUnitManagementService.selectPage1(sp); } /** diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProjectManagement.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProjectManagement.java index 01b6bfb2..086901da 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProjectManagement.java +++ b/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) + Listchildren; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSupervisoryUnitManagement.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSupervisoryUnitManagement.java index c6766745..1359e45b 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSupervisoryUnitManagement.java +++ b/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 children; } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java index 76fd7f48..a1f2e17e 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java +++ b/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{ + @Autowired + BsSgcJsjdBuiAttendanceConstructionMapper bsSgcJsjdBuiAttendanceConstructionMapper; + public IPage selectPage1(SearchParam sp){ + Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); + Listrecords = page.getRecords(); + ListbsSgcJsjdBuiProjectManagements=new ArrayList<>(); + for (BsSgcJsjdBuiProjectManagement bs:records){ + LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + List bsSgcJsjdBuiAttendanceConstructions = bsSgcJsjdBuiAttendanceConstructionMapper.selectList(lw.eq(BsSgcJsjdBuiAttendanceConstruction::getIdNo, bs.getIdNo())); + if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiAttendanceConstructions)){ + bs.setChildren(bsSgcJsjdBuiAttendanceConstructions); + } + bsSgcJsjdBuiProjectManagements.add(bs); + } + page.setRecords(bsSgcJsjdBuiProjectManagements); + return page; + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java index e4080187..358585f9 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java +++ b/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{ + @Autowired + BsSgcJsjdBuiAttendanceSupervisorMapper bsSgcJsjdBuiAttendanceSupervisorMapper; + public IPage selectPage1(SearchParam sp){ + Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); + List records = page.getRecords(); + ListbsSgcJsjdBuiSupervisoryUnitManagements=new ArrayList<>(); + for (BsSgcJsjdBuiSupervisoryUnitManagement bs:records){ + LambdaQueryWrapper lw=new LambdaQueryWrapper<>(); + List bsSgcJsjdBuiAttendanceSupervisors = bsSgcJsjdBuiAttendanceSupervisorMapper.selectList(lw.eq(BsSgcJsjdBuiAttendanceSupervisor::getIdNo, bs.getIdNo())); + if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiAttendanceSupervisors)){ + bs.setChildren(bsSgcJsjdBuiAttendanceSupervisors); + } + bsSgcJsjdBuiSupervisoryUnitManagements.add(bs); + } + page.setRecords(bsSgcJsjdBuiSupervisoryUnitManagements); + return page; + } }