diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/constant/MinioPathConstant.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/constant/MinioPathConstant.java index 593bed7d..b11c5438 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/constant/MinioPathConstant.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/constant/MinioPathConstant.java @@ -16,4 +16,6 @@ public interface MinioPathConstant { String Design = "design"; // 设计工程量清单 String BillOfQuantities = Design+"/billOfQuantities"; + // 设计图纸评审 + String DrawingReview = Design+"/drawingReview"; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewController.java new file mode 100644 index 00000000..c6962055 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewController.java @@ -0,0 +1,152 @@ +package org.dromara.design.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.design.domain.bo.AnewDrawingReviewUploadReq; +import org.dromara.design.domain.bo.DrawingReviewUploadReq; +import org.dromara.design.domain.bo.FillOutTheDesignVerificationFormReq; +import org.dromara.design.domain.vo.ListOfDesignDrawingsReviewRes; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.design.domain.vo.BusDrawingreviewVo; +import org.dromara.design.domain.bo.BusDrawingreviewBo; +import org.dromara.design.service.IBusDrawingreviewService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设计-图纸评审 + * + * @author Lion Li + * @date 2025-08-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/design/drawingreview") +public class BusDrawingreviewController extends BaseController { + + private final IBusDrawingreviewService busDrawingreviewService; + + /** + * 新增设计图纸评审 + */ + @SaCheckPermission("design:drawingreview:drawingReviewUpload") + @Log(title = "新增设计图纸评审", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/drawingReviewUpload") + public R drawingReviewUpload(@RequestBody DrawingReviewUploadReq bo) { + return toAjax(busDrawingreviewService.drawingReviewUpload(bo)); + } + + /** + * 设计图纸评审列表 + * listOfDesignDrawingsReview + */ + @SaCheckPermission("design:drawingreview:listOfDesignDrawingsReview") + @GetMapping("/listOfDesignDrawingsReview") + public TableDataInfo listOfDesignDrawingsReview(DrawingReviewUploadReq bo, PageQuery pageQuery) { + return busDrawingreviewService.listOfDesignDrawingsReview(bo, pageQuery); + } + + /** + * 重新上传设计图纸评审 + */ + @SaCheckPermission("design:drawingreview:anewDrawingReviewUpload") + @Log(title = "重新上传设计图纸评审", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PutMapping("/anewDrawingReviewUpload") + public R anewDrawingReviewUpload(@RequestBody AnewDrawingReviewUploadReq bo) { + return toAjax(busDrawingreviewService.anewDrawingReviewUpload(bo)); + } + + /** + * 填写设计验证表 + */ + @SaCheckPermission("design:drawingreview:fillOutTheDesignVerificationForm") + @Log(title = "重新上传设计图纸评审", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PutMapping("/fillOutTheDesignVerificationForm") + public R fillOutTheDesignVerificationForm(@RequestBody FillOutTheDesignVerificationFormReq bo) { + return toAjax(busDrawingreviewService.fillOutTheDesignVerificationForm(bo)); + } + +// /** +// * 查询设计-图纸评审列表 +// */ +// @SaCheckPermission("design:drawingreview:list") +// @GetMapping("/list") +// public TableDataInfo list(BusDrawingreviewBo bo, PageQuery pageQuery) { +// return busDrawingreviewService.queryPageList(bo, pageQuery); +// } +// +// /** +// * 导出设计-图纸评审列表 +// */ +// @SaCheckPermission("design:drawingreview:export") +// @Log(title = "设计-图纸评审", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(BusDrawingreviewBo bo, HttpServletResponse response) { +// List list = busDrawingreviewService.queryList(bo); +// ExcelUtil.exportExcel(list, "设计-图纸评审", BusDrawingreviewVo.class, response); +// } +// +// /** +// * 获取设计-图纸评审详细信息 +// * +// * @param id 主键 +// */ +// @SaCheckPermission("design:drawingreview:query") +// @GetMapping("/{id}") +// public R getInfo(@NotNull(message = "主键不能为空") +// @PathVariable Long id) { +// return R.ok(busDrawingreviewService.queryById(id)); +// } +// +// /** +// * 新增设计-图纸评审 +// */ +// @SaCheckPermission("design:drawingreview:add") +// @Log(title = "设计-图纸评审", businessType = BusinessType.INSERT) +// @RepeatSubmit() +// @PostMapping() +// public R add(@Validated(AddGroup.class) @RequestBody BusDrawingreviewBo bo) { +// return toAjax(busDrawingreviewService.insertByBo(bo)); +// } +// +// /** +// * 修改设计-图纸评审 +// */ +// @SaCheckPermission("design:drawingreview:edit") +// @Log(title = "设计-图纸评审", businessType = BusinessType.UPDATE) +// @RepeatSubmit() +// @PutMapping() +// public R edit(@Validated(EditGroup.class) @RequestBody BusDrawingreviewBo bo) { +// return toAjax(busDrawingreviewService.updateByBo(bo)); +// } +// +// /** +// * 删除设计-图纸评审 +// * +// * @param ids 主键串 +// */ +// @SaCheckPermission("design:drawingreview:remove") +// @Log(title = "设计-图纸评审", businessType = BusinessType.DELETE) +// @DeleteMapping("/{ids}") +// public R remove(@NotEmpty(message = "主键不能为空") +// @PathVariable Long[] ids) { +// return toAjax(busDrawingreviewService.deleteWithValidByIds(List.of(ids), true)); +// } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/controller/BusDrawingreviewReceiptsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewReceiptsController.java similarity index 98% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/controller/BusDrawingreviewReceiptsController.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewReceiptsController.java index 82dd7345..ddafb6ed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/controller/BusDrawingreviewReceiptsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewReceiptsController.java @@ -1,4 +1,4 @@ -package org.dromara.design.design.controller; +package org.dromara.design.controller; import java.util.List; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/controller/BusDrawingreviewController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/controller/BusDrawingreviewController.java deleted file mode 100644 index 6ee48a98..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/controller/BusDrawingreviewController.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.dromara.design.design.controller; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.design.domain.vo.BusDrawingreviewVo; -import org.dromara.design.domain.bo.BusDrawingreviewBo; -import org.dromara.design.service.IBusDrawingreviewService; -import org.dromara.common.mybatis.core.page.TableDataInfo; - -/** - * 设计-图纸评审 - * - * @author Lion Li - * @date 2025-08-12 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/design/drawingreview") -public class BusDrawingreviewController extends BaseController { - - private final IBusDrawingreviewService busDrawingreviewService; - - /** - * 查询设计-图纸评审列表 - */ - @SaCheckPermission("design:drawingreview:list") - @GetMapping("/list") - public TableDataInfo list(BusDrawingreviewBo bo, PageQuery pageQuery) { - return busDrawingreviewService.queryPageList(bo, pageQuery); - } - - /** - * 导出设计-图纸评审列表 - */ - @SaCheckPermission("design:drawingreview:export") - @Log(title = "设计-图纸评审", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(BusDrawingreviewBo bo, HttpServletResponse response) { - List list = busDrawingreviewService.queryList(bo); - ExcelUtil.exportExcel(list, "设计-图纸评审", BusDrawingreviewVo.class, response); - } - - /** - * 获取设计-图纸评审详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("design:drawingreview:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(busDrawingreviewService.queryById(id)); - } - - /** - * 新增设计-图纸评审 - */ - @SaCheckPermission("design:drawingreview:add") - @Log(title = "设计-图纸评审", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody BusDrawingreviewBo bo) { - return toAjax(busDrawingreviewService.insertByBo(bo)); - } - - /** - * 修改设计-图纸评审 - */ - @SaCheckPermission("design:drawingreview:edit") - @Log(title = "设计-图纸评审", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody BusDrawingreviewBo bo) { - return toAjax(busDrawingreviewService.updateByBo(bo)); - } - - /** - * 删除设计-图纸评审 - * - * @param ids 主键串 - */ - @SaCheckPermission("design:drawingreview:remove") - @Log(title = "设计-图纸评审", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(busDrawingreviewService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/mapper/BusDrawingreviewMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/mapper/BusDrawingreviewMapper.java deleted file mode 100644 index ce55d6fe..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/mapper/BusDrawingreviewMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.design.design.mapper; - -import org.dromara.design.domain.BusDrawingreview; -import org.dromara.design.domain.vo.BusDrawingreviewVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 设计-图纸评审Mapper接口 - * - * @author Lion Li - * @date 2025-08-12 - */ -public interface BusDrawingreviewMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/impl/BusDrawingreviewServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/impl/BusDrawingreviewServiceImpl.java deleted file mode 100644 index 81781092..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/impl/BusDrawingreviewServiceImpl.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.dromara.design.design.service.impl; - -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.dromara.design.domain.bo.BusDrawingreviewBo; -import org.dromara.design.domain.vo.BusDrawingreviewVo; -import org.dromara.design.domain.BusDrawingreview; -import org.dromara.design.mapper.BusDrawingreviewMapper; -import org.dromara.design.service.IBusDrawingreviewService; - -import java.util.List; -import java.util.Map; -import java.util.Collection; - -/** - * 设计-图纸评审Service业务层处理 - * - * @author Lion Li - * @date 2025-08-12 - */ -@RequiredArgsConstructor -@Service -public class BusDrawingreviewServiceImpl extends ServiceImpl implements IBusDrawingreviewService { - - private final BusDrawingreviewMapper baseMapper; - - /** - * 查询设计-图纸评审 - * - * @param id 主键 - * @return 设计-图纸评审 - */ - @Override - public BusDrawingreviewVo queryById(Long id){ - return baseMapper.selectVoById(id); - } - - /** - * 分页查询设计-图纸评审列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 设计-图纸评审分页列表 - */ - @Override - public TableDataInfo queryPageList(BusDrawingreviewBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询符合条件的设计-图纸评审列表 - * - * @param bo 查询条件 - * @return 设计-图纸评审列表 - */ - @Override - public List queryList(BusDrawingreviewBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(BusDrawingreviewBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByDesc(BusDrawingreview::getId); - lqw.eq(bo.getProjectId() != null, BusDrawingreview::getProjectId, bo.getProjectId()); - lqw.eq(StringUtils.isNotBlank(bo.getAuditType()), BusDrawingreview::getAuditType, bo.getAuditType()); - return lqw; - } - - /** - * 新增设计-图纸评审 - * - * @param bo 设计-图纸评审 - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(BusDrawingreviewBo bo) { - BusDrawingreview add = MapstructUtils.convert(bo, BusDrawingreview.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 修改设计-图纸评审 - * - * @param bo 设计-图纸评审 - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(BusDrawingreviewBo bo) { - BusDrawingreview update = MapstructUtils.convert(bo, BusDrawingreview.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(BusDrawingreview entity){ - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除设计-图纸评审信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/BusDrawingreview.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreview.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/BusDrawingreview.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreview.java index 51592b94..9d35cbb3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/BusDrawingreview.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreview.java @@ -1,4 +1,4 @@ -package org.dromara.design.design.domain; +package org.dromara.design.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/BusDrawingreviewReceipts.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreviewReceipts.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/BusDrawingreviewReceipts.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreviewReceipts.java index 22394f41..c3acc74a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/BusDrawingreviewReceipts.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreviewReceipts.java @@ -1,5 +1,6 @@ -package org.dromara.design.design.domain; +package org.dromara.design.domain; +import lombok.experimental.Accessors; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; @@ -18,6 +19,7 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) @TableName("bus_drawingreview_receipts") +@Accessors(chain = true) public class BusDrawingreviewReceipts extends BaseEntity { @Serial @@ -139,6 +141,11 @@ public class BusDrawingreviewReceipts extends BaseEntity { */ private Date executorDate; + /** + * 文件名 + */ + private String fileName; + /** * 图纸 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/DesVolumeCatalog.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/DesVolumeCatalog.java index 58a13114..4d17c0d7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/DesVolumeCatalog.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/DesVolumeCatalog.java @@ -26,8 +26,8 @@ public class DesVolumeCatalog extends BaseEntity { /** * 主键ID */ - @TableId(value = "id") - private Long id; + @TableId(value = "design") + private Long design; /** * 项目ID diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/AnewDrawingReviewUploadReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/AnewDrawingReviewUploadReq.java new file mode 100644 index 00000000..faa4b336 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/AnewDrawingReviewUploadReq.java @@ -0,0 +1,36 @@ +package org.dromara.design.domain.bo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.web.multipart.MultipartFile; + +import java.io.Serializable; + +/** + * @Author 铁憨憨 + * @Date 2025/8/12 18:19 + * @Version 1.0 + */ + +@Data +@Accessors(chain = true) +public class AnewDrawingReviewUploadReq implements Serializable { + /** + * 项目ID + */ + @NotNull(message = "项目ID不能为空") + private Long projectId; + /** + * 图纸评审id + */ + @NotNull(message = "图纸评审id不能为空") + private Long drawingreviewId; + /** + * 图纸评审文件 + */ + @NotNull(message = "图纸评审文件不能为空") + private MultipartFile file; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/bo/BusDrawingreviewBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewBo.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/bo/BusDrawingreviewBo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewBo.java index d1304ba7..764e0ad0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/bo/BusDrawingreviewBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewBo.java @@ -1,4 +1,4 @@ -package org.dromara.design.design.domain.bo; +package org.dromara.design.domain.bo; import org.dromara.design.domain.BusDrawingreview; import org.dromara.common.mybatis.core.domain.BaseEntity; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/bo/BusDrawingreviewReceiptsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewReceiptsBo.java similarity index 98% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/bo/BusDrawingreviewReceiptsBo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewReceiptsBo.java index 89bf3410..f32909f1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/bo/BusDrawingreviewReceiptsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewReceiptsBo.java @@ -1,4 +1,4 @@ -package org.dromara.design.design.domain.bo; +package org.dromara.design.domain.bo; import org.dromara.design.domain.BusDrawingreviewReceipts; import org.dromara.common.mybatis.core.domain.BaseEntity; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/DrawingReviewUploadReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/DrawingReviewUploadReq.java new file mode 100644 index 00000000..a7a8c352 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/DrawingReviewUploadReq.java @@ -0,0 +1,36 @@ +package org.dromara.design.domain.bo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.web.multipart.MultipartFile; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author 铁憨憨 + * @Date 2025/8/12 16:52 + * @Version 1.0 + */ + +@Data +@Accessors(chain = true) +public class DrawingReviewUploadReq implements Serializable { + /** + * 项目ID + */ + private Long projectId; + + /** + * 图纸评审文件 + */ + private MultipartFile file; + + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/FillOutTheDesignVerificationFormReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/FillOutTheDesignVerificationFormReq.java new file mode 100644 index 00000000..d3c69d27 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/FillOutTheDesignVerificationFormReq.java @@ -0,0 +1,132 @@ +package org.dromara.design.domain.bo; + +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author 铁憨憨 + * @Date 2025/8/12 18:55 + * @Version 1.0 + */ + +@Data +@Accessors(chain = true) +public class FillOutTheDesignVerificationFormReq implements Serializable { + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 编号 + */ + private String num; + + /** + * 项目ID + */ + private Long projectId; + + /** + * 子项目ID + */ + private Long subprojectId; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 子项目名称 + */ + private String subprojectName; + + /** + * 设计阶段 + */ + private String stage; + + /** + * 专业 + */ + private String professional; + + /** + * 卷册 + */ + private String volume; + + /** + * 设计人 + */ + private String designer; + + /** + * 验证内容 + */ + private String verificationContent; + + /** + * 验证意见 + */ + private String verificationOpinion; + + /** + * 执行意见 + */ + private String executionOpinion; + + /** + * 校审人员ID + */ + private Long proofreadingId; + + /** + * 审核人员ID + */ + private Long auditId; + + /** + * 执行人员ID + */ + private Long executorId; + + /** + * 校审人员 + */ + private String proofreading; + + /** + * 审核人员 + */ + private String audit; + + /** + * 执行人员 + */ + private String executor; + + /** + * 校审时间 + */ + private Date proofreadingDate; + + /** + * 审核时间 + */ + private Date auditDate; + + /** + * 执行时间 + */ + private Date executorDate; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogUpdateReq.java index e28f25e7..bd56c4a7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogUpdateReq.java @@ -21,7 +21,7 @@ public class DesVolumeCatalogUpdateReq implements Serializable { * 主键ID */ @NotNull(message = "主键ID不能为空") - private Long id; + private Long design; /** * 设计子项 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/vo/BusDrawingreviewReceiptsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewReceiptsVo.java similarity index 98% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/vo/BusDrawingreviewReceiptsVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewReceiptsVo.java index 6fbb74fe..e77525eb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/vo/BusDrawingreviewReceiptsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewReceiptsVo.java @@ -1,4 +1,4 @@ -package org.dromara.design.design.domain.vo; +package org.dromara.design.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/vo/BusDrawingreviewVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewVo.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/vo/BusDrawingreviewVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewVo.java index 03c420d9..714faa90 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/domain/vo/BusDrawingreviewVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewVo.java @@ -1,4 +1,4 @@ -package org.dromara.design.design.domain.vo; +package org.dromara.design.domain.vo; import org.dromara.design.domain.BusDrawingreview; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -29,9 +29,9 @@ public class BusDrawingreviewVo implements Serializable { private static final long serialVersionUID = 1L; /** - * 项目ID + * 主键ID */ - @ExcelProperty(value = "项目ID") + @ExcelProperty(value = "主键ID") private Long id; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/ListOfDesignDrawingsReviewRes.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/ListOfDesignDrawingsReviewRes.java new file mode 100644 index 00000000..4919d4b7 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/ListOfDesignDrawingsReviewRes.java @@ -0,0 +1,45 @@ +package org.dromara.design.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author 铁憨憨 + * @Date 2025/8/12 17:50 + * @Version 1.0 + */ + +@Data +public class ListOfDesignDrawingsReviewRes implements Serializable { + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 项目ID + */ + @ExcelProperty(value = "项目ID") + private Long projectId; + + /** + * 文件名 + */ + @ExcelProperty(value = "文件名") + private String fileName; + + /** + * 审核类型 + */ + @ExcelProperty(value = "审核类型") + private String auditType; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java index c8621c72..c7b4e149 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java @@ -28,7 +28,7 @@ public class DesVolumeCatalogVo implements Serializable { /** * 主键ID */ - private Long id; + private Long design; /** * 项目ID diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusDrawingreviewMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusDrawingreviewMapper.java new file mode 100644 index 00000000..3dc33a5f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusDrawingreviewMapper.java @@ -0,0 +1,28 @@ +package org.dromara.design.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.cailiaoshebei.domain.bo.MasterDataListReq; +import org.dromara.cailiaoshebei.domain.vo.MasterDataListRes; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.design.domain.BusDrawingreview; +import org.dromara.design.domain.bo.DrawingReviewUploadReq; +import org.dromara.design.domain.vo.BusDrawingreviewVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.design.domain.vo.ListOfDesignDrawingsReviewRes; + +/** + * 设计-图纸评审Mapper接口 + * + * @author Lion Li + * @date 2025-08-12 + */ +public interface BusDrawingreviewMapper extends BaseMapperPlus { + /** + * 设计图纸评审列表 + * listOfDesignDrawingsReview + */ + Page listOfDesignDrawingsReview(@Param("bo") DrawingReviewUploadReq bo, @Param("page") Page page); + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/mapper/BusDrawingreviewReceiptsMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusDrawingreviewReceiptsMapper.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/mapper/BusDrawingreviewReceiptsMapper.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusDrawingreviewReceiptsMapper.java index 57481a25..04a8bdc3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/mapper/BusDrawingreviewReceiptsMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusDrawingreviewReceiptsMapper.java @@ -1,4 +1,4 @@ -package org.dromara.design.design.mapper; +package org.dromara.design.mapper; import org.dromara.design.domain.BusDrawingreviewReceipts; import org.dromara.design.domain.vo.BusDrawingreviewReceiptsVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/IBusDrawingreviewReceiptsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewReceiptsService.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/IBusDrawingreviewReceiptsService.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewReceiptsService.java index 50eab31a..d23bcb54 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/IBusDrawingreviewReceiptsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewReceiptsService.java @@ -1,4 +1,4 @@ -package org.dromara.design.design.service; +package org.dromara.design.service; import org.dromara.design.domain.vo.BusDrawingreviewReceiptsVo; import org.dromara.design.domain.bo.BusDrawingreviewReceiptsBo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/IBusDrawingreviewService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewService.java similarity index 63% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/IBusDrawingreviewService.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewService.java index 6df7b5f5..89a8b546 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/IBusDrawingreviewService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewService.java @@ -1,5 +1,8 @@ -package org.dromara.design.design.service; +package org.dromara.design.service; +import org.dromara.design.domain.bo.AnewDrawingReviewUploadReq; +import org.dromara.design.domain.bo.DrawingReviewUploadReq; +import org.dromara.design.domain.bo.FillOutTheDesignVerificationFormReq; import org.dromara.design.domain.vo.BusDrawingreviewVo; import org.dromara.design.domain.bo.BusDrawingreviewBo; import org.dromara.design.domain.BusDrawingreview; @@ -7,6 +10,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.design.domain.vo.ListOfDesignDrawingsReviewRes; +import org.springframework.web.bind.annotation.RequestBody; + import java.util.Collection; import java.util.List; @@ -67,4 +73,32 @@ public interface IBusDrawingreviewService extends IService{ * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 设计-图纸评审上传 + * @param bo + * @return + */ + Boolean drawingReviewUpload(DrawingReviewUploadReq bo); + + /** + * 设计图纸评审列表 + * listOfDesignDrawingsReview + */ + TableDataInfo listOfDesignDrawingsReview(DrawingReviewUploadReq bo, PageQuery pageQuery); + + /** + * 重新图纸评审上传 + * @param bo + * @return + */ + Boolean anewDrawingReviewUpload(AnewDrawingReviewUploadReq bo); + + + /** + * 填写设计验证表单 + * @param bo + * @return + */ + Boolean fillOutTheDesignVerificationForm(@RequestBody FillOutTheDesignVerificationFormReq bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java index 9a3f6764..27410eb9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java @@ -1,5 +1,6 @@ -package org.dromara.design.design.service.impl; +package org.dromara.design.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewServiceImpl.java new file mode 100644 index 00000000..6494f82e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewServiceImpl.java @@ -0,0 +1,283 @@ +package org.dromara.design.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.dromara.cailiaoshebei.controller.constant; +import org.dromara.cailiaoshebei.domain.BusCailiaoshebeiPici; +import org.dromara.common.core.domain.event.ProcessDeleteEvent; +import org.dromara.common.core.domain.event.ProcessEvent; +import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.design.domain.BusDrawingreviewReceipts; +import org.dromara.design.domain.bo.AnewDrawingReviewUploadReq; +import org.dromara.design.domain.bo.DrawingReviewUploadReq; +import org.dromara.design.domain.bo.FillOutTheDesignVerificationFormReq; +import org.dromara.design.domain.vo.ListOfDesignDrawingsReviewRes; +import org.dromara.design.service.IBusDrawingreviewReceiptsService; +import org.dromara.system.domain.vo.SysOssUploadVo; +import org.dromara.system.service.ISysOssService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; +import org.dromara.design.domain.bo.BusDrawingreviewBo; +import org.dromara.design.domain.vo.BusDrawingreviewVo; +import org.dromara.design.domain.BusDrawingreview; +import org.dromara.design.mapper.BusDrawingreviewMapper; +import org.dromara.design.service.IBusDrawingreviewService; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +import static org.dromara.common.constant.MinioPathConstant.BillOfQuantities; + +/** + * 设计-图纸评审Service业务层处理 + * + * @author Lion Li + * @date 2025-08-12 + */ +@RequiredArgsConstructor +@Service +@Slf4j +public class BusDrawingreviewServiceImpl extends ServiceImpl implements IBusDrawingreviewService { + + private final BusDrawingreviewMapper baseMapper; + + private final IBusDrawingreviewReceiptsService busDrawingreviewReceiptsService; + + @Autowired + private ISysOssService ossService; + + /** + * 查询设计-图纸评审 + * + * @param id 主键 + * @return 设计-图纸评审 + */ + @Override + public BusDrawingreviewVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询设计-图纸评审列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设计-图纸评审分页列表 + */ + @Override + public TableDataInfo queryPageList(BusDrawingreviewBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设计-图纸评审列表 + * + * @param bo 查询条件 + * @return 设计-图纸评审列表 + */ + @Override + public List queryList(BusDrawingreviewBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(BusDrawingreviewBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(BusDrawingreview::getId); + lqw.eq(bo.getProjectId() != null, BusDrawingreview::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getAuditType()), BusDrawingreview::getAuditType, bo.getAuditType()); + return lqw; + } + + /** + * 新增设计-图纸评审 + * + * @param bo 设计-图纸评审 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BusDrawingreviewBo bo) { + BusDrawingreview add = MapstructUtils.convert(bo, BusDrawingreview.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设计-图纸评审 + * + * @param bo 设计-图纸评审 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BusDrawingreviewBo bo) { + BusDrawingreview update = MapstructUtils.convert(bo, BusDrawingreview.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BusDrawingreview entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除设计-图纸评审信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 设计-图纸评审上传 + * + * @param bo 设计-图纸评审上传 + * @return 是否上传成功 + */ + @Override + public Boolean drawingReviewUpload(DrawingReviewUploadReq bo) { + //1、主数据新增 + BusDrawingreview busDrawingreview = new BusDrawingreview(); + busDrawingreview.setProjectId(bo.getProjectId()); + busDrawingreview.setRemark(bo.getRemark()); + int insert = baseMapper.insert(busDrawingreview); + if (insert <= 0) { + throw new RuntimeException("新增设计图纸评审失败"); + } + //2、文件上传 + MultipartFile file = bo.getFile(); + if(bo.getFile() == null){ + throw new RuntimeException("文件不能为空"); + } + SysOssUploadVo wordEntity = ossService.uploadWithNoSave(file, ossService.minioFileName(BillOfQuantities,file)); + BusDrawingreviewReceipts entity = new BusDrawingreviewReceipts(). + setFileName(bo.getFile().getName()). + setDrawingreviewId(busDrawingreview.getId()). + setPath(wordEntity.getUrl()); + return busDrawingreviewReceiptsService.save(entity); + } + + /** + * 设计图纸评审列表 + * listOfDesignDrawingsReview + */ + @Override + public TableDataInfo listOfDesignDrawingsReview(DrawingReviewUploadReq bo, PageQuery pageQuery) { + Page page = baseMapper.listOfDesignDrawingsReview(bo, pageQuery.build()); + return TableDataInfo.build(page); + } + + @Override + public Boolean anewDrawingReviewUpload(AnewDrawingReviewUploadReq bo) { + MultipartFile file = bo.getFile(); + if(bo.getFile() == null){ + throw new RuntimeException("文件不能为空"); + } + SysOssUploadVo wordEntity = ossService.uploadWithNoSave(file, ossService.minioFileName(BillOfQuantities,file)); + BusDrawingreviewReceipts entity = new BusDrawingreviewReceipts(). + setFileName(bo.getFile().getName()). + setDrawingreviewId(bo.getDrawingreviewId()). + setPath(wordEntity.getUrl()); + return busDrawingreviewReceiptsService.save(entity); + } + + + @Override + public Boolean fillOutTheDesignVerificationForm(FillOutTheDesignVerificationFormReq bo) { + //修改busDrawingreviewReceiptsService数据 + BusDrawingreviewReceipts busDrawingreviewReceipts = BeanUtil.copyProperties(bo, BusDrawingreviewReceipts.class); + return busDrawingreviewReceiptsService.updateById(busDrawingreviewReceipts); + } + + + /** + * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) + * 正常使用只需#processEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processEvent 参数 + */ + @org.springframework.context.event.EventListener(condition = "#processEvent.flowCode.endsWith('drawingReview')") + @Transactional + public void processPlansHandler(ProcessEvent processEvent) { + log.info("图纸评审审核任务执行了{}", processEvent.toString()); + String id = processEvent.getBusinessId(); + //1、根据id修改 + BusDrawingreviewReceipts busDrawingreviewReceipts = new BusDrawingreviewReceipts(); + busDrawingreviewReceipts.setId(Long.valueOf(id)); + busDrawingreviewReceipts.setStage(processEvent.getStatus()); + boolean b = busDrawingreviewReceiptsService.updateById(busDrawingreviewReceipts); + if (!b) { + throw new RuntimeException("更新失败"); + } + //2、查询详情，修改上一级的状态 + BusDrawingreviewReceipts busDrawingreviewReceipts1 = busDrawingreviewReceiptsService.getById(id); + if (busDrawingreviewReceipts1 == null) { + throw new RuntimeException("查询失败"); + } + //3、根据drawingreviewId查询主表 + BusDrawingreview busDrawingreview = new BusDrawingreview(); + busDrawingreview.setId(busDrawingreviewReceipts1.getDrawingreviewId()); + busDrawingreview.setAuditType(processEvent.getStatus()); + baseMapper.updateById(busDrawingreview); + } + + /** + * 执行任务创建监听 + * 示例：也可通过 @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断 + * 在方法中判断流程节点key + * if ("xxx".equals(processTaskEvent.getNodeCode())) { + * //执行业务逻辑 + * } + * + * @param processTaskEvent 参数 + */ + @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('drawingReview')") + public void processTaskPlansHandler(ProcessTaskEvent processTaskEvent) { + log.info("图纸评审审核任务创建了{}", processTaskEvent.toString()); + } + + /** + * 监听删除流程事件 + * 正常使用只需#processDeleteEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processDeleteEvent 参数 + */ + @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('drawingReview')") + public void processDeletePlansHandler(ProcessDeleteEvent processDeleteEvent) { + log.info("图纸评审计划删除流程事件，技术标准文件审核任务执行了{}", processDeleteEvent.toString()); + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java index c88c1753..20940cb6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java @@ -156,7 +156,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl 0) { throw new ServiceException("卷册目录已存在", HttpStatus.BAD_REQUEST); @@ -222,11 +222,11 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl volumeFiles = this.queryFileListById(volumeCatalog.getId()); + List volumeFiles = this.queryFileListById(volumeCatalog.getDesign()); vo.setFileVoList(volumeFileService.getVoList(volumeFiles)); // 关联查阅人信息 List allViewerList = volumeFileViewerService.lambdaQuery() - .eq(DesVolumeFileViewer::getVolumeCatalogId, volumeCatalog.getId()).list(); + .eq(DesVolumeFileViewer::getVolumeCatalogId, volumeCatalog.getDesign()).list(); List userIds = allViewerList.stream().map(DesVolumeFileViewer::getUserId).distinct().toList(); List userVoList = userService.selectUserByIds(userIds, null); Map userVoMap = userVoList.stream().collect(Collectors.toMap(SysUserVo::getUserId, Function.identity())); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusDrawingreviewMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusDrawingreviewMapper.xml index eacec7bc..a808311d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusDrawingreviewMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusDrawingreviewMapper.xml @@ -4,4 +4,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusDrawingreviewReceiptsMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusDrawingreviewReceiptsMapper.xml index 494e3398..6f3ee387 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusDrawingreviewReceiptsMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusDrawingreviewReceiptsMapper.xml @@ -4,4 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +