From c79f68a2a71cc8cc181525d233ef419745ee3d27 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 13:24:55 +0800
Subject: [PATCH] 原始记录模版修改
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java | 6
basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java | 4
basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObject.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 12
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 10
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 4
basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java | 8
basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObjectPart.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java | 2
basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java | 4
basic-server/src/main/resources/mapper/StandardMethodMapper.xml | 6
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 28
inspect-server/src/main/java/com/ruoyi/basic/util/XWPFDocumentUtils.java | 2
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 40 +-
basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java | 6
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodMapper.java | 4
basic-server/src/main/java/com/ruoyi/basic/pojo/ProductSupplierDensity.java | 2
basic-server/src/main/resources/mapper/ProductPartMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/StructureItemParameterService.java | 4
basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java | 2
basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java | 6
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethod.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectPartService.java | 4
basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java | 6
basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java | 6
basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java | 8
basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java | 6
basic-server/src/main/java/com/ruoyi/basic/mapper/ProductSupplierDensityMapper.java | 4
basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/ProductPart.java | 2
basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java | 6
basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java | 6
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListSupplierAskService.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectService.java | 4
basic-server/src/main/java/com/ruoyi/basic/dto/InsSampleReceiveDto.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java | 8
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java | 20
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 12
basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java | 2
basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java | 80 +++++
basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 8
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 24
basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectServiceImpl.java | 8
basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java | 10
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java | 8
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java | 2
basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/mapper/ProductPartMapper.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 22
inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java | 2
basic-server/src/main/resources/mapper/StructureTestMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java | 10
basic-server/src/main/java/com/ruoyi/basic/dto/CopyStandardProductListDto.java | 4
basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java | 6
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 6
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java | 18
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethodList.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java | 5
basic-server/src/main/java/com/ruoyi/basic/service/LaboratoryService.java | 4
basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java | 26
basic-server/src/main/java/com/ruoyi/basic/pojo/Product.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/Seal.java | 2
basic-server/src/main/resources/mapper/ProductMapper.xml | 4
basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java | 4
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTree.java | 2
inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java | 2
basic-server/src/main/resources/mapper/LaboratoryMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/mapper/LaboratoryMapper.java | 4
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java | 10
basic-server/src/main/java/com/ruoyi/basic/pojo/InsSample1.java | 2
basic-server/src/main/resources/mapper/StandardTemplateMapper.xml | 12
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/ProductSupplierDensityService.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java | 10
basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 24
basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectListener.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java | 4
basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectPartServiceImpl.java | 12
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 2
basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java | 6
basic-server/src/main/java/com/ruoyi/basic/service/SealService.java | 6
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java | 2
basic-server/src/main/resources/mapper/IfsInventoryQuantityMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/dto/ResetTreeDragDTO.java | 2
basic-server/src/main/resources/mapper/SealMapper.xml | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java | 12
basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/StandardTemplateService.java | 6
basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java | 16
basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectPartMapper.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java | 4
basic-server/src/main/resources/mapper/CertificationMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/ProductPartService.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java | 8
basic-server/src/main/java/com/ruoyi/basic/mapper/IfsInventoryQuantityMapper.java | 6
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListSupplierAskMapper.java | 4
basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java | 6
/dev/null | 130 --------
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/basic/dto/ProductDTO1.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java | 12
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java | 8
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java | 4
basic-server/src/main/resources/mapper/StandardMethodListMapper.xml | 14
basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java | 4
basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java | 8
125 files changed, 445 insertions(+), 504 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/CapacityScopeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
similarity index 95%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/CapacityScopeController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
index 9c2a785..810c430 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/CapacityScopeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelUtil;
@@ -9,18 +9,18 @@
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.service.ISysDictTypeService;
-import com.ruoyi.inspect.dto.PageTestObjectDto;
-import com.ruoyi.inspect.dto.ProductDTO1;
-import com.ruoyi.inspect.excel.StructureTestObjectData;
-import com.ruoyi.inspect.excel.StructureTestObjectListener;
-import com.ruoyi.inspect.pojo.Product;
-import com.ruoyi.inspect.pojo.StandardTemplate;
-import com.ruoyi.inspect.pojo.StructureItemParameter;
-import com.ruoyi.inspect.pojo.StructureTestObject;
-import com.ruoyi.inspect.service.CapacityScopeService;
-import com.ruoyi.inspect.service.ProductService;
-import com.ruoyi.inspect.service.StandardTemplateService;
-import com.ruoyi.inspect.service.StructureItemParameterService;
+import com.ruoyi.basic.dto.PageTestObjectDto;
+import com.ruoyi.basic.dto.ProductDTO1;
+import com.ruoyi.basic.excel.StructureTestObjectData;
+import com.ruoyi.basic.excel.StructureTestObjectListener;
+import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.basic.pojo.StructureItemParameter;
+import com.ruoyi.basic.pojo.StructureTestObject;
+import com.ruoyi.basic.service.CapacityScopeService;
+import com.ruoyi.basic.service.ProductService;
+import com.ruoyi.basic.service.StandardTemplateService;
+import com.ruoyi.basic.service.StructureItemParameterService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/CertificationController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
similarity index 91%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/CertificationController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
index 51b8ff1..51ed763 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/CertificationController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.pojo.Certification;
-import com.ruoyi.inspect.service.CertificationService;
+import com.ruoyi.basic.pojo.Certification;
+import com.ruoyi.basic.service.CertificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/LaboratoryController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/LaboratoryController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
index 5133178..c21f7be 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/LaboratoryController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.pojo.Laboratory;
-import com.ruoyi.inspect.service.LaboratoryService;
+import com.ruoyi.basic.pojo.Laboratory;
+import com.ruoyi.basic.service.LaboratoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/ProductPartController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/ProductPartController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
index 49ff94f..ca3a5b9 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/ProductPartController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.pojo.ProductPart;
-import com.ruoyi.inspect.service.ProductPartService;
+import com.ruoyi.basic.pojo.ProductPart;
+import com.ruoyi.basic.service.ProductPartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/ProductSupplierDensityController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/ProductSupplierDensityController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java
index be25f08..1d86970 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/ProductSupplierDensityController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.pojo.ProductSupplierDensity;
-import com.ruoyi.inspect.service.ProductSupplierDensityService;
+import com.ruoyi.basic.pojo.ProductSupplierDensity;
+import com.ruoyi.basic.service.ProductSupplierDensityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/SealController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/SealController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java
index 6822a8a..a34ba34 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/SealController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.pojo.Laboratory;
-import com.ruoyi.inspect.pojo.Seal;
-import com.ruoyi.inspect.service.SealService;
+import com.ruoyi.basic.pojo.Laboratory;
+import com.ruoyi.basic.pojo.Seal;
+import com.ruoyi.basic.service.SealService;
import com.ruoyi.common.core.domain.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardMethodController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
similarity index 93%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/StandardMethodController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
index 038f092..f74f38b 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardMethodController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.pojo.StandardMethod;
-import com.ruoyi.inspect.service.StandardMethodService;
+import com.ruoyi.basic.pojo.StandardMethod;
+import com.ruoyi.basic.service.StandardMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTemplateController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
similarity index 80%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTemplateController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
index b2a82e9..b672612 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTemplateController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.pojo.StandardTemplate;
-import com.ruoyi.inspect.service.StandardTemplateService;
+import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.basic.service.StandardTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -18,7 +18,7 @@
private StandardTemplateService standardTemplateService;
@ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
- @PostMapping("/selectStandardTemplatePageList")
+ @GetMapping("/selectStandardTemplatePageList")
public Result selectStandardTemplatePageList(Page page,StandardTemplate standardTemplate) throws Exception {
return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
}
@@ -36,7 +36,7 @@
}
@ApiOperation(value = "鍒犻櫎鍘熷璁板綍妯℃澘")
- @PostMapping("/delStandardTemplate")
+ @DeleteMapping("/delStandardTemplate")
public Result<?> delStandardTemplate(Integer id) {
return Result.success(standardTemplateService.delStandardTemplate(id));
}
@@ -48,7 +48,7 @@
}
@ApiOperation(value = "閫氳繃妯℃澘id鑾峰彇妫�楠岄」妯℃澘鍐呭")
- @PostMapping("/getStandTempThingById")
+ @GetMapping("/getStandTempThingById")
public Result<?> getStandTempThingById(Integer id) {
return Result.success(standardTemplateService.getStandTempThingById(id));
}
@@ -58,11 +58,5 @@
public Result<?> getEditTemplatePreparation(@RequestParam("id") Integer id) {
StandardTemplate byId = standardTemplateService.getById(id);
return Result.success("OK", byId.getThing());
- }
-
- @ApiOperation(value = "澶嶅埗鍘熷璁板綍妯℃澘")
- @PostMapping("/copyStandardTemplate")
- public Result copyStandardTemplate(@RequestBody StandardTemplate newTemplate) {
- return Result.success(standardTemplateService.copyStandardTemplate(newTemplate));
}
}
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTreeController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index a92e4d1..d24ae09 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -1,19 +1,19 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.dto.CopyStandardProductListDto;
-import com.ruoyi.inspect.dto.FactoryDto;
-import com.ruoyi.inspect.dto.InsSampleReceiveDto;
-import com.ruoyi.inspect.dto.ResetTreeDragDTO;
-import com.ruoyi.inspect.pojo.StandardProductList;
-import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.inspect.pojo.StandardTree;
-import com.ruoyi.inspect.service.StandardMethodListService;
-import com.ruoyi.inspect.service.StandardProductListService;
-import com.ruoyi.inspect.service.StandardProductListSupplierAskService;
-import com.ruoyi.inspect.service.StandardTreeService;
+import com.ruoyi.basic.dto.CopyStandardProductListDto;
+import com.ruoyi.basic.dto.FactoryDto;
+import com.ruoyi.basic.dto.InsSampleReceiveDto;
+import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.basic.pojo.StandardTree;
+import com.ruoyi.basic.service.StandardMethodListService;
+import com.ruoyi.basic.service.StandardProductListService;
+import com.ruoyi.basic.service.StandardProductListSupplierAskService;
+import com.ruoyi.basic.service.StandardTreeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/controller/StructureTestObjectPartController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/inspect/controller/StructureTestObjectPartController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java
index e6aca05..5a073e8 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/controller/StructureTestObjectPartController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.pojo.StructureTestObjectPart;
-import com.ruoyi.inspect.service.StructureTestObjectPartService;
+import com.ruoyi.basic.pojo.StructureTestObjectPart;
+import com.ruoyi.basic.service.StructureTestObjectPartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/CopyStandardProductListDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/CopyStandardProductListDto.java
similarity index 84%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/CopyStandardProductListDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/CopyStandardProductListDto.java
index 08f9bfc..7287adb 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/CopyStandardProductListDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/CopyStandardProductListDto.java
@@ -1,6 +1,6 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
-import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductList;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/FactoryDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/FactoryDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java
index a5b36d9..612bcf8 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/FactoryDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantityCheckDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java
similarity index 99%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantityCheckDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java
index e7df599..db5c582 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantityCheckDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantityDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantityDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
index b52057a..237224e 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantityDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantitySupplierDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantitySupplierDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
index f829043..71bfddb 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/IfsInventoryQuantitySupplierDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.inspect.pojo.IfsInventoryQuantity;
+import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/InsSampleReceiveDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/InsSampleReceiveDto.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/InsSampleReceiveDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/InsSampleReceiveDto.java
index 98b716d..fbc2683 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/InsSampleReceiveDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/InsSampleReceiveDto.java
@@ -1,6 +1,6 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
-import com.ruoyi.inspect.pojo.InsSample1;
+import com.ruoyi.basic.pojo.InsSample1;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/LaboratoryDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/LaboratoryDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
index 59d088d..e3f000c 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/LaboratoryDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/ModelDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
similarity index 82%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/ModelDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
index 5ed39bf..5f8321e 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/ModelDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/PageTestObjectDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java
similarity index 85%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/PageTestObjectDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java
index f4736d5..684cf46 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/PageTestObjectDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java
@@ -1,6 +1,6 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
-import com.ruoyi.inspect.pojo.StructureTestObject;
+import com.ruoyi.basic.pojo.StructureTestObject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDTO1.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDTO1.java
similarity index 76%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDTO1.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/ProductDTO1.java
index f9fa558..8ed7631 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDTO1.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDTO1.java
@@ -1,6 +1,6 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
-import com.ruoyi.inspect.pojo.Product;
+import com.ruoyi.basic.pojo.Product;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
similarity index 77%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
index a1502e6..efd5d2e 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/ResetTreeDragDTO.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ResetTreeDragDTO.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/ResetTreeDragDTO.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/ResetTreeDragDTO.java
index 1fee4c7..d875a91 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/ResetTreeDragDTO.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ResetTreeDragDTO.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/SampleDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/SampleDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
index 3db9c2f..18fc086 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/SampleDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/SampleTypeDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/SampleTypeDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
index 4744706..0ae8087 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/SampleTypeDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/dto/TestItemDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java
similarity index 84%
rename from basic-server/src/main/java/com/ruoyi/inspect/dto/TestItemDto.java
rename to basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java
index 627fc66..4363a1a 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/dto/TestItemDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.dto;
+package com.ruoyi.basic.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectData.java b/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectData.java
rename to basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
index 8242910..4fc2fd2 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectData.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.excel;
+package com.ruoyi.basic.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectListener.java b/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectListener.java
similarity index 91%
rename from basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectListener.java
rename to basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectListener.java
index 9c3810b..04d3c2c 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectListener.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectListener.java
@@ -1,8 +1,8 @@
-package com.ruoyi.inspect.excel;
+package com.ruoyi.basic.excel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
-import com.ruoyi.inspect.service.ProductService;
+import com.ruoyi.basic.service.ProductService;
import java.util.ArrayList;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/CertificationMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java
similarity index 86%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/CertificationMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java
index 86153df..2d50f3d 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/CertificationMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.pojo.Certification;
+import com.ruoyi.basic.pojo.Certification;
import org.apache.ibatis.annotations.Param;
public interface CertificationMapper extends BaseMapper<Certification> {
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/IfsInventoryQuantityMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/IfsInventoryQuantityMapper.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/IfsInventoryQuantityMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/IfsInventoryQuantityMapper.java
index 8ca353a..1963bb9 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/IfsInventoryQuantityMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/IfsInventoryQuantityMapper.java
@@ -1,8 +1,8 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.inspect.dto.IfsInventoryQuantityDto;
-import com.ruoyi.inspect.pojo.IfsInventoryQuantity;
+import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
+import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/LaboratoryMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/LaboratoryMapper.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/LaboratoryMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/LaboratoryMapper.java
index 6be3f72..df6aab9 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/LaboratoryMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/LaboratoryMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.pojo.Laboratory;
+import com.ruoyi.basic.pojo.Laboratory;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java
similarity index 85%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java
index d6e9def..8fdbc4a 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java
@@ -1,11 +1,11 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.dto.ProductDTO1;
-import com.ruoyi.inspect.pojo.Product;
+import com.ruoyi.basic.dto.ProductDTO1;
+import com.ruoyi.basic.pojo.Product;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductPartMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductPartMapper.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductPartMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/ProductPartMapper.java
index e45e3f5..9d2943f 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductPartMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductPartMapper.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ruoyi.inspect.pojo.ProductPart;
+import com.ruoyi.basic.pojo.ProductPart;
import org.apache.ibatis.annotations.Param;
public interface ProductPartMapper extends BaseMapper<ProductPart> {
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductSupplierDensityMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductSupplierDensityMapper.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductSupplierDensityMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/ProductSupplierDensityMapper.java
index 391f77d..80b387c 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductSupplierDensityMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductSupplierDensityMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.pojo.ProductSupplierDensity;
+import com.ruoyi.basic.pojo.ProductSupplierDensity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/SealMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java
similarity index 81%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/SealMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java
index 1ebdeb0..9b96fc9 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/SealMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java
@@ -1,11 +1,11 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.pojo.Laboratory;
-import com.ruoyi.inspect.pojo.Seal;
+import com.ruoyi.basic.pojo.Laboratory;
+import com.ruoyi.basic.pojo.Seal;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodListMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodListMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java
index 540c4ab..a5e337b 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java
@@ -1,8 +1,8 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.inspect.pojo.StandardMethodList;
-import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardMethodList;
+import com.ruoyi.basic.pojo.StandardProductList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodMapper.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodMapper.java
index 93795d4..fb88032 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.mybatis_config.MyBaseMapper;
-import com.ruoyi.inspect.pojo.StandardMethod;
+import com.ruoyi.basic.pojo.StandardMethod;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
similarity index 96%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
index 1b0e867..f25f673 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
@@ -1,8 +1,8 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListSupplierAskMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListSupplierAskMapper.java
similarity index 76%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListSupplierAskMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListSupplierAskMapper.java
index 23ffae9..ff3cdfb 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListSupplierAskMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListSupplierAskMapper.java
@@ -1,7 +1,7 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTemplateMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
similarity index 77%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTemplateMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
index 0f39a84..d6f36c1 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTemplateMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.pojo.StandardTemplate;
+import com.ruoyi.basic.pojo.StandardTemplate;
import org.apache.ibatis.annotations.Param;
/**
@@ -19,12 +19,6 @@
StandardTemplate getStandTempIdByName(String name);
- /**
- * 鏌ヨ鍘嬬缉鍚庣殑鏁版嵁
- * @param templateId
- * @return
- */
- String selectCompressThing(Integer templateId);
}
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTreeMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index 6a91a68..4deb5df 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -1,14 +1,14 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.dto.*;
-import com.ruoyi.inspect.pojo.IfsInventoryQuantity;
-import com.ruoyi.inspect.pojo.StandardMethodList;
-import com.ruoyi.inspect.pojo.StandardProductList;
-import com.ruoyi.inspect.pojo.StandardTree;
+import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.pojo.IfsInventoryQuantity;
+import com.ruoyi.basic.pojo.StandardMethodList;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardTree;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureItemParameterMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java
similarity index 86%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureItemParameterMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java
index d32b7c4..654741a 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureItemParameterMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java
@@ -1,11 +1,11 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.dto.TestItemDto;
-import com.ruoyi.inspect.pojo.StructureItemParameter;
+import com.ruoyi.basic.dto.TestItemDto;
+import com.ruoyi.basic.pojo.StructureItemParameter;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java
similarity index 82%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java
index 84bf87a..1ada57c 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java
@@ -1,11 +1,11 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.dto.PageTestObjectDto;
-import com.ruoyi.inspect.pojo.StructureTestObject;
+import com.ruoyi.basic.dto.PageTestObjectDto;
+import com.ruoyi.basic.pojo.StructureTestObject;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectPartMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectPartMapper.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectPartMapper.java
rename to basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectPartMapper.java
index 29a4fc3..33e54f7 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectPartMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectPartMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.mapper;
+package com.ruoyi.basic.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.pojo.StructureTestObjectPart;
+import com.ruoyi.basic.pojo.StructureTestObjectPart;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/Certification.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/Certification.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java
index b20050e..7eb1649 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/Certification.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/IfsInventoryQuantity.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
similarity index 99%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/IfsInventoryQuantity.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
index d84b299..3984802 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/IfsInventoryQuantity.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/InsSample1.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/InsSample1.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/InsSample1.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/InsSample1.java
index 79b048f..19d5cb9 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/InsSample1.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/InsSample1.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/Laboratory.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/Laboratory.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java
index ac72303..a9343a1 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/Laboratory.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/Product.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/Product.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/Product.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/Product.java
index 1d8f47f..0847231 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/Product.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/Product.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductPart.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/ProductPart.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductPart.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/ProductPart.java
index f7eef84..0a29975 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductPart.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/ProductPart.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductSupplierDensity.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/ProductSupplierDensity.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductSupplierDensity.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/ProductSupplierDensity.java
index e0a13a9..b953919 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductSupplierDensity.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/ProductSupplierDensity.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/Seal.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/Seal.java
similarity index 96%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/Seal.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/Seal.java
index 9008197..783703c 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/Seal.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/Seal.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethod.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethod.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethod.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethod.java
index 1c31147..6d5ec08 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethod.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethod.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethodList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethodList.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethodList.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethodList.java
index bbc0cc4..8161270 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethodList.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethodList.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
similarity index 99%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductList.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
index b10c2ae..1c1b79f 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductList.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductListSupplierAsk.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductListSupplierAsk.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java
index ad0b683..c857a6c 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductListSupplierAsk.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTemplate.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTemplate.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java
index 04b5c0b..e26971f 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTemplate.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTree.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTree.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTree.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTree.java
index fe40352..8c2b6cf 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTree.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTree.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureItemParameter.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureItemParameter.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
index 6325cc8..7faa8be 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureItemParameter.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObject.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObject.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObject.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObject.java
index 4403363..d5af3f2 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObject.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObject.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObjectPart.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObjectPart.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObjectPart.java
rename to basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObjectPart.java
index 7a6aa14..a1e500c 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObjectPart.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObjectPart.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/CapacityScopeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
similarity index 83%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/CapacityScopeService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
index f988c0f..6139cd1 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/CapacityScopeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
@@ -1,13 +1,13 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.dto.PageTestObjectDto;
-import com.ruoyi.inspect.dto.TestItemDto;
+import com.ruoyi.basic.dto.PageTestObjectDto;
+import com.ruoyi.basic.dto.TestItemDto;
-import com.ruoyi.inspect.pojo.StructureItemParameter;
-import com.ruoyi.inspect.pojo.StructureTestObject;
+import com.ruoyi.basic.pojo.StructureItemParameter;
+import com.ruoyi.basic.pojo.StructureTestObject;
import java.util.List;
import java.util.Map;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/CertificationService.java b/basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/CertificationService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java
index 78398ed..7ecac80 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/CertificationService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.Certification;
+import com.ruoyi.basic.pojo.Certification;
public interface CertificationService extends IService<Certification> {
//鏌ヨ璧勮川鏄庣粏鍒楄〃
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/LaboratoryService.java b/basic-server/src/main/java/com/ruoyi/basic/service/LaboratoryService.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/LaboratoryService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/LaboratoryService.java
index e86f89b..4dc05a5 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/LaboratoryService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/LaboratoryService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.Laboratory;
+import com.ruoyi.basic.pojo.Laboratory;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/ProductPartService.java b/basic-server/src/main/java/com/ruoyi/basic/service/ProductPartService.java
similarity index 83%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/ProductPartService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/ProductPartService.java
index b1127b8..3525752 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/ProductPartService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/ProductPartService.java
@@ -1,8 +1,8 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.ProductPart;
+import com.ruoyi.basic.pojo.ProductPart;
public interface ProductPartService extends IService<ProductPart> {
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/ProductService.java b/basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java
similarity index 79%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/ProductService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java
index c55af4f..6fdc7c2 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/ProductService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java
@@ -1,11 +1,11 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.dto.ProductDTO1;
-import com.ruoyi.inspect.excel.StructureTestObjectData;
-import com.ruoyi.inspect.pojo.Product;
+import com.ruoyi.basic.dto.ProductDTO1;
+import com.ruoyi.basic.excel.StructureTestObjectData;
+import com.ruoyi.basic.pojo.Product;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/ProductSupplierDensityService.java b/basic-server/src/main/java/com/ruoyi/basic/service/ProductSupplierDensityService.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/ProductSupplierDensityService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/ProductSupplierDensityService.java
index d8b8e83..13be167 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/ProductSupplierDensityService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/ProductSupplierDensityService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.ProductSupplierDensity;
+import com.ruoyi.basic.pojo.ProductSupplierDensity;
/**
* 浜у搧鍘傚瀵嗗害缁戝畾琛�
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/SealService.java b/basic-server/src/main/java/com/ruoyi/basic/service/SealService.java
similarity index 78%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/SealService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/SealService.java
index 00d5ada..3e4aa91 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/SealService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/SealService.java
@@ -1,11 +1,11 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.Laboratory;
-import com.ruoyi.inspect.pojo.Seal;
+import com.ruoyi.basic.pojo.Laboratory;
+import com.ruoyi.basic.pojo.Seal;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodListService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodListService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
index 2c0c066..14ee117 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodListService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.StandardMethodList;
+import com.ruoyi.basic.pojo.StandardMethodList;
import java.util.List;
import java.util.Map;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java
similarity index 91%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java
index a2e7678..d9b3432 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.StandardMethod;
+import com.ruoyi.basic.pojo.StandardMethod;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
index e7fcbae..39e0754 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
@@ -1,12 +1,12 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.dto.CopyStandardProductListDto;
-import com.ruoyi.inspect.dto.InsSampleReceiveDto;
-import com.ruoyi.inspect.dto.ResetTreeDragDTO;
-import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.basic.dto.CopyStandardProductListDto;
+import com.ruoyi.basic.dto.InsSampleReceiveDto;
+import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.pojo.StandardProductList;
import java.util.List;
import java.util.Map;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService2.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
similarity index 78%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService2.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
index 1f64bae..4f54fe6 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService2.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
@@ -1,7 +1,7 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductList;
/**
* @author Administrator
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListSupplierAskService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListSupplierAskService.java
similarity index 84%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListSupplierAskService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListSupplierAskService.java
index 40267e9..c32d0e4 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListSupplierAskService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListSupplierAskService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardTemplateService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTemplateService.java
similarity index 86%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StandardTemplateService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StandardTemplateService.java
index 1240e66..3910c22 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardTemplateService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTemplateService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.StandardTemplate;
+import com.ruoyi.basic.pojo.StandardTemplate;
import java.util.List;
@@ -29,6 +29,4 @@
String getStandTempNameById(Integer templateId);
StandardTemplate getStandTempIdByName(String name);
-
- int copyStandardTemplate(StandardTemplate newTemplate);
}
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StandardTreeService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
index 62da5e3..39d08e7 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.dto.FactoryDto;
-import com.ruoyi.inspect.dto.SampleTypeDto;
-import com.ruoyi.inspect.pojo.StandardTree;
+import com.ruoyi.basic.dto.FactoryDto;
+import com.ruoyi.basic.dto.SampleTypeDto;
+import com.ruoyi.basic.pojo.StandardTree;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StructureItemParameterService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StructureItemParameterService.java
similarity index 68%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StructureItemParameterService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StructureItemParameterService.java
index 8d2cedf..a697619 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StructureItemParameterService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StructureItemParameterService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.StructureItemParameter;
+import com.ruoyi.basic.pojo.StructureItemParameter;
public interface StructureItemParameterService extends IService<StructureItemParameter> {
void removeNoSample(String sample);
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectPartService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectPartService.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectPartService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectPartService.java
index 420d1ed..de84817 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectPartService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectPartService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.StructureTestObjectPart;
+import com.ruoyi.basic.pojo.StructureTestObjectPart;
/**
* 妫�楠屽璞￠浂浠惰〃
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectService.java
similarity index 74%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectService.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectService.java
index 74c115b..200a51a 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.inspect.service;
+package com.ruoyi.basic.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.StructureTestObject;
+import com.ruoyi.basic.pojo.StructureTestObject;
/**
* 妫�娴嬪璞�(StructureTestObject)$desc
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
similarity index 95%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
index bf763cf..f63a161 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -9,13 +9,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.dto.PageTestObjectDto;
-import com.ruoyi.inspect.dto.TestItemDto;
-import com.ruoyi.inspect.mapper.*;
-import com.ruoyi.inspect.pojo.*;
-import com.ruoyi.inspect.service.CapacityScopeService;
-import com.ruoyi.inspect.service.StandardProductListService;
-import com.ruoyi.inspect.service.StructureItemParameterService;
+import com.ruoyi.basic.dto.PageTestObjectDto;
+import com.ruoyi.basic.dto.TestItemDto;
+import com.ruoyi.basic.mapper.*;
+import com.ruoyi.basic.pojo.*;
+import com.ruoyi.basic.service.CapacityScopeService;
+import com.ruoyi.basic.service.StandardProductListService;
+import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CertificationServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/CertificationServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
index 4eb722a..11a6e61 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CertificationServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.mapper.CertificationMapper;
-import com.ruoyi.inspect.pojo.Certification;
-import com.ruoyi.inspect.service.CertificationService;
+import com.ruoyi.basic.mapper.CertificationMapper;
+import com.ruoyi.basic.pojo.Certification;
+import com.ruoyi.basic.service.CertificationService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/LaboratoryServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/LaboratoryServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java
index 18c4318..a91a3c5 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/LaboratoryServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.mapper.LaboratoryMapper;
-import com.ruoyi.inspect.pojo.Laboratory;
-import com.ruoyi.inspect.service.LaboratoryService;
+import com.ruoyi.basic.mapper.LaboratoryMapper;
+import com.ruoyi.basic.pojo.Laboratory;
+import com.ruoyi.basic.service.LaboratoryService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductPartServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductPartServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java
index 009b279..5ecfb88 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductPartServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,11 +7,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.mapper.ProductPartMapper;
-import com.ruoyi.inspect.mapper.StructureTestObjectPartMapper;
-import com.ruoyi.inspect.pojo.ProductPart;
-import com.ruoyi.inspect.pojo.StructureTestObjectPart;
-import com.ruoyi.inspect.service.ProductPartService;
+import com.ruoyi.basic.mapper.ProductPartMapper;
+import com.ruoyi.basic.mapper.StructureTestObjectPartMapper;
+import com.ruoyi.basic.pojo.ProductPart;
+import com.ruoyi.basic.pojo.StructureTestObjectPart;
+import com.ruoyi.basic.service.ProductPartService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
similarity index 93%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index 41b12b6..d1786cb 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -10,17 +10,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.dto.ProductDTO1;
-import com.ruoyi.inspect.excel.StructureTestObjectData;
-import com.ruoyi.inspect.mapper.ProductMapper;
-import com.ruoyi.inspect.mapper.ProductPartMapper;
-import com.ruoyi.inspect.mapper.StandardTreeMapper;
-import com.ruoyi.inspect.mapper.StructureTestObjectMapper;
-import com.ruoyi.inspect.pojo.*;
-import com.ruoyi.inspect.service.LaboratoryService;
-import com.ruoyi.inspect.service.ProductService;
-import com.ruoyi.inspect.service.StandardProductListService;
-import com.ruoyi.inspect.service.StructureItemParameterService;
+import com.ruoyi.basic.dto.ProductDTO1;
+import com.ruoyi.basic.excel.StructureTestObjectData;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductPartMapper;
+import com.ruoyi.basic.mapper.StandardTreeMapper;
+import com.ruoyi.basic.mapper.StructureTestObjectMapper;
+import com.ruoyi.basic.pojo.*;
+import com.ruoyi.basic.service.LaboratoryService;
+import com.ruoyi.basic.service.ProductService;
+import com.ruoyi.basic.service.StandardProductListService;
+import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductSupplierDensityServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductSupplierDensityServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java
index 069498c..54a92ab 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductSupplierDensityServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.mapper.ProductSupplierDensityMapper;
-import com.ruoyi.inspect.pojo.ProductSupplierDensity;
-import com.ruoyi.inspect.service.ProductSupplierDensityService;
+import com.ruoyi.basic.mapper.ProductSupplierDensityMapper;
+import com.ruoyi.basic.pojo.ProductSupplierDensity;
+import com.ruoyi.basic.service.ProductSupplierDensityService;
import org.springframework.stereotype.Service;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/SealServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java
similarity index 80%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/SealServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java
index ee9b06e..695e989 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/SealServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.inspect.mapper.SealMapper;
-import com.ruoyi.inspect.pojo.Laboratory;
-import com.ruoyi.inspect.pojo.Seal;
-import com.ruoyi.inspect.service.SealService;
+import com.ruoyi.basic.mapper.SealMapper;
+import com.ruoyi.basic.pojo.Laboratory;
+import com.ruoyi.basic.pojo.Seal;
+import com.ruoyi.basic.service.SealService;
import com.ruoyi.common.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodListServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
index 784790b..5ab1ed5 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.inspect.mapper.StandardMethodListMapper;
-import com.ruoyi.inspect.mapper.StandardProductListMapper;
-import com.ruoyi.inspect.pojo.StandardMethodList;
-import com.ruoyi.inspect.pojo.StandardProductList;
-import com.ruoyi.inspect.service.StandardMethodListService;
+import com.ruoyi.basic.mapper.StandardMethodListMapper;
+import com.ruoyi.basic.mapper.StandardProductListMapper;
+import com.ruoyi.basic.pojo.StandardMethodList;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.service.StandardMethodListService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
similarity index 95%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
index e4df479..44566bd 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import cn.hutool.json.JSONUtil;
import cn.hutool.poi.excel.ExcelUtil;
@@ -8,15 +8,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.mapper.StandardMethodMapper;
-import com.ruoyi.inspect.mapper.StandardProductListMapper;
-import com.ruoyi.inspect.mapper.StructureItemParameterMapper;
-import com.ruoyi.inspect.pojo.StandardMethod;
-import com.ruoyi.inspect.pojo.StandardProductList;
-import com.ruoyi.inspect.pojo.StructureItemParameter;
-import com.ruoyi.inspect.service.StandardMethodService;
-import com.ruoyi.inspect.service.StandardProductListService;
-import com.ruoyi.inspect.service.StructureItemParameterService;
+import com.ruoyi.basic.mapper.StandardMethodMapper;
+import com.ruoyi.basic.mapper.StandardProductListMapper;
+import com.ruoyi.basic.mapper.StructureItemParameterMapper;
+import com.ruoyi.basic.pojo.StandardMethod;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StructureItemParameter;
+import com.ruoyi.basic.service.StandardMethodService;
+import com.ruoyi.basic.service.StandardProductListService;
+import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java
new file mode 100644
index 0000000..eae1bc2
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java
@@ -0,0 +1,12 @@
+package com.ruoyi.basic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.StandardProductListMapper;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.service.StandardProductListService2;
+import org.springframework.stereotype.Service;
+
+@Service
+public class StandardProductListService2Impl extends ServiceImpl<StandardProductListMapper, StandardProductList>
+ implements StandardProductListService2 {
+}
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index 648d57b..c5695ec 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -8,19 +8,19 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.inspect.dto.CopyStandardProductListDto;
-import com.ruoyi.inspect.dto.InsSampleReceiveDto;
-import com.ruoyi.inspect.dto.ProductDto;
-import com.ruoyi.inspect.dto.ResetTreeDragDTO;
-import com.ruoyi.inspect.mapper.IfsInventoryQuantityMapper;
-import com.ruoyi.inspect.mapper.StandardProductListMapper;
-import com.ruoyi.inspect.mapper.StandardProductListSupplierAskMapper;
-import com.ruoyi.inspect.mapper.StandardTreeMapper;
-import com.ruoyi.inspect.pojo.StandardProductList;
-import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.inspect.pojo.StandardTree;
-import com.ruoyi.inspect.service.StandardProductListService;
-import com.ruoyi.inspect.service.StandardProductListService2;
+import com.ruoyi.basic.dto.CopyStandardProductListDto;
+import com.ruoyi.basic.dto.InsSampleReceiveDto;
+import com.ruoyi.basic.dto.ProductDto;
+import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
+import com.ruoyi.basic.mapper.StandardProductListMapper;
+import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
+import com.ruoyi.basic.mapper.StandardTreeMapper;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.basic.pojo.StandardTree;
+import com.ruoyi.basic.service.StandardProductListService;
+import com.ruoyi.basic.service.StandardProductListService2;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListSupplierAskServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListSupplierAskServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java
index 72c261f..95ac78d 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListSupplierAskServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.inspect.mapper.StandardProductListSupplierAskMapper;
-import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.inspect.service.StandardProductListSupplierAskService;
+import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
+import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.basic.service.StandardProductListSupplierAskService;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
new file mode 100644
index 0000000..5495ddd
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
@@ -0,0 +1,80 @@
+package com.ruoyi.basic.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.basic.mapper.StandardTemplateMapper;
+import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.basic.service.StandardTemplateService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_template(鏍囧噯妯℃澘)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-11 13:47:52
+*/
+@Service
+@AllArgsConstructor
+public class StandardTemplateServiceImpl extends ServiceImpl<StandardTemplateMapper, StandardTemplate>
+ implements StandardTemplateService{
+
+ private StandardTemplateMapper standardTemplateMapper;
+
+ @Override
+ public IPage<StandardTemplate> selectStandardTemplatePageList(Page page, StandardTemplate standardTemplate) {
+ return standardTemplateMapper.selectStandardTemplatePageList(page, QueryWrappers.queryWrappers(standardTemplate));
+ }
+
+ @Override
+ public int addStandardTemplate(StandardTemplate standardTemplate) {
+ return standardTemplateMapper.insert(standardTemplate);
+ }
+
+ @Override
+ public int upStandardTemplate(StandardTemplate standardTemplate) {
+ if(standardTemplate.getThing().equals("")){
+ standardTemplate.setThing(null);
+ }
+ return standardTemplateMapper.updateById(standardTemplate);
+ }
+
+ @Override
+ public int delStandardTemplate(Integer id) {
+ return standardTemplateMapper.deleteById(id);
+ }
+
+ @Override
+ public List<StandardTemplate> getStandardTemplate() {
+ return standardTemplateMapper.selectList(Wrappers.<StandardTemplate>lambdaQuery().select(StandardTemplate::getId,StandardTemplate::getName));
+ }
+
+ @Override
+ public String getStandTempThingById(Integer templateId) {
+ StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId);
+ if(standardTemplate==null){
+ return null;
+ }else{
+ return standardTemplate.getThing();
+ }
+ }
+
+ @Override
+ public String getStandTempNameById(Integer templateId) {
+ StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId);
+ if(standardTemplate==null){
+ return null;
+ }else{
+ return standardTemplate.getName();
+ }
+ }
+
+ @Override
+ public StandardTemplate getStandTempIdByName(String name) {
+ return standardTemplateMapper.getStandTempIdByName(name);
+ }
+}
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTreeServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index 93f803c..b64ab41 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.poi.excel.ExcelUtil;
@@ -11,16 +11,16 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.inspect.dto.FactoryDto;
-import com.ruoyi.inspect.dto.LaboratoryDto;
-import com.ruoyi.inspect.dto.SampleTypeDto;
-import com.ruoyi.inspect.mapper.StandardProductListMapper;
-import com.ruoyi.inspect.mapper.StandardTreeMapper;
-import com.ruoyi.inspect.pojo.StandardProductList;
-import com.ruoyi.inspect.pojo.StandardTemplate;
-import com.ruoyi.inspect.pojo.StandardTree;
-import com.ruoyi.inspect.pojo.StructureTestObject;
-import com.ruoyi.inspect.service.*;
+import com.ruoyi.basic.dto.FactoryDto;
+import com.ruoyi.basic.dto.LaboratoryDto;
+import com.ruoyi.basic.dto.SampleTypeDto;
+import com.ruoyi.basic.mapper.StandardProductListMapper;
+import com.ruoyi.basic.mapper.StandardTreeMapper;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.basic.pojo.StandardTree;
+import com.ruoyi.basic.pojo.StructureTestObject;
+import com.ruoyi.basic.service.*;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureItemParameterServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java
similarity index 73%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureItemParameterServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java
index 5604e9f..4009106 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureItemParameterServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.inspect.mapper.StructureItemParameterMapper;
-import com.ruoyi.inspect.pojo.StructureItemParameter;
-import com.ruoyi.inspect.service.StructureItemParameterService;
+import com.ruoyi.basic.mapper.StructureItemParameterMapper;
+import com.ruoyi.basic.pojo.StructureItemParameter;
+import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectPartServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectPartServiceImpl.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectPartServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectPartServiceImpl.java
index f0cc96d..819ef16 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectPartServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectPartServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,11 +9,11 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.mapper.ProductPartMapper;
-import com.ruoyi.inspect.mapper.StructureTestObjectPartMapper;
-import com.ruoyi.inspect.pojo.ProductPart;
-import com.ruoyi.inspect.pojo.StructureTestObjectPart;
-import com.ruoyi.inspect.service.StructureTestObjectPartService;
+import com.ruoyi.basic.mapper.ProductPartMapper;
+import com.ruoyi.basic.mapper.StructureTestObjectPartMapper;
+import com.ruoyi.basic.pojo.ProductPart;
+import com.ruoyi.basic.pojo.StructureTestObjectPart;
+import com.ruoyi.basic.service.StructureTestObjectPartService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectServiceImpl.java
similarity index 62%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectServiceImpl.java
index 29d6ec2..60f0f40 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.inspect.mapper.StructureTestObjectMapper;
-import com.ruoyi.inspect.pojo.StructureTestObject;
-import com.ruoyi.inspect.service.StructureTestObjectService;
+import com.ruoyi.basic.mapper.StructureTestObjectMapper;
+import com.ruoyi.basic.pojo.StructureTestObject;
+import com.ruoyi.basic.service.StructureTestObjectService;
import org.springframework.stereotype.Service;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListService2Impl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListService2Impl.java
deleted file mode 100644
index c766bb3..0000000
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListService2Impl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ruoyi.inspect.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.inspect.mapper.StandardProductListMapper;
-import com.ruoyi.inspect.pojo.StandardProductList;
-import com.ruoyi.inspect.service.StandardProductListService2;
-import org.springframework.stereotype.Service;
-
-@Service
-public class StandardProductListService2Impl extends ServiceImpl<StandardProductListMapper, StandardProductList>
- implements StandardProductListService2 {
-}
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.java
deleted file mode 100644
index ea5bf63..0000000
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.ruoyi.inspect.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.numgen.NumberGenerator;
-import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.mapper.StandardTemplateMapper;
-import com.ruoyi.inspect.pojo.StandardTemplate;
-import com.ruoyi.inspect.service.StandardTemplateService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恠tandard_template(鏍囧噯妯℃澘)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-11 13:47:52
-*/
-@Service
-@AllArgsConstructor
-public class StandardTemplateServiceImpl extends ServiceImpl<StandardTemplateMapper, StandardTemplate>
- implements StandardTemplateService{
-
- private StandardTemplateMapper standardTemplateMapper;
-
-
- private final NumberGenerator<StandardTemplate> numberGenerator;
-
- @Override
- public IPage<StandardTemplate> selectStandardTemplatePageList(Page page, StandardTemplate standardTemplate) {
- return standardTemplateMapper.selectStandardTemplatePageList(page, QueryWrappers.queryWrappers(standardTemplate));
- }
-
- @Override
- public int addStandardTemplate(StandardTemplate standardTemplate) {
- if (StringUtils.isBlank(standardTemplate.getNumber())) {
- String giveCode = numberGenerator.generateNumberWithPrefix(5,
- "MB" + DateUtil.format(new Date(), "yyMM"),
- StandardTemplate::getNumber);
- standardTemplate.setNumber(giveCode);
- }
- return standardTemplateMapper.insert(standardTemplate);
- }
-
- @Override
- public int upStandardTemplate(StandardTemplate standardTemplate) {
- if(standardTemplate.getThing().equals("")){
- standardTemplate.setThing(null);
- }
- return standardTemplateMapper.updateById(standardTemplate);
- }
-
- @Override
- public int delStandardTemplate(Integer id) {
- return standardTemplateMapper.deleteById(id);
- }
-
- @Override
- public List<StandardTemplate> getStandardTemplate() {
- return standardTemplateMapper.selectList(Wrappers.<StandardTemplate>lambdaQuery().select(StandardTemplate::getId,StandardTemplate::getName));
- }
-
- @Override
- public String getStandTempThingById(Integer templateId) {
- StandardTemplate standardTemplate = standardTemplateMapper.selectOne(Wrappers.<StandardTemplate>lambdaQuery()
- .eq(StandardTemplate::getId, templateId)
- .select(StandardTemplate::getThing));
- if(standardTemplate==null){
- return null;
- }else{
- return standardTemplate.getThing();
- }
- // 鏌ヨ鍘嬬缉鍚庣殑鏁版嵁
-// String thing = standardTemplateMapper.selectCompressThing(templateId);
-// if (StringUtils.isNotBlank(thing)) {
-// try {
-// return DecompressMySQLData.decompress(java.util.Base64.getDecoder().decode(thing));
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// } else {
-// return null;
-// }
- }
-
- @Override
- public String getStandTempNameById(Integer templateId) {
- StandardTemplate standardTemplate = standardTemplateMapper.selectOne(Wrappers.<StandardTemplate>lambdaQuery()
- .eq(StandardTemplate::getId, templateId)
- .select(StandardTemplate::getName));
- if(standardTemplate==null){
- return null;
- }else{
- return standardTemplate.getName();
- }
- }
-
- @Override
- public StandardTemplate getStandTempIdByName(String name) {
- return standardTemplateMapper.getStandTempIdByName(name);
- }
-
- /**
- * 澶嶅埗鍘熷璁板綍妯℃澘
- * @param newTemplate
- * @return
- */
- @Override
- public int copyStandardTemplate(StandardTemplate newTemplate) {
- // 鏌ヨ鏃фā鏉�
- StandardTemplate standardTemplate = baseMapper.selectById(newTemplate.getId());
- newTemplate.setThing(standardTemplate.getThing());
-
- if (StringUtils.isBlank(newTemplate.getNumber())) {
- String giveCode = numberGenerator.generateNumberWithPrefix(5,
- "MB" + DateUtil.format(new Date(), "yyMM"),
- StandardTemplate::getNumber);
- newTemplate.setNumber(giveCode);
- }
- newTemplate.setId(null);
-
- return standardTemplateMapper.insert(newTemplate);
- }
-}
diff --git a/basic-server/src/main/resources/mapper/CertificationMapper.xml b/basic-server/src/main/resources/mapper/CertificationMapper.xml
index 40304a3..4926d05 100644
--- a/basic-server/src/main/resources/mapper/CertificationMapper.xml
+++ b/basic-server/src/main/resources/mapper/CertificationMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.CertificationMapper">
- <select id="getCertificationDetail" resultType="com.ruoyi.inspect.pojo.Certification">
+ <select id="getCertificationDetail" resultType="com.ruoyi.basic.pojo.Certification">
select b.*
from ( select a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time FROM
(SELECT id,name,MIN(date_of_issuance) AS first_issuance_date,
diff --git a/basic-server/src/main/resources/mapper/IfsInventoryQuantityMapper.xml b/basic-server/src/main/resources/mapper/IfsInventoryQuantityMapper.xml
index 83c5e12..2b615be 100644
--- a/basic-server/src/main/resources/mapper/IfsInventoryQuantityMapper.xml
+++ b/basic-server/src/main/resources/mapper/IfsInventoryQuantityMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.IfsInventoryQuantityMapper">
- <select id="printLabel" resultType="com.ruoyi.inspect.dto.IfsInventoryQuantityDto">
+ <select id="printLabel" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityDto">
SELECT io.sample sample_name,
iiq.supplier_name,
io.part_detail part_desc,
diff --git a/basic-server/src/main/resources/mapper/LaboratoryMapper.xml b/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
index f27f412..c3ab2b4 100644
--- a/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
+++ b/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.LaboratoryMapper">
- <select id="selectItemParameter" resultType="com.ruoyi.inspect.pojo.Laboratory">
+ <select id="selectItemParameter" resultType="com.ruoyi.basic.pojo.Laboratory">
select * from
(
select l.id,
diff --git a/basic-server/src/main/resources/mapper/ProductMapper.xml b/basic-server/src/main/resources/mapper/ProductMapper.xml
index c1b0953..a13b18d 100644
--- a/basic-server/src/main/resources/mapper/ProductMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.ProductMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.Product">
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.Product">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="nameEn" column="name_en" jdbcType="VARCHAR"/>
@@ -20,7 +20,7 @@
create_user,update_user,create_time,
update_time,object_id
</sql>
- <select id="selectProductListByObjectId" resultType="com.ruoyi.inspect.pojo.Product">
+ <select id="selectProductListByObjectId" resultType="com.ruoyi.basic.pojo.Product">
select * from (
select p.id,
p.name,
diff --git a/basic-server/src/main/resources/mapper/ProductPartMapper.xml b/basic-server/src/main/resources/mapper/ProductPartMapper.xml
index 6a77f9c..f883d3c 100644
--- a/basic-server/src/main/resources/mapper/ProductPartMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductPartMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.ProductPartMapper">
- <select id="selectListByProductId" resultType="com.ruoyi.inspect.pojo.ProductPart">
+ <select id="selectListByProductId" resultType="com.ruoyi.basic.pojo.ProductPart">
SELECT * from product_part pp
where pp.product_id=#{productId}
</select>
diff --git a/basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml b/basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml
index ffe0354..4f47e62 100644
--- a/basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.ProductSupplierDensityMapper">
- <select id="selectListByProductId" resultType="com.ruoyi.inspect.pojo.ProductSupplierDensity">
+ <select id="selectListByProductId" resultType="com.ruoyi.basic.pojo.ProductSupplierDensity">
SELECT * from product_supplier_density pp
where pp.product_id=#{productId}
</select>
diff --git a/basic-server/src/main/resources/mapper/SealMapper.xml b/basic-server/src/main/resources/mapper/SealMapper.xml
index d31b318..5cb3595 100644
--- a/basic-server/src/main/resources/mapper/SealMapper.xml
+++ b/basic-server/src/main/resources/mapper/SealMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.SealMapper">
- <select id="selectSeal" resultType="com.ruoyi.inspect.pojo.Seal">
+ <select id="selectSeal" resultType="com.ruoyi.basic.pojo.Seal">
select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time
from seal s LEFT JOIN laboratory l on s.lab_id=l.id
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -11,7 +11,7 @@
</if>
</select>
- <select id="selectLaboratory" resultType="com.ruoyi.inspect.pojo.Laboratory">
+ <select id="selectLaboratory" resultType="com.ruoyi.basic.pojo.Laboratory">
SELECT *
from laboratory
WHERE id = #{labId}
diff --git a/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml b/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 25c6462..957fd1f 100644
--- a/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardMethodListMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardMethodList">
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardMethodList">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
@@ -25,14 +25,14 @@
from user
where id = #{id}
</select>
- <select id="selectStandardMethodLists" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
and is_product = 1
and structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%')
</select>
- <select id="selectParameterList" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectParameterList" resultType="com.ruoyi.basic.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -52,7 +52,7 @@
from structure_item_parameter
where method = #{code}
</select>
- <select id="selectStandardMethodLists2" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists2" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select sml.id, sml.code, sml.name,sml.remark, sml.create_time, u.name create_user_name
from standard_method_list sml
left join user u on u.id = sml.create_user
@@ -70,19 +70,19 @@
and model = #{data5}
</if>
</select>
- <select id="selectStandardMethodLists3" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists3" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
and is_product = 1
and structure_test_object_id LIKE CONCAT('%', #{tree}, '%')
</select>
- <select id="selectListEnum" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectListEnum" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id,code,name from standard_method
where is_product = 1
and is_use = 1
</select>
- <select id="selectStandardMethodListsByNull" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectStandardMethodListsByNull" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
diff --git a/basic-server/src/main/resources/mapper/StandardMethodMapper.xml b/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
index 3ab8231..739d2d4 100644
--- a/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardMethodMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardMethod">
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardMethod">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
@@ -15,7 +15,7 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <select id="selectStandardMethodList" resultType="com.ruoyi.inspect.pojo.StandardMethod">
+ <select id="selectStandardMethodList" resultType="com.ruoyi.basic.pojo.StandardMethod">
select * from (
select sm.id,
sm.code,
@@ -42,7 +42,7 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="selectStandMethodById" resultType="com.ruoyi.inspect.pojo.StandardMethod">
+ <select id="selectStandMethodById" resultType="com.ruoyi.basic.pojo.StandardMethod">
select sm.id,
sm.code,
sm.name,
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index 112ae89..52d6bfe 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardProductListMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardProductList">
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardProductList">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
@@ -55,7 +55,7 @@
and standard_method_list_id = #{methodId}
and sort between #{endIndex} and #{beginIndex} - 1
</update>
- <select id="standardProductListIPage" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="standardProductListIPage" resultType="com.ruoyi.basic.pojo.StandardProductList">
select spl.* from standard_product_list spl
left join product p on spl.sample = p.name
where standard_method_list_id = #{id}
@@ -72,7 +72,7 @@
order by p.id
group by spl.id
</select>
- <select id="getOne" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="getOne" resultType="com.ruoyi.basic.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and inspection_item = #{inspectionItem}
@@ -92,7 +92,7 @@
and inspection_item_class = #{inspectionItemClass}
</if>
</select>
- <select id="selectDetail" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectDetail" resultType="com.ruoyi.basic.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
@@ -111,7 +111,7 @@
WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
,id asc
</select>
- <select id="selectDetail2" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectDetail2" resultType="com.ruoyi.basic.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
diff --git a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
index d3f5591..43b380c 100644
--- a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardTemplateMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardTemplate">
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardTemplate">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
@@ -15,7 +15,7 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <select id="selectStandardTemplatePageList" resultType="com.ruoyi.inspect.pojo.StandardTemplate">
+ <select id="selectStandardTemplatePageList" resultType="com.ruoyi.basic.pojo.StandardTemplate">
select * from (
select st.id, st.name,st.number, st.remark, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time
from standard_template st
@@ -26,14 +26,8 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="getStandTempIdByName" resultType="com.ruoyi.inspect.pojo.StandardTemplate">
+ <select id="getStandTempIdByName" resultType="com.ruoyi.basic.pojo.StandardTemplate">
select id from standard_template where name=#{name}
- </select>
- <!-- 鏌ヨ鍘嬬缉鍚庣殑鏁版嵁 -->
- <select id="selectCompressThing" resultType="java.lang.String">
- SELECT COMPRESS(thing)
- from standard_template b
- WHERE id = #{templateId}
</select>
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index f63405f..74ded82 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardTreeMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardTree">
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardTree">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
@@ -16,19 +16,19 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <resultMap id="FactoryDto" type="com.ruoyi.inspect.dto.FactoryDto">
+ <resultMap id="FactoryDto" type="com.ruoyi.basic.dto.FactoryDto">
<result property="label" column="factory"/>
<result property="value" column="factory"/>
<collection property="children" resultMap="LaboratoryDto"/>
</resultMap>
- <resultMap id="LaboratoryDto" type="com.ruoyi.inspect.dto.LaboratoryDto">
+ <resultMap id="LaboratoryDto" type="com.ruoyi.basic.dto.LaboratoryDto">
<result property="label" column="laboratory"/>
<result property="value" column="laboratory"/>
<collection property="children" resultMap="SampleTypeDto"/>
</resultMap>
- <resultMap id="SampleTypeDto" type="com.ruoyi.inspect.dto.SampleTypeDto">
+ <resultMap id="SampleTypeDto" type="com.ruoyi.basic.dto.SampleTypeDto">
<result property="label" column="sample_type"/>
<result property="value" column="sample_type"/>
<result property="sampleTypeId" column="sample_type_id"/>
@@ -38,7 +38,7 @@
<collection property="children" resultMap="SampleDto"/>
</resultMap>
- <resultMap id="SampleDto" type="com.ruoyi.inspect.dto.SampleDto">
+ <resultMap id="SampleDto" type="com.ruoyi.basic.dto.SampleDto">
<result property="label" column="sample"/>
<result property="value" column="sample"/>
<result property="partNo" column="sample_part_no"/>
@@ -46,7 +46,7 @@
<collection property="children" resultMap="ModelDto"/>
</resultMap>
- <resultMap id="ModelDto" type="com.ruoyi.inspect.dto.ModelDto">
+ <resultMap id="ModelDto" type="com.ruoyi.basic.dto.ModelDto">
<result property="label" column="model"/>
<result property="value" column="model"/>
</resultMap>
@@ -108,7 +108,7 @@
order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
</select>
- <select id="selectStandardProductById" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectStandardProductById" resultType="com.ruoyi.basic.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -128,7 +128,7 @@
from structure_item_parameter
where id = #{id}
</select>
- <select id="getStandardProductListBySample" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="getStandardProductListBySample" resultType="com.ruoyi.basic.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -154,7 +154,7 @@
or sp.sample = ''
or sp.sample = '[]'
</select>
- <select id="getStandardMethodListBySample" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="getStandardMethodListBySample" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select sm.code,sm.name,sm.remark from standard_method sm
left join structure_test_object sto on sm.structure_test_object_id = sto.id
where is_use = 1
@@ -163,7 +163,7 @@
and sto.specimen_name = #{sampleType}
</if>
</select>
- <select id="selectStandardTreeList2" resultType="com.ruoyi.inspect.pojo.StandardTree">
+ <select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
@@ -177,7 +177,7 @@
where sto.specimen_name = #{sampleType}
group by sto.specimen_name
</select>
- <select id="selectStandardProductListByTree" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectStandardProductListByTree" resultType="com.ruoyi.basic.pojo.StandardProductList">
select <include refid="selectStandardTree"/>
from structure_item_parameter
where (
@@ -192,7 +192,7 @@
order by inspection_item_class, inspection_item, id asc
</select>
- <select id="selectStandardProductListByTree2" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectStandardProductListByTree2" resultType="com.ruoyi.basic.pojo.StandardProductList">
select <include refid="selectStandardTree"/>
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
@@ -212,7 +212,7 @@
and st.sample = p.name
</select>
- <select id="getStandardTree3" resultType="com.ruoyi.inspect.dto.SampleDto">
+ <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
select model label,
model value
from standard_tree
@@ -240,7 +240,7 @@
and (inspection_item_subclass is null or inspection_item_subclass = '')
</if>
</select>
- <select id="selectPList" resultType="com.ruoyi.inspect.dto.ProductDto">
+ <select id="selectPList" resultType="com.ruoyi.basic.dto.ProductDto">
select p.name
from structure_test_object sto
left join product p on p.object_id = sto.id
@@ -325,26 +325,26 @@
group by ifs.id) a
</sql>
- <select id="getIfsByStateOne" resultType="com.ruoyi.inspect.dto.IfsInventoryQuantityDto">
+ <select id="getIfsByStateOne" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityDto">
<include refid="getIfsOrder"/>
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
- <select id="selectIfsPage" resultType="com.ruoyi.inspect.pojo.IfsInventoryQuantity">
+ <select id="selectIfsPage" resultType="com.ruoyi.basic.pojo.IfsInventoryQuantity">
SELECT * from ifs_inventory_quantity ifs
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
- <select id="selectIfsInventoryQuantity" resultType="com.ruoyi.inspect.dto.IfsInventoryQuantityCheckDto">
+ <select id="selectIfsInventoryQuantity" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto">
SELECT * from ifs_inventory_quantity ifs
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
- <select id="getIfsByOver" resultType="com.ruoyi.inspect.dto.IfsInventoryQuantitySupplierDto">
+ <select id="getIfsByOver" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
select * from (<include refid="getIfsOrder"/>
<where>
<if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
@@ -356,7 +356,7 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="getIfsByOverList" resultType="com.ruoyi.inspect.dto.IfsInventoryQuantitySupplierDto">
+ <select id="getIfsByOverList" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
select * from (<include refid="getIfsOrder"/>
<where>
<if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
@@ -368,7 +368,7 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="getIfsByQuarter" resultType="com.ruoyi.inspect.dto.IfsInventoryQuantitySupplierDto">
+ <select id="getIfsByQuarter" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
select * from (<include refid="getIfsOrder"/>
<where>
and (quarter_order_id is not null)
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 5a0977b..fd67dfc 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -8,7 +8,7 @@
from structure_item_parameter
where sample like concat('%', #{sample}, '%')
</delete>
- <select id="selectItemParameterList" resultType="com.ruoyi.inspect.pojo.StructureItemParameter">
+ <select id="selectItemParameterList" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
select * from (select A.id,
inspection_item,
inspection_item_en,
@@ -109,12 +109,12 @@
left join product p on p.object_id = sto.id
</select>
- <resultMap id="itemDto" type="com.ruoyi.inspect.dto.TestItemDto">
+ <resultMap id="itemDto" type="com.ruoyi.basic.dto.TestItemDto">
<result column="sId" property="id"/>
<result column="sName" property="name"/>
<collection property="children" resultMap="productDto"/>
</resultMap>
- <resultMap id="productDto" type="com.ruoyi.inspect.dto.ProductDto">
+ <resultMap id="productDto" type="com.ruoyi.basic.dto.ProductDto">
<result column="pId" property="id"/>
<result column="pName" property="name"/>
</resultMap>
diff --git a/basic-server/src/main/resources/mapper/StructureTestMapper.xml b/basic-server/src/main/resources/mapper/StructureTestMapper.xml
index 06bf1a1..05c7ae7 100644
--- a/basic-server/src/main/resources/mapper/StructureTestMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureTestMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StructureTestObjectMapper">
- <select id="selectTestObjectList" resultType="com.ruoyi.inspect.dto.PageTestObjectDto">
+ <select id="selectTestObjectList" resultType="com.ruoyi.basic.dto.PageTestObjectDto">
select * from (
select sto.id,
sto.specimen_name,
diff --git a/basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml b/basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml
index 16a9aa7..ee26497 100644
--- a/basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.StructureTestObjectPartMapper">
- <select id="selectListByTestObjectId" resultType="com.ruoyi.inspect.pojo.StructureTestObjectPart">
+ <select id="selectListByTestObjectId" resultType="com.ruoyi.basic.pojo.StructureTestObjectPart">
SELECT * from structure_test_object_part pp
where pp.test_object_id = #{testObjectId}
</select>
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java
index a076745..81470cd 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java
@@ -14,7 +14,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalCheckDto;
import com.ruoyi.manage.mapper.InternalCheckMapper;
import com.ruoyi.manage.pojo.InternalCheck;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java
index bfff502..dc6ed80 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java
@@ -13,7 +13,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalImplementDto;
import com.ruoyi.manage.mapper.InternalImplementMapper;
import com.ruoyi.manage.pojo.InternalImplement;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
index cf1cb81..c48f22b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalMeetingDto;
import com.ruoyi.manage.dto.InternalMeetingParticipantDto;
import com.ruoyi.manage.mapper.InternalMeetingMapper;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
index d53aa2b..8b3ef6c 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
@@ -12,7 +12,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalPlanDto;
import com.ruoyi.manage.mapper.InternalPlanMapper;
import com.ruoyi.manage.pojo.InternalPlan;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
index ecad4e0..9eecd21 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
@@ -10,7 +10,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.mapper.ManageControlPlanListMapper;
import com.ruoyi.manage.pojo.ManageControlPlanList;
import com.ruoyi.manage.service.ManageControlPlanListService;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
index 61857da..4a519a6 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.ManageMeetingDto;
import com.ruoyi.manage.dto.ManageMeetingParticipantsDto;
import com.ruoyi.manage.mapper.ManageMeetingMapper;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
index c275170..9f4ee07 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
@@ -10,7 +10,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.mapper.ManageRiskAssessmentResultsMapper;
import com.ruoyi.manage.pojo.ManageRiskAssessmentResults;
import com.ruoyi.manage.service.ManageRiskAssessmentResultsService;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
index 0f6d198..dbc7b6b 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
import com.ruoyi.process.dto.InconsistentDistributionDto;
import com.ruoyi.process.dto.InconsistentDistributionProportionDto;
import com.ruoyi.process.mapper.InconsistentDistributionMapper;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
index 82b850c..1d598c5 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
@@ -14,8 +14,8 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.XWPFDocumentUtils;
import com.ruoyi.process.utils.UserUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.process.dto.ProcessMethodVerifyDto;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
index fb9f07f..c594c5a 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
@@ -9,8 +9,8 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.XWPFDocumentUtils;
import com.ruoyi.process.dto.InspectionOrderDetail;
import com.ruoyi.process.dto.InspectionOrderExportDto;
import com.ruoyi.process.dto.ProcessOrderDto;
@@ -30,7 +30,6 @@
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* <p>
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
index bfd56ed..403b821 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
@@ -18,8 +18,8 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.XWPFDocumentUtils;
import com.ruoyi.process.dto.QualityMonitorDetailsEvaluateDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.excel.QualityMonitorDetailsUpload;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index 1e5091a..ee4dbe2 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -18,8 +18,8 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.basic.util.XWPFDocumentUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.process.dto.QualitySuperviseDetailsAccordingDto;
import com.ruoyi.process.dto.QualitySuperviseDetailsCorrectDto;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java b/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java
similarity index 98%
rename from inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
rename to inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java
index f3657e4..fc15a45 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.pojo;
+package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java b/inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java
similarity index 99%
rename from inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java
rename to inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java
index 9343a26..482f920 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java
+++ b/inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ruoyi.inspect.util;
+package com.ruoyi.basic.util;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.exception.RenderException;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java b/inspect-server/src/main/java/com/ruoyi/basic/util/XWPFDocumentUtils.java
similarity index 99%
rename from inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java
rename to inspect-server/src/main/java/com/ruoyi/basic/util/XWPFDocumentUtils.java
index 386c987..672cb3c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java
+++ b/inspect-server/src/main/java/com/ruoyi/basic/util/XWPFDocumentUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.util;
+package com.ruoyi.basic.util;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import org.apache.poi.xwpf.usermodel.*;
--
Gitblit v1.9.3