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