From c07e9f76a68fbe147c4e67145244d587a282bf74 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Tue, 16 Sep 2025 16:23:49 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusMrpBaseController.java | 30 ++++++++------- ...BusBillofquantitiesVersionsController.java | 15 ++++++-- .../domain/bo/CoryObtainTheListReq.java | 2 + .../domain/vo/BusBillofquantitiesVo.java | 10 +++-- .../IBusBillofquantitiesVersionsService.java | 8 ++-- ...usBillofquantitiesVersionsServiceImpl.java | 37 +++++++++++-------- .../domain/BusMechanicalrewriting.java | 5 +++ .../domain/bo/BusMechanicalrewritingBo.java | 5 +++ .../domain/vo/BusMechanicalrewritingVo.java | 5 +++ .../BusMechanicalrewritingServiceImpl.java | 1 + 10 files changed, 78 insertions(+), 40 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java index d9825953..7dbfd7a3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -181,19 +182,19 @@ public class BusMrpBaseController extends BaseController { @GetMapping("/coryEngineeringList") public R> obtainTheList(CoryObtainTheListReq req) { // public R> obtainTheList(CoryObtainTheListReq req) { - BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.lambdaQuery() - .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单 - .eq(BusBillofquantitiesVersions::getProjectId, req.getProjectId()) - .eq(BusBillofquantitiesVersions::getVersions, req.getVersions()) - .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) - .last("limit 1") - ); - if (one == null){ - throw new ServiceException("请先完成物资工程量清单"); - } - List list = busBillofquantitiesService.list(Wrappers.lambdaQuery() - .eq(BusBillofquantities::getVersions, one.getVersions()) - ); +// BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.lambdaQuery() +// .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单 +// .eq(BusBillofquantitiesVersions::getProjectId, req.getProjectId()) +// .eq(BusBillofquantitiesVersions::getVersions, req.getVersions()) +// .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) +// .last("limit 1") +// ); +// if (one == null){ +// throw new ServiceException("请先完成物资工程量清单"); +// } +// List list = busBillofquantitiesService.list(Wrappers.lambdaQuery() +// .eq(BusBillofquantities::getVersions, one.getVersions()) +// ); // List obtainTheListRes = new ArrayList<>(); // list.forEach(billofquantities -> { // ObtainTheListRes res = new ObtainTheListRes(); @@ -207,7 +208,8 @@ public class BusMrpBaseController extends BaseController { // // 3. 递归组装树形结构，从顶级节点（pid=0）开始 // List treeList = buildTree("0", parentMap); // return R.ok(treeList); - return R.ok(list); +// return R.ok(list); + return R.ok(busBillofquantitiesService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(BusBillofquantities::getPid, req.getSid()))); } private List buildTree(String parentId, Map> parentMap) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusBillofquantitiesVersionsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusBillofquantitiesVersionsController.java index 93b155fb..b265a712 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusBillofquantitiesVersionsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusBillofquantitiesVersionsController.java @@ -14,10 +14,7 @@ import org.dromara.design.domain.bo.ImportExcelFileReq; import org.dromara.design.domain.bo.ObtainAllVersionNumbersReq; import org.dromara.design.domain.bo.CoryObtainTheListReq; import org.dromara.design.domain.bo.SheetListReq; -import org.dromara.design.domain.vo.BusBillofquantitiesMaterialTotalVo; -import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo; -import org.dromara.design.domain.vo.DetailsMaterialAndEquipmentApprovalRes; -import org.dromara.design.domain.vo.ObtainTheListRes; +import org.dromara.design.domain.vo.*; import org.dromara.design.service.IBusBillofquantitiesVersionsService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -97,6 +94,16 @@ public class BusBillofquantitiesVersionsController extends BaseController { } + /** + * 获取所有大类 + */ + @SaCheckPermission("design:billofquantitiesVersions:obtainAllClassification") + @GetMapping("/obtainAllClassification") + public R> obtainAllClassification(ObtainAllVersionNumbersReq bo) { + return R.ok(busBillofquantitiesVersionsService.obtainAllClassification(bo)); + } + + // /** // * 导入物资设备清单 // */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/CoryObtainTheListReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/CoryObtainTheListReq.java index 2e1b5801..f2ce7998 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/CoryObtainTheListReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/CoryObtainTheListReq.java @@ -40,4 +40,6 @@ public class CoryObtainTheListReq implements Serializable { @NotNull(message = "项目ID不能为空") private Long projectId; + private String sid; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusBillofquantitiesVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusBillofquantitiesVo.java index 749cdda5..957d2986 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusBillofquantitiesVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusBillofquantitiesVo.java @@ -47,10 +47,14 @@ public class BusBillofquantitiesVo implements Serializable { private String sheet; /** - * 父子ID + * 子ID */ - @ExcelProperty(value = "父子ID") - private Long pid; + private String sid; + + /** + * 父ID + */ + private String pid; /** * 编号 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusBillofquantitiesVersionsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusBillofquantitiesVersionsService.java index 91e60ca1..16ab69a4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusBillofquantitiesVersionsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusBillofquantitiesVersionsService.java @@ -3,12 +3,10 @@ package org.dromara.design.service; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.design.domain.BusBillofquantities; import org.dromara.design.domain.BusBillofquantitiesVersions; import org.dromara.design.domain.bo.*; -import org.dromara.design.domain.vo.BusBillofquantitiesMaterialTotalVo; -import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo; -import org.dromara.design.domain.vo.DetailsMaterialAndEquipmentApprovalRes; -import org.dromara.design.domain.vo.ObtainTheListRes; +import org.dromara.design.domain.vo.*; import org.springframework.web.multipart.MultipartFile; import java.util.Collection; @@ -100,4 +98,6 @@ public interface IBusBillofquantitiesVersionsService extends IService queryMaterialTotalListByProject(Long projectId); + + List obtainAllClassification(ObtainAllVersionNumbersReq bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java index b97ee357..a946f022 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java @@ -2,6 +2,7 @@ package org.dromara.design.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson2.util.BeanUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -32,10 +33,7 @@ import org.dromara.design.domain.BusBillofquantities; import org.dromara.design.domain.BusBillofquantitiesVersions; import org.dromara.design.domain.bo.*; import org.dromara.design.domain.dto.MaterialsAndEquipmentExcelDto; -import org.dromara.design.domain.vo.BusBillofquantitiesMaterialTotalVo; -import org.dromara.design.domain.vo.BusBillofquantitiesVersionsVo; -import org.dromara.design.domain.vo.DetailsMaterialAndEquipmentApprovalRes; -import org.dromara.design.domain.vo.ObtainTheListRes; +import org.dromara.design.domain.vo.*; import org.dromara.design.mapper.BusBillofquantitiesVersionsMapper; import org.dromara.design.service.IBusBillofquantitiesService; import org.dromara.design.service.IBusBillofquantitiesVersionsService; @@ -192,17 +190,10 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl().eq(BusBillofquantitiesVersions::getVersionsName, vName)); + if (count > 0){ + throw new ServiceException("文件名已存在，请修改文件名后重新上传！！"); } int insert = baseMapper.insert(new BusBillofquantitiesVersions(). setWorkOrderType(bo.getWorkOrderType()). @@ -342,6 +333,22 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl obtainAllClassification(ObtainAllVersionNumbersReq bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getProjectId() != null, BusBillofquantitiesVersions::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getWorkOrderType()), BusBillofquantitiesVersions::getWorkOrderType, bo.getWorkOrderType()); + List result = baseMapper.selectVoList(lqw); + List versionss = new ArrayList<>(); + result.forEach(v -> versionss.add(v.getVersions())); + List busBillofquantities = busBillofquantitiesService.getBaseMapper().selectList(new LambdaQueryWrapper() + .eq(BusBillofquantities::getProjectId, bo.getProjectId()) + .eq(BusBillofquantities::getPid, "0") + .in(BusBillofquantities::getVersions, versionss) + .groupBy(BusBillofquantities::getName)); + return BeanUtil.copyToList(busBillofquantities,BusBillofquantitiesVo.class); + } + /** * 递归构建树形结构 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/BusMechanicalrewriting.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/BusMechanicalrewriting.java index f211f5b1..8184b3f2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/BusMechanicalrewriting.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/BusMechanicalrewriting.java @@ -136,5 +136,10 @@ public class BusMechanicalrewriting extends BaseEntity { */ private String remark; + /** + * 工区 + */ + private String workArea; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/bo/BusMechanicalrewritingBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/bo/BusMechanicalrewritingBo.java index 25a14265..c1454408 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/bo/BusMechanicalrewritingBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/bo/BusMechanicalrewritingBo.java @@ -145,5 +145,10 @@ public class BusMechanicalrewritingBo extends BaseEntity { */ private String remark; + /** + * 工区 + */ + private String workArea; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/vo/BusMechanicalrewritingVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/vo/BusMechanicalrewritingVo.java index ca3cf847..e57bdb3d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/vo/BusMechanicalrewritingVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/domain/vo/BusMechanicalrewritingVo.java @@ -161,5 +161,10 @@ public class BusMechanicalrewritingVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 工区 + */ + private String workArea; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/service/impl/BusMechanicalrewritingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/service/impl/BusMechanicalrewritingServiceImpl.java index d07b0612..1e044d83 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/service/impl/BusMechanicalrewritingServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/service/impl/BusMechanicalrewritingServiceImpl.java @@ -78,6 +78,7 @@ public class BusMechanicalrewritingServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(BusMechanicalrewriting::getId); lqw.eq(bo.getProjectId() != null, BusMechanicalrewriting::getProjectId, bo.getProjectId()); + lqw.like(StringUtils.isNotBlank(bo.getWorkArea()),BusMechanicalrewriting::getWorkArea, bo.getWorkArea()); lqw.like(StringUtils.isNotBlank(bo.getTeamName()), BusMechanicalrewriting::getTeamName, bo.getTeamName()); lqw.like(StringUtils.isNotBlank(bo.getDevicename()), BusMechanicalrewriting::getDevicename, bo.getDevicename()); lqw.eq(StringUtils.isNotBlank(bo.getDeviceType()), BusMechanicalrewriting::getDeviceType, bo.getDeviceType());