From d9c81eb37a8aaa642d0e4e7c22c6206be0f80dc7 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Mon, 24 Mar 2025 14:12:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IBusMachineryDetailService.java | 4 +- .../service/IBusMachineryService.java | 4 +- .../impl/BusMachineryDetailServiceImpl.java | 33 ++++----- .../service/impl/BusMachineryServiceImpl.java | 29 ++++---- .../materials/service/IBusCompanyService.java | 4 +- .../IBusMaterialsInventoryService.java | 4 +- .../service/IBusMaterialsService.java | 4 +- .../service/impl/BusCompanyServiceImpl.java | 26 +++---- .../BusMaterialsInventoryServiceImpl.java | 41 +++++------ .../service/impl/BusMaterialsServiceImpl.java | 35 ++++----- .../service/IBusConstructionUserService.java | 4 +- .../service/IBusContractorService.java | 4 +- .../project/service/IBusProjectService.java | 4 +- .../service/IBusProjectTeamMemberService.java | 4 +- .../service/IBusProjectTeamService.java | 4 +- .../IBusUserProjectRelevancyService.java | 4 +- .../impl/BusConstructionUserServiceImpl.java | 72 ++++++++++--------- .../impl/BusContractorServiceImpl.java | 29 ++++---- .../service/impl/BusProjectServiceImpl.java | 48 ++++++------- .../impl/BusProjectTeamMemberServiceImpl.java | 28 ++++---- .../impl/BusProjectTeamServiceImpl.java | 25 ++++--- .../BusUserProjectRelevancyServiceImpl.java | 16 ++--- .../safety/domain/BusSafetyInspection.java | 5 ++ .../SafetyInspectionCreateReq.java | 7 ++ .../SafetyInspectionUpdateReq.java | 7 ++ .../req/safetylog/SafetyLogCreateReq.java | 1 - .../domain/vo/BusSafetyInspectionVo.java | 6 ++ .../service/IBusSafetyInspectionService.java | 2 +- .../safety/service/IBusSafetyLogService.java | 2 +- .../IBusSafetyWeeklyReportService.java | 2 +- .../service/IBusTeamMeetingService.java | 2 +- .../impl/BusSafetyInspectionServiceImpl.java | 43 +++++++++-- .../service/impl/BusSafetyLogServiceImpl.java | 18 +++-- .../BusSafetyWeeklyReportServiceImpl.java | 23 ++++-- .../impl/BusTeamMeetingServiceImpl.java | 23 ++++-- plus-ui/.env.development | 2 +- .../src/api/safety/safetyInspection/types.ts | 10 +++ .../SafetyInspectionDetailDialog.vue | 7 +- .../views/safety/safetyInspection/index.vue | 68 ++++-------------- .../component/SafetyLogDetailDialog.vue | 1 + 40 files changed, 363 insertions(+), 292 deletions(-) diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java index 492250d3..3a2b56f5 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java @@ -1,6 +1,6 @@ package org.dromara.machinery.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -86,7 +86,7 @@ public interface IBusMachineryDetailService extends IService * @param req 机械详情查询条件 * @return 机械详情查询条件封装 */ - QueryWrapper getQueryWrapper(MachineryDetailQueryReq req); + LambdaQueryWrapper buildQuery(MachineryDetailQueryReq req); /** * 获取机械详情分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java index 683414bd..83f368bb 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java @@ -1,6 +1,6 @@ package org.dromara.machinery.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -86,7 +86,7 @@ public interface IBusMachineryService extends IService { * @param req 机械查询条件 * @return 机械查询条件封装 */ - QueryWrapper getQueryWrapper(MachineryQueryReq req); + LambdaQueryWrapper buildQuery(MachineryQueryReq req); /** * 获取机械分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java index d15c7039..94dd73da 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.machinery.service.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -77,7 +78,7 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -89,8 +90,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl queryList(MachineryDetailQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - List list = this.list(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + List list = this.list(lqw); return list.stream().map(this::getVo).toList(); } @@ -214,10 +215,10 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl getQueryWrapper(MachineryDetailQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(MachineryDetailQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -230,17 +231,17 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl queryPageList(MachineryQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -85,8 +86,8 @@ public class BusMachineryServiceImpl extends ServiceImpl queryList(MachineryQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - List list = this.list(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + List list = this.list(lqw); return list.stream().map(this::getVo).toList(); } @@ -209,10 +210,10 @@ public class BusMachineryServiceImpl extends ServiceImpl getQueryWrapper(MachineryQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(MachineryQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -223,15 +224,15 @@ public class BusMachineryServiceImpl extends ServiceImpl { * @param req 查询条件 * @return 查询条件封装 */ - QueryWrapper getQueryWrapper(CompanyQueryReq req); + LambdaQueryWrapper buildQuery(CompanyQueryReq req); /** * 获取公司分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java index 60026a78..58ad63dc 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java @@ -1,6 +1,6 @@ package org.dromara.materials.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -86,7 +86,7 @@ public interface IBusMaterialsInventoryService extends IService getQueryWrapper(MaterialsInventoryQueryReq req); + LambdaQueryWrapper buildQuery(MaterialsInventoryQueryReq req); /** * 获取材料出/入库分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java index 03a24014..d315f868 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java @@ -1,6 +1,6 @@ package org.dromara.materials.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -86,7 +86,7 @@ public interface IBusMaterialsService extends IService { * @param req 查询条件 * @return 查询条件封装 */ - QueryWrapper getQueryWrapper(MaterialsQueryReq req); + LambdaQueryWrapper buildQuery(MaterialsQueryReq req); /** * 获取材料分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java index be0d62c1..ac53c09e 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java @@ -70,7 +70,7 @@ public class BusCompanyServiceImpl extends ServiceImpl queryPageList(CompanyQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getCompanyVoPage(result)); } @@ -82,8 +82,8 @@ public class BusCompanyServiceImpl extends ServiceImpl queryList(CompanyQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - return baseMapper.selectVoList(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + return baseMapper.selectVoList(lqw); } /** @@ -194,10 +194,10 @@ public class BusCompanyServiceImpl extends ServiceImpl getQueryWrapper(CompanyQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(CompanyQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -207,14 +207,14 @@ public class BusCompanyServiceImpl extends ServiceImpl queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -84,8 +85,8 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl queryList(MaterialsInventoryQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - List list = this.list(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + List list = this.list(lqw); return list.stream().map(this::getVo).toList(); } @@ -211,10 +212,10 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl getQueryWrapper(MaterialsInventoryQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(MaterialsInventoryQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -236,23 +237,23 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl materialsIdList = materialsService.listObjs(materialsQueryWrapper, obj -> (Long) obj); - queryWrapper.in("materials_id", materialsIdList); + lqw.in(BusMaterialsInventory::getMaterialsId, materialsIdList); } // 模糊查询 - queryWrapper.like(StringUtils.isNotBlank(operator), "operator", operator); - queryWrapper.like(StringUtils.isNotBlank(remark), "remark", remark); - queryWrapper.like(StringUtils.isNotBlank(disposition), "disposition", disposition); - queryWrapper.like(StringUtils.isNotBlank(recipient), "recipient", recipient); - queryWrapper.like(StringUtils.isNotBlank(shipper), "shipper", shipper); + lqw.like(StringUtils.isNotBlank(operator), BusMaterialsInventory::getOperator, operator); + lqw.like(StringUtils.isNotBlank(remark), BusMaterialsInventory::getRemark, remark); + lqw.like(StringUtils.isNotBlank(disposition), BusMaterialsInventory::getDisposition, disposition); + lqw.like(StringUtils.isNotBlank(recipient), BusMaterialsInventory::getRecipient, recipient); + lqw.like(StringUtils.isNotBlank(shipper), BusMaterialsInventory::getShipper, shipper); // 精确查询 - queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id); - queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId); - queryWrapper.eq(ObjectUtils.isNotEmpty(materialsId), "materials_id", materialsId); - queryWrapper.eq(ObjectUtils.isNotEmpty(number), "number", number); - queryWrapper.eq(ObjectUtils.isNotEmpty(outPutTime), "out_put_time", outPutTime); - queryWrapper.eq(ObjectUtils.isNotEmpty(residue), "residue", residue); - queryWrapper.eq(ObjectUtils.isNotEmpty(outPut), "out_put", outPut); - return queryWrapper; + lqw.eq(ObjectUtils.isNotEmpty(id), BusMaterialsInventory::getId, id); + lqw.eq(ObjectUtils.isNotEmpty(projectId), BusMaterialsInventory::getProjectId, projectId); + lqw.eq(ObjectUtils.isNotEmpty(materialsId), BusMaterialsInventory::getMaterialsId, materialsId); + lqw.eq(ObjectUtils.isNotEmpty(number), BusMaterialsInventory::getNumber, number); + lqw.eq(ObjectUtils.isNotEmpty(outPutTime), BusMaterialsInventory::getOutPutTime, outPutTime); + lqw.eq(ObjectUtils.isNotEmpty(residue), BusMaterialsInventory::getResidue, residue); + lqw.eq(ObjectUtils.isNotEmpty(outPut), BusMaterialsInventory::getOutPut, outPut); + return lqw; } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java index 4a971cac..b9e6b61a 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.materials.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -85,7 +86,7 @@ public class BusMaterialsServiceImpl extends ServiceImpl queryPageList(MaterialsQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getMaterialsVoPage(result)); } @@ -97,8 +98,8 @@ public class BusMaterialsServiceImpl extends ServiceImpl queryList(MaterialsQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - return baseMapper.selectVoList(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + return baseMapper.selectVoList(lqw); } /** @@ -246,10 +247,10 @@ public class BusMaterialsServiceImpl extends ServiceImpl getQueryWrapper(MaterialsQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(MaterialsQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -263,18 +264,18 @@ public class BusMaterialsServiceImpl extends ServiceImpl getQueryWrapper(ConstructionUserQueryReq req); + LambdaQueryWrapper buildQuery(ConstructionUserQueryReq req); /** * 获取施工人员分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java index 0f8a5d2b..e3e98174 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java @@ -1,6 +1,6 @@ package org.dromara.project.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -86,7 +86,7 @@ public interface IBusContractorService extends IService { * @param req 分包公司查询条件 * @return 分包公司查询条件封装 */ - QueryWrapper getQueryWrapper(ContractorQueryReq req); + LambdaQueryWrapper buildQuery(ContractorQueryReq req); /** * 获取分包公司分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java index 0c6673ac..8080b2ce 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java @@ -1,6 +1,6 @@ package org.dromara.project.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -86,7 +86,7 @@ public interface IBusProjectService extends IService { * @param req 查询条件 * @return 查询条件封装 */ - QueryWrapper getQueryWrapper(ProjectQueryReq req); + LambdaQueryWrapper buildQuery(ProjectQueryReq req); /** * 获取项目分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java index fb4997c5..c6299424 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java @@ -1,6 +1,6 @@ package org.dromara.project.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -86,7 +86,7 @@ public interface IBusProjectTeamMemberService extends IService getQueryWrapper(ProjectTeamMemberQueryReq req); + LambdaQueryWrapper buildQuery(ProjectTeamMemberQueryReq req); /** * 获取项目班组成员分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java index e085160a..50fcc22b 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java @@ -1,6 +1,6 @@ package org.dromara.project.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -95,7 +95,7 @@ public interface IBusProjectTeamService extends IService { * @param req 项目班组查询条件 * @return 项目班组查询条件封装 */ - QueryWrapper getQueryWrapper(ProjectTeamQueryReq req); + LambdaQueryWrapper buildQuery(ProjectTeamQueryReq req); /** * 获取项目班组分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java index de46fb71..441683be 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java @@ -1,6 +1,6 @@ package org.dromara.project.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; @@ -114,7 +114,7 @@ public interface IBusUserProjectRelevancyService extends IService getQueryWrapper(UserProjectRelevancyQueryReq req); + LambdaQueryWrapper buildQuery(UserProjectRelevancyQueryReq req); /** * 获取系统用户与项目关联分页视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java index a6802490..cebe1335 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java @@ -1,7 +1,9 @@ package org.dromara.project.service.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; @@ -86,7 +88,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(getVoPage(result)); } @@ -98,8 +100,8 @@ public class BusConstructionUserServiceImpl extends ServiceImpl queryList(ConstructionUserQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - List list = this.list(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + List list = this.list(lqw); return list.stream().map(this::getVo).toList(); } @@ -240,10 +242,10 @@ public class BusConstructionUserServiceImpl extends ServiceImpl getQueryWrapper(ConstructionUserQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(ConstructionUserQueryReq req) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -273,39 +275,39 @@ public class BusConstructionUserServiceImpl extends ServiceImpl wrapper - .ne("team_id", notTeamId) - .or().isNull("team_id")); + lqw.and(wrapper -> wrapper + .ne(BusConstructionUser::getTeamId, notTeamId) + .or().isNull(BusConstructionUser::getTeamId)); } - return queryWrapper; + return lqw; } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java index ec2d9b86..18bb5aaf 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.project.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -70,7 +71,7 @@ public class BusContractorServiceImpl extends ServiceImpl queryPageList(ContractorQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -82,8 +83,8 @@ public class BusContractorServiceImpl extends ServiceImpl queryList(ContractorQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - List list = this.list(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + List list = this.list(lqw); return list.stream().map(this::getVo).toList(); } @@ -222,10 +223,10 @@ public class BusContractorServiceImpl extends ServiceImpl getQueryWrapper(ContractorQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(ContractorQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -236,15 +237,15 @@ public class BusContractorServiceImpl extends ServiceImpl queryPageList(ProjectQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -83,8 +83,8 @@ public class BusProjectServiceImpl extends ServiceImpl queryList(ProjectQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - return baseMapper.selectVoList(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + return baseMapper.selectVoList(lqw); } /** @@ -233,10 +233,10 @@ public class BusProjectServiceImpl extends ServiceImpl getQueryWrapper(ProjectQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(ProjectQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -257,25 +257,25 @@ public class BusProjectServiceImpl extends ServiceImpl queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -93,8 +93,8 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl queryList(ProjectTeamMemberQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - List list = this.list(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + List list = this.list(lqw); return list.stream().map(this::getVo).toList(); } @@ -262,10 +262,10 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl getQueryWrapper(ProjectTeamMemberQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(ProjectTeamMemberQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -281,17 +281,17 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl constructionUserIdList = constructionUserService.listObjs(constructionUserQueryWrapper, obj -> (Long) obj); - queryWrapper.in("member_id", constructionUserIdList); + lqw.in(BusProjectTeamMember::getMemberId, constructionUserIdList); } // 模糊查询 - queryWrapper.like(StringUtils.isNotBlank(remark), "remark", remark); + lqw.like(StringUtils.isNotBlank(remark), BusProjectTeamMember::getRemark, remark); // 精确查询 - queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id); - queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId); - queryWrapper.eq(ObjectUtils.isNotEmpty(teamId), "team_id", teamId); - queryWrapper.eq(ObjectUtils.isNotEmpty(memberId), "member_id", memberId); - queryWrapper.eq(ObjectUtils.isNotEmpty(postId), "post_id", postId); - return queryWrapper; + lqw.eq(ObjectUtils.isNotEmpty(id), BusProjectTeamMember::getId, id); + lqw.eq(ObjectUtils.isNotEmpty(projectId), BusProjectTeamMember::getProjectId, projectId); + lqw.eq(ObjectUtils.isNotEmpty(teamId), BusProjectTeamMember::getTeamId, teamId); + lqw.eq(ObjectUtils.isNotEmpty(memberId), BusProjectTeamMember::getMemberId, memberId); + lqw.eq(ObjectUtils.isNotEmpty(postId), BusProjectTeamMember::getPostId, postId); + return lqw; } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java index dcf5a29c..4076202c 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java @@ -2,7 +2,6 @@ package org.dromara.project.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -85,7 +84,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -97,8 +96,8 @@ public class BusProjectTeamServiceImpl extends ServiceImpl queryList(ProjectTeamQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); - List list = this.list(queryWrapper); + LambdaQueryWrapper lqw = this.buildQuery(req); + List list = this.list(lqw); return list.stream().map(this::getVo).toList(); } @@ -263,10 +262,10 @@ public class BusProjectTeamServiceImpl extends ServiceImpl getQueryWrapper(ProjectTeamQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(ProjectTeamQueryReq req) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); if (req == null) { - return queryWrapper; + return lqw; } // 从对象中取值 Long id = req.getId(); @@ -275,13 +274,13 @@ public class BusProjectTeamServiceImpl extends ServiceImpl queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -89,7 +89,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl queryList(UserProjectRelevancyQueryReq req) { - QueryWrapper queryWrapper = this.getQueryWrapper(req); + LambdaQueryWrapper queryWrapper = this.buildQuery(req); return baseMapper.selectVoList(queryWrapper); } @@ -241,7 +241,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl queryWrapper = this.getQueryWrapper(req); + LambdaQueryWrapper queryWrapper = this.buildQuery(req); // 查询数据库 Page result = this.page(pageQuery.build(), queryWrapper); return TableDataInfo.build(this.getVoPage(result)); @@ -313,8 +313,8 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl getQueryWrapper(UserProjectRelevancyQueryReq req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public LambdaQueryWrapper buildQuery(UserProjectRelevancyQueryReq req) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if (req == null) { return queryWrapper; } @@ -323,9 +323,9 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl getQueryWrapper(SafetyInspectionQueryReq req); + LambdaQueryWrapper buildQuery(SafetyInspectionQueryReq req); /** * 获取安全巡检工单分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyLogService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyLogService.java index bfd2983d..f515e73b 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyLogService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyLogService.java @@ -86,7 +86,7 @@ public interface IBusSafetyLogService extends IService { * @param req 安全日志查询条件 * @return 安全日志查询条件封装 */ - LambdaQueryWrapper getQueryWrapper(SafetyLogQueryReq req); + LambdaQueryWrapper buildQuery(SafetyLogQueryReq req); /** * 获取安全日志分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyWeeklyReportService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyWeeklyReportService.java index 8164e86b..a803515c 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyWeeklyReportService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusSafetyWeeklyReportService.java @@ -86,7 +86,7 @@ public interface IBusSafetyWeeklyReportService extends IService getQueryWrapper(SafetyWeeklyReportQueryReq req); + LambdaQueryWrapper buildQuery(SafetyWeeklyReportQueryReq req); /** * 获取安全周报分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java index 6b4c8048..9befb95f 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IBusTeamMeetingService.java @@ -86,7 +86,7 @@ public interface IBusTeamMeetingService extends IService { * @param req 站班会查询条件 * @return 站班会查询条件封装 */ - LambdaQueryWrapper getQueryWrapper(TeamMeetingQueryReq req); + LambdaQueryWrapper buildQuery(TeamMeetingQueryReq req); /** * 获取站班会分页对象视图 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyInspectionServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyInspectionServiceImpl.java index 68f1b031..96b15661 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyInspectionServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyInspectionServiceImpl.java @@ -15,6 +15,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.domain.BusProjectTeam; import org.dromara.project.service.IBusConstructionUserService; +import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamService; import org.dromara.safety.domain.BusSafetyInspection; import org.dromara.safety.domain.req.safetyinspection.SafetyInspectionCreateReq; @@ -47,6 +48,9 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl queryPageList(SafetyInspectionQueryReq req, PageQuery pageQuery) { - Page result = this.page(pageQuery.build(), getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -83,7 +87,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl queryList(SafetyInspectionQueryReq req) { - List safetyInspection = this.list(this.getQueryWrapper(req)); + List safetyInspection = this.list(this.buildQuery(req)); return safetyInspection.stream().map(this::getVo).toList(); } @@ -135,7 +139,32 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl ids, Boolean isValid) { if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 + // TODO 做一些业务上的校验,判断是否需要校验 + Long count = this.lambdaQuery().in(BusSafetyInspection::getPid, ids).count(); + if (count > 0) { + throw new ServiceException("所选安全巡检工单包含子数据，不允许删除", HttpStatus.BAD_REQUEST); + } } return this.removeBatchByIds(ids); } @@ -205,7 +238,7 @@ public class BusSafetyInspectionServiceImpl extends ServiceImpl getQueryWrapper(SafetyInspectionQueryReq req) { + public LambdaQueryWrapper buildQuery(SafetyInspectionQueryReq req) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); if (req == null) { return lqw; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java index 5460a26a..c99a24c0 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyLogServiceImpl.java @@ -15,6 +15,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.service.IBusConstructionUserService; +import org.dromara.project.service.IBusProjectService; import org.dromara.safety.domain.BusSafetyLog; import org.dromara.safety.domain.req.safetylog.SafetyLogCreateReq; import org.dromara.safety.domain.req.safetylog.SafetyLogQueryReq; @@ -42,6 +43,9 @@ public class BusSafetyLogServiceImpl extends ServiceImpl queryPageList(SafetyLogQueryReq req, PageQuery pageQuery) { - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -78,7 +82,7 @@ public class BusSafetyLogServiceImpl extends ServiceImpl queryList(SafetyLogQueryReq req) { - List safetyLogList = this.list(this.getQueryWrapper(req)); + List safetyLogList = this.list(this.buildQuery(req)); return safetyLogList.stream().map(this::getVo).toList(); } @@ -131,8 +135,14 @@ public class BusSafetyLogServiceImpl extends ServiceImpl getQueryWrapper(SafetyLogQueryReq req) { + public LambdaQueryWrapper buildQuery(SafetyLogQueryReq req) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); if (req == null) { return lqw; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java index 3215da93..2a7d2e08 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusSafetyWeeklyReportServiceImpl.java @@ -12,6 +12,7 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.project.service.IBusProjectService; import org.dromara.safety.domain.BusSafetyWeeklyReport; import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportCreateReq; import org.dromara.safety.domain.req.safetyweeklyreport.SafetyWeeklyReportQueryReq; @@ -41,6 +42,9 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl queryPageList(SafetyWeeklyReportQueryReq req, PageQuery pageQuery) { - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -77,7 +81,7 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl queryList(SafetyWeeklyReportQueryReq req) { - List safetyWeeklyReportList = this.list(this.getQueryWrapper(req)); + List safetyWeeklyReportList = this.list(this.buildQuery(req)); return safetyWeeklyReportList.stream().map(this::getVo).toList(); } @@ -129,7 +133,16 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl ids, Boolean isValid) { if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 + // TODO 做一些业务上的校验,判断是否需要校验 } return this.removeBatchByIds(ids); } @@ -178,7 +191,7 @@ public class BusSafetyWeeklyReportServiceImpl extends ServiceImpl getQueryWrapper(SafetyWeeklyReportQueryReq req) { + public LambdaQueryWrapper buildQuery(SafetyWeeklyReportQueryReq req) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); if (req == null) { return lqw; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java index 559d2d90..0f077c0d 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/BusTeamMeetingServiceImpl.java @@ -19,6 +19,7 @@ import org.dromara.project.domain.BusContractor; import org.dromara.project.domain.BusProjectTeam; import org.dromara.project.service.IBusConstructionUserService; import org.dromara.project.service.IBusContractorService; +import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamService; import org.dromara.safety.domain.BusTeamMeeting; import org.dromara.safety.domain.req.teammeeting.TeamMeetingCreateReq; @@ -59,6 +60,9 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl queryPageList(TeamMeetingQueryReq req, PageQuery pageQuery) { - Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + Page result = this.page(pageQuery.build(), this.buildQuery(req)); return TableDataInfo.build(this.getVoPage(result)); } @@ -95,7 +99,7 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl queryList(TeamMeetingQueryReq req) { - List list = this.list(this.getQueryWrapper(req)); + List list = this.list(this.buildQuery(req)); // 对象列表 => 封装对象列表 return list.stream().map(this::getVo).toList(); } @@ -162,7 +166,16 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl ids, Boolean isValid) { if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 + // TODO 做一些业务上的校验,判断是否需要校验 } return this.removeBatchByIds(ids); } @@ -255,7 +268,7 @@ public class BusTeamMeetingServiceImpl extends ServiceImpl getQueryWrapper(TeamMeetingQueryReq req) { + public LambdaQueryWrapper buildQuery(TeamMeetingQueryReq req) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); if (req == null) { return lqw; diff --git a/plus-ui/.env.development b/plus-ui/.env.development index e5ac0551..26d386dc 100644 --- a/plus-ui/.env.development +++ b/plus-ui/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.2:8899' +VITE_APP_BASE_API = 'http://192.168.110.6:8899' # 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' diff --git a/plus-ui/src/api/safety/safetyInspection/types.ts b/plus-ui/src/api/safety/safetyInspection/types.ts index 2400920e..8552f795 100644 --- a/plus-ui/src/api/safety/safetyInspection/types.ts +++ b/plus-ui/src/api/safety/safetyInspection/types.ts @@ -49,6 +49,11 @@ export interface SafetyInspectionVO { */ correctorName: string; + /** + * 整改期限 + */ + rectificationDeadline: string; + /** * 是否回复（1回复 2不回复） */ @@ -171,6 +176,11 @@ export interface SafetyInspectionForm extends BaseEntity { */ correctorId?: string | number; + /** + * 整改期限 + */ + rectificationDeadline: string; + /** * 是否回复（1回复 2不回复） */ diff --git a/plus-ui/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue b/plus-ui/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue index d9f48109..aa8dacb9 100644 --- a/plus-ui/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue +++ b/plus-ui/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue @@ -16,7 +16,9 @@ {{ safetyInspectionDetail?.checkTime }} {{ safetyInspectionDetail?.creatorName }} {{ safetyInspectionDetail?.correctorName }} - {{ safetyInspectionDetail?.rectificationTime }} + + {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }} +
巡检结果
@@ -78,6 +80,7 @@ import { SafetyInspectionVO } from '@/api/safety/safetyInspection/types'; import { getSafetyInspection } from '@/api/safety/safetyInspection'; import { listByIds } from '@/api/system/oss'; import { OssVO } from '@/api/system/oss/types'; +import dayjs from 'dayjs'; interface Props { safetyInspectionId?: string | number; @@ -121,6 +124,8 @@ watch( () => props.safetyInspectionId, (newId, oldId) => { if (newId !== oldId) { + checkFileList.value = undefined; + rectificationFileList.value = undefined; get(); } } diff --git a/plus-ui/src/views/safety/safetyInspection/index.vue b/plus-ui/src/views/safety/safetyInspection/index.vue index aaa484b1..1a5d85d1 100644 --- a/plus-ui/src/views/safety/safetyInspection/index.vue +++ b/plus-ui/src/views/safety/safetyInspection/index.vue @@ -14,21 +14,11 @@ - - - - - - - - - - 搜索 重置 @@ -82,21 +72,15 @@ - - - - - +