From 50536709f656d155e7fba491273d5289866b5bb9 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Wed, 7 May 2025 18:18:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/安全生产监督检查通知书模版.docx | Bin .../resources}/template/整改通知单模版.docx | Bin .../resources}/template/施工日志模版.docx | Bin .../impl/EqpMachineryDetailServiceImpl.java | 3 +- .../vo/materials/MatMaterialsGisVo.java | 2 + .../service/impl/MatMaterialsServiceImpl.java | 5 +- .../quality/constant/QltQualityConstant.java | 4 +- .../QltQualityConstructionLogServiceImpl.java | 57 +++++++++++------- .../impl/QltQualityInspectionServiceImpl.java | 54 +++++++++-------- .../safety/constant/HseSafetyConstant.java | 2 +- .../impl/HseSafetyInspectionServiceImpl.java | 54 +++++++++-------- 11 files changed, 105 insertions(+), 76 deletions(-) rename RuoYi-Vue-Plus/{docs => ruoyi-admin/src/main/resources}/template/安全生产监督检查通知书模版.docx (100%) rename RuoYi-Vue-Plus/{docs => ruoyi-admin/src/main/resources}/template/整改通知单模版.docx (100%) rename RuoYi-Vue-Plus/{docs => ruoyi-admin/src/main/resources}/template/施工日志模版.docx (100%) diff --git a/RuoYi-Vue-Plus/docs/template/安全生产监督检查通知书模版.docx b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/template/安全生产监督检查通知书模版.docx similarity index 100% rename from RuoYi-Vue-Plus/docs/template/安全生产监督检查通知书模版.docx rename to RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/template/安全生产监督检查通知书模版.docx diff --git a/RuoYi-Vue-Plus/docs/template/整改通知单模版.docx b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/template/整改通知单模版.docx similarity index 100% rename from RuoYi-Vue-Plus/docs/template/整改通知单模版.docx rename to RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/template/整改通知单模版.docx diff --git a/RuoYi-Vue-Plus/docs/template/施工日志模版.docx b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/template/施工日志模版.docx similarity index 100% rename from RuoYi-Vue-Plus/docs/template/施工日志模版.docx rename to RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/template/施工日志模版.docx diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java index 2734d79a..74af6b3f 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java @@ -226,7 +226,8 @@ public class EqpMachineryDetailServiceImpl extends ServiceImpl> inventoryMap = materialsInventoryList.stream() .collect(Collectors.groupingBy(MatMaterialsInventory::getMaterialsId)); + final int[] value = {1}; return materialsList.stream().map(materials -> { MatMaterialsGisVo materialsGisVo = new MatMaterialsGisVo(); BeanUtils.copyProperties(materials, materialsGisVo); @@ -142,6 +143,8 @@ public class MatMaterialsServiceImpl extends ServiceImpl ids, Boolean isValid) { + Long userId = LoginHelper.getUserId(); + List qualityConstructionLogList = this.listByIds(ids); if (isValid) { // TODO 做一些业务上的校验,判断是否需要校验 + List projectId = qualityConstructionLogList.stream().map(QltQualityConstructionLog::getProjectId).toList(); + projectService.validAuth(projectId, userId); } return this.removeBatchByIds(ids); } @@ -329,36 +334,42 @@ public class QltQualityConstructionLogServiceImpl extends ServiceImpl