原始记录模版修改

zss

2025-03-04 c79f68a2a71cc8cc181525d233ef419745ee3d27

原始记录模版修改

 basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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.*;

 basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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));
    }
}

 basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/dto/CopyStandardProductListDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/dto/FactoryDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.dto;
package com.ruoyi.basic.dto;

import lombok.Data;


 basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/dto/InsSampleReceiveDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/dto/LaboratoryDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.dto;
package com.ruoyi.basic.dto;

import lombok.Data;


 basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/dto/ModelDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.dto;
package com.ruoyi.basic.dto;

import lombok.Data;


 basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/dto/ProductDTO1.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.dto;
package com.ruoyi.basic.dto;

import lombok.Data;


 basic-server/src/main/java/com/ruoyi/basic/dto/ResetTreeDragDTO.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/dto/SampleDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.dto;
package com.ruoyi.basic.dto;

import lombok.Data;


 basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/dto/SampleTypeDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.dto;
package com.ruoyi.basic.dto;

import lombok.Data;


 basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/dto/TestItemDto.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.inspect.dto;
package com.ruoyi.basic.dto;

import lombok.Data;


 basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectListener.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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> {

 basic-server/src/main/java/com/ruoyi/basic/mapper/IfsInventoryQuantityMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/mapper/LaboratoryMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**

 basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**

 basic-server/src/main/java/com/ruoyi/basic/mapper/ProductPartMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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> {

 basic-server/src/main/java/com/ruoyi/basic/mapper/ProductSupplierDensityMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**

 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListSupplierAskMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**

 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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);
}



 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**

 basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectPartMapper.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/InsSample1.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/Product.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/ProductPart.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/ProductSupplierDensity.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/Seal.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethod.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethodList.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTree.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObject.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObjectPart.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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> {
    //查询资质明细列表

 basic-server/src/main/java/com/ruoyi/basic/service/LaboratoryService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/service/ProductPartService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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> {


 basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/service/ProductSupplierDensityService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**
 * äº§å“åŽ‚家密度绑定表

 basic-server/src/main/java/com/ruoyi/basic/service/SealService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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

 basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListSupplierAskService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/service/StandardTemplateService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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);
}

 basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/StructureItemParameterService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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);

 basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectPartService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**
 * æ£€éªŒå¯¹è±¡é›¶ä»¶è¡¨

 basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectService.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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

 basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**

 basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 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 {
}

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 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 é’ˆå¯¹è¡¨ã€standard_template(标准模板)】的数据库操作Service实现
* @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);
    }
}

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;


 basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectPartServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/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;

/**

 basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListService2Impl.java

ÎļþÒÑɾ³ý

 basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.java

ÎļþÒÑɾ³ý

 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,

 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,

 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,

 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,

 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>

 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>

 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}

 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

 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,

 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}

 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>



 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)

 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>

 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,

 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>

 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;

 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;

 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;

 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;

 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;

 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;

 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;

 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;

 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;

 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>

 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;

 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;

 inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java

ÎļþÃû´Ó inspect-server/src/main/java/com/ruoyi/inspect/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;

 inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java

ÎļþÃû´Ó inspect-server/src/main/java/com/ruoyi/inspect/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;

 inspect-server/src/main/java/com/ruoyi/basic/util/XWPFDocumentUtils.java

ÎļþÃû´Ó inspect-server/src/main/java/com/ruoyi/inspect/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.*;