标准功能搬迁

zss

2025-03-05 578bfcb3f58c5458d2c60fe37c3e56ebcda98e18

标准功能搬迁

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

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

import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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 com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.framework.exception.ErrorException;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -60,8 +62,8 @@
    private StandardTemplateService standardTemplateService;

    @ApiOperation(value = "获取项目检验参数列表")
    @PostMapping("/selectItemParameterList")
    public Result selectItemParameterList(Page page,StructureItemParameter itemParameter) throws Exception {
    @GetMapping("/selectItemParameterList")
    public Result selectItemParameterList(Page page, StructureItemParameter itemParameter) throws Exception {
        return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
    }

@@ -72,7 +74,7 @@
    }

    @ApiOperation(value = "删除项目检验参数")
    @PostMapping("/delItemParameter")
    @DeleteMapping("/delItemParameter")
    public Result<?> delItemParameter(Integer id) {
        return Result.success(capacityScopeService.delItemParameter(id));
    }
@@ -84,8 +86,8 @@
    }

    @ApiOperation(value = "获取检验对象")
    @PostMapping("/selectTestObjectList")
    public Result selectTestObjectList(Page page,PageTestObjectDto pageTestObjectDto) throws Exception {
    @GetMapping("/selectTestObjectList")
    public Result selectTestObjectList(Page page, PageTestObjectDto pageTestObjectDto) throws Exception {
        return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
    }

@@ -96,7 +98,7 @@
    }

    @ApiOperation(value = "删除检验对象")
    @PostMapping("/delTestObject")
    @DeleteMapping("/delTestObject")
    public Result<?> delTestObject(Integer id) {
        return Result.success(capacityScopeService.delTestObject(id));
    }
@@ -113,15 +115,27 @@
        return Result.success(capacityScopeService.selectTestObjectByName());
    }

    @ApiOperation(value = "获取检验项和子项")
    @GetMapping("/selectTestInspectionItem")
    public Result selectTestObjectInspectionItem(String specimenName) {
        return Result.success(structureItemParameterService.selectTestObjectInspectionItem(specimenName));
    }

    @ApiOperation(value = "获取检验项和子项")
    @GetMapping("/selectTestInspectionItemSub")
    public Result selectTestInspectionItemSub(String inspectionItemSubclass) {
        return Result.success(structureItemParameterService.selectTestInspectionItemSub(inspectionItemSubclass));
    }

    @ApiOperation(value = "设备里面选择检验项目(树形结构)")
    @PostMapping("/getInsProduction")
    @GetMapping("/getInsProduction")
    public Result getInsProduction() {
        return Result.success(capacityScopeService.getInsProduction());
    }

    @ApiOperation(value = "维护检验对象的产品")
    @PostMapping("/selectProductListByObjectId")
    public Result selectProductListByObjectId(Page page,ProductDTO1 productDTO) throws Exception {
    @GetMapping("/selectProductListByObjectId")
    public Result selectProductListByObjectId(Page page, ProductDTO1 productDTO) throws Exception {
        return Result.success(productService.selectProductListByObjectId(page, productDTO));
    }

@@ -138,7 +152,7 @@
    }

    @ApiOperation(value = "删除产品")
    @PostMapping("/delProduct")
    @DeleteMapping("/delProduct")
    public Result delProduct(Integer id) {
        return Result.success(productService.delProduct(id));
    }
@@ -149,11 +163,9 @@
        return Result.success(capacityScopeService.getItemTree());
    }


    @ApiOperation(value = "装备导入检验项目")
    @PostMapping("/importEquipData")
    @Transactional
    public Result importEquipData(@RequestParam("file") MultipartFile file) throws Exception {
    @ApiOperation(value = "导入检验项目")
    @PostMapping("/importData")
    public Result importData(@RequestParam("file") MultipartFile file) throws Exception {
        InputStream inputStream = file.getInputStream();
        List<StructureItemParameter> lists = new ArrayList<>();
        AtomicReference<String> sample = new AtomicReference<>();
@@ -163,20 +175,18 @@
            }
            if (l >= 1) {
                StructureItemParameter str = new StructureItemParameter();
                // æµ‹è¯•å¯¹è±¡
                if (list1.get(1) == null) {
                    str.setSample(null);
                } else {
                    String brand = (String) list1.get(1);
                    StringBuilder builder = new StringBuilder();
                    builder.append("[");
                    // äº§å“
                    if (ObjectUtil.isNotEmpty(list1.get(2))) {
                        String production = (String) list1.get(2);
                        if (!production.contains("；")) {
                        if (!production.contains("、")) {
                            builder.append(String.format("[\"%s\",\"%s\"]", brand, production));
                        } else {
                            Arrays.stream(production.split("；")).forEach(item -> {
                            Arrays.stream(production.split("、")).forEach(item -> {
                                builder.append(String.format("[\"%s\",\"%s\"],", brand, item));
                            });
                            builder.deleteCharAt(builder.length() - 1);
@@ -189,63 +199,54 @@
                    builder.append("]");
                    str.setSample(builder.toString());
                }
                // æ£€éªŒé¡¹
                str.setInspectionItem(list1.get(4).toString().trim());
                // æ£€éªŒé¡¹è‹±æ–‡
                str.setInspectionItem(list1.get(4).toString());
                if (list1.get(5) != null) {
                    str.setInspectionItemEn(list1.get(5).toString());
                }
                // æ£€éªŒå­é¡¹
                if (list1.get(6) == null) {
                    str.setInspectionItemSubclass(null);
                } else {
                    str.setInspectionItemSubclass(list1.get(6).toString().trim());
                    str.setInspectionItemSubclass(list1.get(6).toString());
                }
                // æ£€éªŒå­é¡¹è‹±æ–‡
                if (list1.get(7) == null) {
                    str.setInspectionItemSubclassEn(null);
                } else {
                    str.setInspectionItemSubclassEn(String.valueOf(list1.get(7).toString()));
                }
                // æ£€éªŒé¡¹åˆ†ç±»
                if (list1.get(22) != null && list1.get(22) != "") {
                    str.setInspectionItemClass(list1.get(22).toString().trim());
                StructureItemParameter db_str;
                if (StringUtils.isEmpty(str.getInspectionItemSubclass())) {
                    // æ¯”较两个条件
                    try {
                        db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
                                .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                                .eq(StructureItemParameter::getSample, str.getSample())
                                .last("limit 1")
                        );
                    } catch (Exception e) {
                        throw new ErrorException("重复查询：" + str.getInspectionItem());
                    }
                } else {
                    str.setInspectionItemClass(null);
                    try {
                        db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
                                .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                                .eq(StructureItemParameter::getSample, str.getSample())
                                .eq(StructureItemParameter::getInspectionItemSubclass, str.getInspectionItemSubclass())
                                .last("limit 1")
                        );
                    } catch (Exception e) {
                        throw new ErrorException("重复查询：" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
                    }
                }
                // æ£€éªŒé¡¹åˆ†ç±»è‹±æ–‡
                if (list1.get(23) != null && list1.get(23) != "") {
                    str.setInspectionItemClassEn(list1.get(23) + "");
                } else {
                    str.setInspectionItemClassEn(null);
                }

                LambdaQueryWrapper<StructureItemParameter> wrapper = Wrappers.lambdaQuery(StructureItemParameter.class)
                        .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                        .eq(StructureItemParameter::getSample, str.getSample())

                        .last("limit 1");
                // åˆ¤æ–­æ˜¯å¦æœ‰æ£€éªŒé¡¹ç±»åž‹
                if (ObjectUtils.isNotEmpty(str.getInspectionItemClass())) {
                    wrapper.eq(StructureItemParameter::getInspectionItemClass, str.getInspectionItemClass());
                }

                // åˆ¤æ–­æ˜¯å¦æœ‰æ£€éªŒå­é¡¹
                if (ObjectUtils.isNotEmpty(str.getInspectionItemSubclass())) {
                    wrapper.eq(StructureItemParameter::getInspectionItemSubclass, str.getInspectionItemSubclass());
                }
                StructureItemParameter db_str = structureItemParameterService.getOne(wrapper);
                if (ObjectUtils.isNotEmpty(db_str)) {
                    str.setId(db_str.getId());
                }
                // æ–¹æ³•åç§°
                if (list1.get(8) == null) {
                    str.setMethod(null);
                } else {
                    StringBuffer buffer = new StringBuffer();
                    String input = list1.get(8).toString();
                    buffer.append("[");
                    String[] values = input.split("；");
                    String[] values = input.split("、");
                    for (String value : values) {
                        buffer.append("\"").append(value.trim()).append("\",");
                    }
@@ -253,55 +254,53 @@
                    buffer.append("]");
                    str.setMethod(buffer.toString());
                }
                // è¯•éªŒå®¤

                if (list1.get(9) == null) {
                    str.setSonLaboratory(null);
                } else {
                    str.setSonLaboratory(list1.get(9).toString());
                }
                // è®¡é‡å•ä½
                if (list1.get(10) == null) {
                    str.setUnit(null);
                } else {
                    str.setUnit(list1.get(10).toString());
                }
                // è¦æ±‚值

                if (list1.get(11) == null) {
                    str.setAskTell(null);
                } else {
                    str.setAskTell(list1.get(11).toString());
                }
                // è¦æ±‚描述

                if (list1.get(12) == null) {
                    str.setAsk(null);
                } else {
                    str.setAsk(list1.get(12).toString());
                }
                // å•ä»·

                if (list1.get(13) == null) {
                    str.setPrice(null);
                } else {
                    str.setPrice(list1.get(13) + "");
                }
                // å·¥æ—¶ç³»æ•°

                if (list1.get(14) == null) {
                    str.setManHour(null);
                } else {
                    str.setManHour(Double.valueOf(list1.get(14).toString()));
                }
                // å·¥æ—¶åˆ†ç»„

                if (list1.get(15) == null) {
                    str.setManHourGroup(null);
                } else {
                    str.setManHourGroup(list1.get(15).toString());
                }
                // é¢„计完成时间

                if (list1.get(16) == null) {
                    str.setManDay(null);
                } else {
                    str.setManDay(Integer.valueOf(list1.get(16).toString()));
                }
                // æ•°æ®ç±»åž‹
                String jy;
                if (list1.get(17).toString().equals("非采集类型")) {
                    jy = "0";
@@ -309,28 +308,24 @@
                    jy = "1";
                }
                str.setInspectionItemType(jy);
                // æ£€éªŒé¡¹ç±»åž‹
                String validateValueType = list1.get(18).toString();
                if (ObjectUtils.isNotEmpty(validateValueType)) {
                if (StringUtils.isNotBlank(validateValueType)) {
                    List<SysDictData> enums = dictTypeService.selectDictDataByName("检验值类型")
                            .stream().filter(sysDictData -> sysDictData.getDictLabel().equals(validateValueType)).collect(Collectors.toList());
                    str.setInspectionValueType(enums.get(0).getDictValue());
                }
                int bsm;
                //特殊标识
                if (list1.get(19).toString().equals("否")) {
                    bsm = 0;
                } else {
                    bsm = 1;
                }
                str.setBsm(bsm + "");
                // æ•°å­—å­—å…¸
                if (list1.get(20) != null) {
                    str.setDic(list1.get(20) + "");
                } else {
                    str.setDic(null);
                }
                // åŽŸå§‹è®°å½•æ¨¡æ¿
                StandardTemplate standTempIdByName = standardTemplateService.getStandTempIdByName(String.valueOf(list1.get(21)));
                if (standTempIdByName != null) {
                    str.setTemplateId(standTempIdByName.getId());
@@ -338,48 +333,42 @@
                    str.setTemplateId(null);
                }
                try {
                    if (list1.get(22) != null && list1.get(22) != "") {
                        str.setInspectionItemClass(list1.get(22) + "");
                    } else {
                        str.setInspectionItemClass(null);
                    }
                } catch (Exception e) {
                }
                try {
                    if (list1.get(23) != null && list1.get(23) != "") {
                        str.setInspectionItemClassEn(list1.get(23) + "");
                    } else {
                        str.setInspectionItemClassEn(null);
                    }
                } catch (Exception e) {
                }
                try {
                    if (list1.get(24) != null) {
                        str.setLaboratory(list1.get(24) + "");
                    }
                } catch (Exception e) {
                }

                // æ¡ä»¶
                if (list1.get(25) == null) {
                    str.setRadiusList(null);
                } else {
                    StringBuffer buffer = new StringBuffer();
                    String input = list1.get(25).toString();
                    buffer.append("[");
                    String[] values = input.split("；");
                    for (String value : values) {
                        buffer.append("\"").append(value.trim()).append("\",");
                    }
                    buffer.deleteCharAt(buffer.length() - 1);
                    buffer.append("]");
                    str.setRadiusList(buffer.toString());
                }
                // æ”¶è´¹æ ‡å‡†
                if (list1.get(26) == null) {
                    str.setRates(null);
                } else {
                    str.setRates(list1.get(26) + "");
                }

                lists.add(str);
            }
        });
//        structureItemParameterService.removeNoSample(sample.get());
        structureItemParameterService.removeNoSample(sample.get());
        // å¦‚果数据库里面的数据存在那么就执行更新拷贝操作
        try {
            structureItemParameterService.saveOrUpdateBatch(lists);
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("服务端报错");
            throw new RuntimeException("服务端报错啦!!!");
        }
        return Result.success();
    }


    @ApiOperation(value = "导入检验对象")
    @PostMapping("/importExcel")
    public Result importExcel(@RequestParam("file") MultipartFile file) {

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.Certification;
import com.ruoyi.basic.service.CertificationService;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.pojo.Certification;
import com.ruoyi.inspect.service.CertificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@Api(tags = "资质说明")
@AllArgsConstructor
@@ -23,8 +20,8 @@


    @ApiOperation(value = "查询资质明细列表")
    @PostMapping("/getCertificationDetail")
    public Result getCertificationDetail(Page page,Certification certification) {
    @GetMapping("/getCertificationDetail")
    public Result getCertificationDetail(Page page, Certification certification) {
        return Result.success(certificationService.getCertificationDetail(page, certification));
    }

@@ -34,7 +31,7 @@
        return Result.success(certificationService.addCertificationDetail(certification));
    }
    @ApiOperation(value = "删除资质明细列表")
    @PostMapping("/delCertificationDetail")
    @DeleteMapping("/delCertificationDetail")
    public Result<?> delCertificationDetail( String ids) {
        return Result.success(certificationService.delCertificationDetail(ids));
    }

 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.basic.pojo.Laboratory;
import com.ruoyi.basic.service.LaboratoryService;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.pojo.Laboratory;
import com.ruoyi.inspect.service.LaboratoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +15,6 @@
 * å®žéªŒå®¤ç®¡ç†(LaboratoryController)表控制层
 */
@Api(tags = "场所或设施")

@RestController
@RequestMapping("/laboratoryScope")
public class LaboratoryController {
@@ -24,8 +23,8 @@
    private LaboratoryService laboratoryService;

    @ApiOperation(value = "查询实验室管理列表")
    @PostMapping("/selectItemParameter")
    public Result selectItemParameter(Page page ,Laboratory itemParameter) {
    @GetMapping("/selectItemParameter")
    public Result selectItemParameter(Page page , Laboratory itemParameter) {
        return Result.success(laboratoryService.selectItemParameter(page, itemParameter));
    }

@@ -36,7 +35,7 @@
    }

    @ApiOperation(value = "删除实验室参数")
    @PostMapping("/delParameter")
    @DeleteMapping("/delParameter")
    public Result<?> delParameter(Integer id) {
        return Result.success(laboratoryService.delParameter(id));
    }

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

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/controller/SealController.java ÐÞ¸Ä
@@ -1,16 +1,13 @@
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;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
@@ -41,7 +38,7 @@

    }
    @ApiOperation(value="查询印章列表")
    @PostMapping("/selectSeal")
    @GetMapping("/selectSeal")
    public  Result selectSeal(Page page,Seal seal) {
        return Result.success(sealService.selectSeal(page,seal));
    }

 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.basic.pojo.StandardMethod;
import com.ruoyi.basic.service.StandardMethodService;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.pojo.StandardMethod;
import com.ruoyi.inspect.service.StandardMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -21,8 +21,8 @@
    private StandardMethodService standardMethodService;

    @ApiOperation(value = "获取标准方法列表")
    @PostMapping("/selectStandardMethodList")
    public Result selectStandardMethodList(Page page,StandardMethod standardMethod) throws Exception {
    @GetMapping("/selectStandardMethodList")
    public Result selectStandardMethodList(Page page, StandardMethod standardMethod) throws Exception {
        return Result.success(standardMethodService.selectStandardMethodList(page, standardMethod));
    }

@@ -39,7 +39,7 @@
    }

    @ApiOperation(value = "删除标准方法")
    @PostMapping("/delStandardMethod")
    @DeleteMapping("/delStandardMethod")
    public Result<?> delStandardMethod(Integer id) {
        return Result.success(standardMethodService.delStandardMethod(id));
    }

 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.basic.pojo.StandardTemplate;
import com.ruoyi.basic.service.StandardTemplateService;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.pojo.StandardTemplate;
import com.ruoyi.inspect.service.StandardTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -19,7 +19,7 @@

    @ApiOperation(value = "获取原始记录模板列表")
    @GetMapping("/selectStandardTemplatePageList")
    public Result selectStandardTemplatePageList(Page page,StandardTemplate standardTemplate) throws Exception {
    public Result selectStandardTemplatePageList(Page page, StandardTemplate standardTemplate) throws Exception {
        return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
    }


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,190 @@
package com.ruoyi.basic.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.basic.pojo.InsSample1;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardTreeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.util.Map;

@RestController
@AllArgsConstructor
@RequestMapping("/standardTree")
@Api(tags = "标准库")
public class StandardTreeController {

    private StandardTreeService standardTreeService;

    private StandardMethodListService standardMethodListService;

    private StandardProductListService standardProductListService;

    @ApiOperation(value = "查看标准库列表")
    @GetMapping("/selectStandardTreeList")
    public Result selectStandardTreeList() {
        return Result.success(standardTreeService.selectStandardTreeList());
    }

    @ApiOperation(value = "获取标准树(检验下单)")
    @GetMapping("/selectStandardTreeList2")
    public Result selectStandardTreeList2() {
        return Result.success(standardTreeService.selectStandardTreeList());
    }

    @ApiOperation(value = "添加标准树")
    @PostMapping("/addStandardTree")
    public Result addStandardTree(@RequestBody StandardTree standardTree) {
        return Result.success(standardTreeService.addStandardTree(standardTree));
    }

    @ApiOperation(value = "给标准树添加检验标准")
    @PostMapping("/addStandardMethodList")
    public Result addStandardMethodList(@RequestBody Map<String,Object> map) {
        Integer standardId =(Integer) map.get("standardId");
        String tree =(String) map.get("tree");
        return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
    }

    @ApiOperation(value = "根据标准树进行标准查询")
    @GetMapping("/selectsStandardMethodByFLSSM")
    public Result selectsStandardMethodByFLSSM(String tree) {
        return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
    }

    @ApiOperation(value = "修改标准库中的内容")
    @PostMapping("/upStandardProductList")
    public Result upStandardProductList(@RequestBody Map<String, String> map) {
        String str = map.get("str");
        StandardProductList list = JSON.parseObject(str, StandardProductList.class);
        return Result.success(standardProductListService.upStandardProductList(list));
    }

    @ApiOperation(value = "删除标准树下的检验标准")
    @DeleteMapping("/delStandardMethodByFLSSM")
    public Result delStandardMethodByFLSSM(Integer id) {
        return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
    }

    @ApiOperation(value = "删除标准树下的检验项目")
    @DeleteMapping("/delStandardProductByIds")
    public Result delStandardProductByIds(String ids) {
        JSONArray lists = JSON.parseArray(ids);
        return Result.success(standardProductListService.delStandardProduct(lists));
    }

    @ApiOperation(value = "新增标准树下的检验项目")
    @PostMapping("/addStandardProduct")
    public Result addStandardProduct(@RequestBody Map<String,Object> map) {
        String ids =(String) map.get("ids");
        String tree =(String) map.get("tree");
        return Result.success(standardTreeService.addStandardProduct(ids, tree));
    }

    @ApiOperation(value = "删除标准树的层级")
    @DeleteMapping("/delStandardTree")
    public Result delStandardTree(String tree) {
        return Result.success(standardTreeService.delStandardTree(tree));
    }

    @ApiOperation(value = "通过标准树查询对应的检验项目")
    @GetMapping("/selectStandardProductList")
    public Result selectStandardProductList( InsSample1 insSample) {
        return Result.success(standardProductListService.selectStandardProductList(insSample));
    }

    @ApiOperation(value = "通过检验标准查询检验项目")
    @GetMapping("/selectStandardProductListByMethodId")
    public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
    }

    @ApiOperation(value = "批量编辑查询检验项目")
    @GetMapping("/selectStandardProductByMethodId")
    public Result selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items) {
        return Result.success(standardProductListService.selectStandardProductByMethodId(id, tree, page, laboratory, item, items));
    }

    @ApiOperation(value = "批量编辑查询所有检验项目和检验子项枚举")
    @GetMapping("/selectStandardProductEnumByMethodId")
    public Result selectStandardProductEnumByMethodId(Integer id, String tree, String item) {
        return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree, item));
    }

    @ApiOperation(value = "获取标准树下标准方法枚举")
    @GetMapping("/selectStandardMethodEnum")
    public Result selectStandardMethodEnum() {
        return Result.success(standardMethodListService.selectStandardMethodEnum());
    }

    @ApiOperation(value = "获取产品架构")
    @GetMapping("/getStandardTree2")
    public Result getStandardTree2() {
        return Result.success(standardTreeService.getStandardTree2());
    }

    @ApiOperation(value = "批量修改项目内容")
    @PostMapping("/upStandardProducts")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "standardProductList", dataTypeClass = StandardProductList.class),
            @ApiImplicitParam(name = "ids", dataTypeClass = Integer.class)
    })
    public Result upStandardProducts(@RequestBody Map<String, Object> product) {
        return Result.success(standardTreeService.upStandardProducts(product));
    }

    @GetMapping("/getStandTreeBySampleType")
    @ApiOperation("仅获取光纤的型号")
    public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
        return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
    }

    @ApiOperation("导入标准库")
    @PostMapping("/inExcelOfTree/{isEquipment}")
    public Result inExcelOfTree(@RequestParam("file") MultipartFile file, @PathVariable("isEquipment") Boolean isEquipment) {
        if (!isEquipment) {
            standardTreeService.inExcelOfTree(file);
        } else {
            standardTreeService.importWorkstationExcel(file);
        }
        return Result.success();
    }

    @ApiOperation("重置标准库单价")
    @PostMapping("/resetTreeOfPrice")
    public Result resetTreeOfPrice(@RequestBody Map<String,Object> map) {
        Integer standardId =(Integer) map.get("standardId");
        String tree =(String) map.get("tree");
        standardTreeService.resetTreeOfPrice(tree, standardId);
        return Result.success();
    }

    @ApiOperation("重置标准库工时系数")
    @PostMapping("/resetTreeOfHour")
    public Result resetTreeOfHour(@RequestBody Map<String,Object> map) {
        Integer standardId =(Integer) map.get("standardId");
        String tree =(String) map.get("tree");
        standardTreeService.resetTreeOfHour(tree, standardId);
        return Result.success();
    }

    @ApiOperation("重置标准库要求描述和要求值")
    @PostMapping("/resetTreeOfAsk")
    public Result resetTreeOfAsk(@RequestBody Map<String,Object> map) {
        Integer standardId =(Integer) map.get("standardId");
        String tree =(String) map.get("tree");
        standardTreeService.resetTreeOfAsk(tree, standardId);
        return Result.success();
    }
}

 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/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;

@@ -19,7 +19,4 @@

    @ApiModelProperty(value = "更新人")
    private String updateUserName;

    @ApiModelProperty(value = "零件号")
    private String partNo;
}

 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/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;

@@ -12,11 +12,6 @@
    private String label;

    private String value;

    private String partNo;

    // æ ·å“è‹±æ–‡
    private String sampleEn;

    private List<ModelDto> children;


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.basic.dto;

import lombok.Data;

import java.util.List;

@Data
public class SampleTypeDto {

    private String code = "[3]";

    private String label;

    private String value;

    private List<SampleDto> children;

}

 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/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/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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.ruoyi.basic.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.vo.StandardProductVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€standard_product_list(标准树下的检验项目)】的数据库操作Mapper
* @createDate 2024-03-05 10:33:29
* @Entity com.ruoyi.basic.pojo.StandardProductList
*/
public interface StandardProductListMapper extends BaseMapper<StandardProductList> {

    IPage<StandardProductList> standardProductListIPage(@Param("id") Integer id, @Param("tree") String tree, IPage<StandardProductList> page, @Param("laboratory") String laboratory, @Param("insItem") String insItem, @Param("insItems") String insItems);

    StandardProductList getOne(@Param("standardMethodListId") Integer standardMethodListId, @Param("inspectionItem") String inspectionItem, @Param("sample") String sample, @Param("inspectionItemSubclass") String inspectionItemSubclass, @Param("model") String model, @Param("inspectionItemClass") String inspectionItemClass);

    List<StandardProductList> selectDetail(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("model") String model,@Param("sampleType") String sampleType,@Param("sample")String sample);

    List<StandardProductList> selectDetail2(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("tree") String tree);

    List<StandardProductVO> getStandardProductByInsProduct(
            @Param("laboratory") String laboratory,
            @Param("sampleType") String sampleType,
            @Param("sample") String sample,
            @Param("model") String model,
            @Param("inspectionItem") String inspectionItem,
            @Param("inspectionItemSubclass") String inspectionItemSubclass,
            @Param("sonLaboratory") String sonLaboratory,
            @Param("standardMethodListId") Integer standardMethodListId);
}





 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;

/**

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.StandardMethodList;
import com.ruoyi.inspect.pojo.StandardProductList;
import com.ruoyi.inspect.pojo.StandardTree;
import com.ruoyi.basic.dto.FactoryDto;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.SampleDto;
import com.ruoyi.basic.dto.SampleTypeDto;
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;
@@ -31,11 +34,11 @@

    List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees, String laboratory);

    List<StandardProductList> selectStandardProductListByTree3(String tree, String sample, String model, String trees, String laboratory);

    List<SampleTypeDto> getStandardTree2();

    List<SampleDto> getStandardTree3(String sampleType);


    String getLaboratory(String str);

@@ -44,8 +47,6 @@
    List<ProductDto> selectPList(String name);

    String selSample(String sample);

    List<FactoryDto> selectStandardTreeListByPartNo(@Param("partNo") String partNo);

}


 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;
@@ -26,5 +26,9 @@
    List<TestItemDto> getItemTree();

    int removeNoSample(@Param("sample") String sample);

    List<StructureItemParameter> selectItemParameterList1(@Param("specimenName") String specimenName);

    List<StructureItemParameter> selectItemParameterList2(@Param("inspectionItemSubclass") String inspectionItemSubclass);
}


 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;

/**
@@ -16,7 +16,7 @@
 */
public interface StructureTestObjectMapper extends BaseMapper<StructureTestObject> {

    IPage<PageTestObjectDto> selectTestObjectList(Page page, @Param("ew") QueryWrapper<PageTestObjectDto> ew, @Param("partNo") String partNo);
    IPage<PageTestObjectDto> selectTestObjectList(Page page, @Param("ew") QueryWrapper<PageTestObjectDto> ew);

}


 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/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/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;
@@ -100,12 +100,6 @@
    private String section;

    /**
     * åŒºé—´
     */
    @ApiModelProperty("芯数区间")
    private String cores;

    /**
     * æ–¹æ³•
     */
    @ApiModelProperty("方法列表")
@@ -194,28 +188,4 @@

    @ApiModelProperty(value = "检验项分类EN")
    private String inspectionItemClassEn;

    @ApiModelProperty(value = "条件")
    private String radius;

    @ApiModelProperty(value = "条件列表")
    private String radiusList;

    @ApiModelProperty(value = "收费标准(元/次)")
    private String rates;

    @ApiModelProperty(value = "索引顺序")
    private Integer sort;

    /**
     * å¯¼ä½“材质
     */
    @ApiModelProperty("导体材质")
    private String conductorMaterial;

    /**
     * å¯¼ä½“类型
     */
    @ApiModelProperty("导体类型")
    private String conductorType;
}

 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;
@@ -110,12 +110,6 @@

    @ApiModelProperty(value = "检验项分类EN")
    private String inspectionItemClassEn;

    @ApiModelProperty(value = "条件")
    private String radiusList;

    @ApiModelProperty(value = "收费标准(元/次)")
    private String rates;

}


 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;
@@ -50,14 +50,5 @@
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "排序")
    private Integer sort;

    //"对象类型, 1:原材料, 2:成品, 3:辅材"
    @ApiModelProperty(value = "对象类型")
    private String objectType;


}


 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/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/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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
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.basic.pojo.InsSample1;
import com.ruoyi.basic.pojo.StandardProductList;

import java.util.List;
import java.util.Map;

/**
 * @author Administrator
 * @description é’ˆå¯¹è¡¨ã€standard_product_list(标准树下的检验项目)】的数据库操作Service
 * @createDate 2024-03-05 10:33:29
 */
public interface StandardProductListService extends IService<StandardProductList> {

    int upStandardProductList(StandardProductList list);

    int delStandardProduct(JSONArray list);

    List<StandardProductList> selectStandardProductList(InsSample1 insSample);

    Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page);

    IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items);

    Map<String, List<?>> selectStandardProductEnumByMethodId(Integer id, String tree, String item);

}

 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/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;


 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;
@@ -17,7 +17,6 @@
public interface StandardTreeService extends IService<StandardTree> {

    List<FactoryDto> selectStandardTreeList();


    int addStandardTree(StandardTree standardTree);

@@ -40,13 +39,4 @@
    void resetTreeOfAsk(String tree, Integer standardId);

    void importWorkstationExcel(MultipartFile file);

    /**
     * æ ‡å‡†æ•°æŽ’序
     * @param list
     * @return
     */
    boolean updateTreeSort(List<FactoryDto> list);

    int updateStandardTree(StandardTree standardTree);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.ruoyi.basic.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.StructureItemParameter;

import java.util.List;

public interface StructureItemParameterService extends IService<StructureItemParameter> {
    void removeNoSample(String sample);

    List<StructureItemParameter> selectTestObjectInspectionItem(String specimenName);

    List<StructureItemParameter>  selectTestInspectionItemSub(String inspectionItemSubclass);
}

 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;
@@ -7,15 +7,15 @@
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.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.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.service.StandardProductListService;
import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

@@ -40,10 +40,6 @@
    private StructureTestObjectMapper structureTestObjectMapper;

    private ProductMapper productMapper;

    private StructureTestObjectPartMapper structureTestObjectPartMapper;

    private ProductPartMapper productPartMapper;

    private StandardProductListService standardProductListService;

@@ -77,9 +73,7 @@

    @Override
    public IPage<PageTestObjectDto> selectTestObjectList(Page page, PageTestObjectDto pageTestObjectDto) {
        String partNo = pageTestObjectDto.getPartNo();
        pageTestObjectDto.setPartNo(null);
        return structureTestObjectMapper.selectTestObjectList(page, QueryWrappers.queryWrappers(pageTestObjectDto),partNo);
        return structureTestObjectMapper.selectTestObjectList(page, QueryWrappers.queryWrappers(pageTestObjectDto));
    }

    @Override
@@ -94,17 +88,10 @@

    @Override
    public int delTestObject(Integer id) {
        // äº§å‡ºæ£€éªŒå¯¹è±¡äº§å“ç»´æŠ¤
        structureTestObjectPartMapper.delete(Wrappers.<StructureTestObjectPart>lambdaQuery()
                .eq(StructureTestObjectPart::getTestObjectId, id));

        // åˆ é™¤äº§å“ç»´æŠ¤çš„零件绑定
        List<Product> products = productMapper.selectList(Wrappers.<Product>lambdaQuery()
                .eq(Product::getObjectId, id));
        List<Integer> productIds = products.stream().map(Product::getId).collect(Collectors.toList());
        productPartMapper.delete(Wrappers.<ProductPart>lambdaQuery()
                .in(ProductPart::getProductId, productIds));

        // åˆ é™¤äº§å“ç»´æŠ¤
        productMapper.delete(Wrappers.<Product>lambdaQuery()
                .in(Product::getId, productIds));

 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.basic.mapper.CertificationMapper;
import com.ruoyi.basic.pojo.Certification;
import com.ruoyi.basic.service.CertificationService;
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 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.basic.mapper.LaboratoryMapper;
import com.ruoyi.basic.pojo.Laboratory;
import com.ruoyi.basic.service.LaboratoryService;
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 lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;


 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;
@@ -8,19 +8,18 @@
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.basic.dto.ProductDTO1;
import com.ruoyi.basic.excel.StructureTestObjectData;
import com.ruoyi.basic.mapper.ProductMapper;
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.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.service.StandardProductListService;
import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,15 +34,13 @@
@Service
@AllArgsConstructor
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product>
    implements ProductService{
    implements ProductService {

    private ProductMapper productMapper;

    private LaboratoryService laboratoryService;

    private StructureTestObjectMapper structureTestObjectMapper;

    private ProductPartMapper productPartMapper;

    private StandardProductListService standardProductListService;

@@ -122,10 +119,6 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int delProduct(Integer id) {
        // åˆ é™¤é›¶ä»¶ç»‘定
        productPartMapper.delete(Wrappers.<ProductPart>lambdaQuery()
                .eq(ProductPart::getProductId, id));

        return productMapper.deleteById(id);
    }


 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;

@@ -23,7 +23,7 @@
@Service
@AllArgsConstructor
public class StandardMethodListServiceImpl extends ServiceImpl<StandardMethodListMapper, StandardMethodList>
    implements StandardMethodListService{
    implements StandardMethodListService {

    private StandardMethodListMapper standardMethodListMapper;


 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;
@@ -7,16 +7,16 @@
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.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.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.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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,351 @@
package com.ruoyi.basic.service.impl;

import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.mapper.StandardProductListMapper;
import com.ruoyi.basic.mapper.StandardTreeMapper;
import com.ruoyi.basic.pojo.InsSample1;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.service.StandardProductListService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
 * @author Administrator
 * @description é’ˆå¯¹è¡¨ã€standard_product_list(标准树下的检验项目)】的数据库操作Service实现
 * @createDate 2024-03-05 10:33:29
 */
@Service
@AllArgsConstructor
public class StandardProductListServiceImpl extends ServiceImpl<StandardProductListMapper, StandardProductList>
        implements StandardProductListService {

    private StandardProductListMapper standardProductListMapper;

    private StandardTreeMapper standardTreeMapper;


    @Override
    public int upStandardProductList(StandardProductList list) {
        return standardProductListMapper.updateById(list);
    }

    @Override
    public int delStandardProduct(JSONArray list) {
        return standardProductListMapper.deleteBatchIds(list);
    }

    @Override
    public List<StandardProductList> selectStandardProductList(InsSample1 insSample) {
        String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】
        String[] splits = insSample.getFactory().split(" - ");
        List<StandardProductList> list = new ArrayList<>();
        if(splits.length<4){
            list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0],"","");
        }else {
            list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0],splits[2],splits[3]);
        }
        if (list.isEmpty()) {
            if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
                return null;
            }
            String[] split = insSample.getFactory().split(" - ");
            String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
            list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
            if (list.isEmpty()) {
                String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3];
                list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
                if(list.isEmpty()) {
                    String tree2 = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - ";
                    list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree2);
                }
            }
        }
        String[] split1 = insSample.getFactory().split(" - ");
        //判断长度
        if (split1.length > 4) {
            if (ObjectUtils.isNotEmpty(split1[3])) {
                list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),split1[3])).collect(Collectors.toList());
            }else if (split1[3].isEmpty()) {
                list = list.stream().filter(list1 ->  Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSampleType(),split1[2])).collect(Collectors.toList());
            }
        }
        list = list.stream().filter(a -> {
            try {
                if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
                    List<String> sections = JSON.parseArray(a.getSection(), String.class);
                    List<String> asks = JSON.parseArray(a.getAsk(), String.class);
                    List<String> tells = JSON.parseArray(a.getTell(), String.class);
                    List<String> manHours = JSON.parseArray(a.getManHour(), String.class);
                    List<String> prices = JSON.parseArray(a.getPrice(), String.class);
                    boolean isIf;
                    for (int i = 0; i < sections.size(); i++) {
                        if (Objects.equals(a.getBsm(), "1")) {
                            return true;
                        } else {
                            if (sections.get(i).contains("&")) {
                                String[] split = sections.get(i).split("&");
                                isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
                            } else {
                                isIf = getIsIf(sections.get(i), models[1]);
                            }
                            if (isIf) {
                                a.setSection(sections.get(i));
                                a.setAsk(asks.get(i));
                                a.setTell(tells.get(i));
                                a.setPrice(prices.get(i));
                                a.setManHour(manHours.get(i));
                                return true;
                            }
                        }
                    }
                    return false;
                }
            } catch (Exception ignored) {
                return false;
            }
            return true;
        }).collect(Collectors.toList());
        return list;
    }

    private boolean getIsIf(String str, String model) {
        Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
        BigDecimal modelNumber = BigDecimal.ZERO;
        String model2 = "";
        while (matcher.find()) {
            model2 += matcher.group();
            modelNumber = BigDecimal.valueOf(Double.parseDouble(model2));
            break;
        }
        Double param = matchNumber(str);
        if (str.contains("≥") || str.contains(">=")) {
//            String param = str.replace("≥", "").replace(">=", "");
            return modelNumber.compareTo(new BigDecimal(param)) > -1;
        } else if (str.contains("≤") || str.contains("<=")) {
//            String param = str.replace("≤", "").replace("<=", "");
            return modelNumber.compareTo(new BigDecimal(param)) < 1;
        } else if (str.contains(">") || str.contains("＞")) {
//            String param = str.replace(">", "").replace("＞", "");
            return modelNumber.compareTo(new BigDecimal(param)) > 0;
        } else if (str.contains("<") || str.contains("＜")) {
//            String param = str.replace("<", "").replace("＜", "");
            return modelNumber.compareTo(new BigDecimal(param)) < 0;
        } else if (str.contains("=")) {
//            String param = str.replace("=", "");
            return modelNumber.compareTo(new BigDecimal(param)) == 0;
        }
        return false;
    }
    public Double matchNumber(String str) {
        String regex = "[>＜≥≤=]?[>=<]?\\s*(-?\\d+(\\.\\d+)?)";
        // ç¼–译正则表达式
        Matcher matcher = Pattern.compile(regex).matcher(str);
        List<Double> numbers = new ArrayList<>();
        while(matcher.find()) {
            if(matcher.group(1) != null) {
                numbers.add(Double.parseDouble(matcher.group(1)));
            }
        }
        if(numbers.size() > 0) {
            return numbers.get(0);
        }
        return 0.00;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
        String[] trees = tree.split(" - ");
//        try {
//            String tree1 = trees[2];
//        } catch (Exception e) {
//            throw new ErrorException("操作太快,系统传参错误!!!!");
//        }
        //list为根据条件查询的能力范围数据
        List<StandardProductList> list = new ArrayList<>();
        if (trees.length == 3) {
            List<StandardTree> treeList = new ArrayList<>();
            StandardTree standardTree = new StandardTree();
            standardTree.setFactory(trees[0]);
            standardTree.setLaboratory(trees[1]);
            standardTree.setSampleType(trees[2]);
            List<ProductDto> pList = standardTreeMapper.selectPList(trees[2]);
            if (pList.isEmpty() || pList.get(0) == null) {
                List<StandardTree> treeList1 = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
                if (treeList1.isEmpty()) {
                    treeList.add(standardTree);
                } else {
                    treeList.addAll(treeList1);
                }
            } else {
                for (ProductDto p : pList) {
                    standardTree.setSample(p.getName());
                    List<StandardTree> treeList1 = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, p.getName()));
                    if (treeList1.isEmpty()) {
                        treeList.add(JSON.parseObject(JSON.toJSONString(standardTree), StandardTree.class));
                    } else {
                        treeList.addAll(treeList1);
                    }
                }
            }
            for (StandardTree standardTree2 : treeList) {
                String tree2 = trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + standardTree2.getSample() + " - " + standardTree2.getModel();
                list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
                list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
            }
        }
        else if (trees.length == 4) {
            List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
            if (treeList.isEmpty()) {
                StandardTree standardTree = new StandardTree();
                standardTree.setFactory(trees[0]);
                standardTree.setLaboratory(trees[1]);
                standardTree.setSampleType(trees[2]);
                standardTree.setSample(trees[3]);
                treeList.add(standardTree);
            }
            for (StandardTree standardTree : treeList) {
                String str = tree + " - " + standardTree.getModel();
                list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
                list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
            }
        }
        else {
            list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
            list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
        }
        //标准库对应检验项数据
        List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
                .eq(StandardProductList::getStandardMethodListId, id)//标准方法id
                .eq(StandardProductList::getSampleType,trees[2])//样品大类
                .eq(trees.length>3,StandardProductList::getSample,trees.length>3?trees[3]:"")//样品
                .eq(trees.length>4,StandardProductList::getModel,trees.length>4?trees[4]:"")//型号
        );
        //处理数据
        //不能编辑的数据以能力范围为主，可编辑的数据以标准库为主
        for (StandardProductList sp : standardProductLists) {
            for (StandardProductList pl : list) {
                if(Objects.isNull(sp.getStructureItemParameterId())){
                    break;
                }
                pl.setFactory(sp.getFactory());
                pl.setSampleType(sp.getSampleType());
                pl.setStandardMethodListId(id);//标准方法id
                if(NumberUtil.equals(sp.getStructureItemParameterId(),pl.getStructureItemParameterId()) && (trees.length <= 4 || Objects.equals(sp.getModel(), pl.getModel()))){
                    pl.setId(sp.getId());
                    pl.setAsk(sp.getAsk());//要求值
                    pl.setTell(sp.getTell());//要求描述
                    pl.setManHour(sp.getManHour());//工时系数
                    pl.setManHourGroup(sp.getManHourGroup());//工时分组
                    pl.setPrice(sp.getPrice());//单价
                    pl.setTemplateId(sp.getTemplateId());//模板id
                    pl.setSection(sp.getSection());//区间
                    pl.setState(sp.getState());//勾选状态
                    pl.setMethodS(sp.getMethodS());//试验方法
                    pl.setMethodS(sp.getMethodS());//方法
                    pl.setTree(sp.getTree());//树形结构字符
                }
            }
        }
        //查询标准库对应的数据为空，证明是新加的标准，以能力范围为主
        if(standardProductLists.isEmpty()){
            list.forEach(l->{
                l.setStandardMethodListId(id);
                l.setFactory(org.apache.commons.lang3.StringUtils.isNotBlank(trees[0])?trees[0]:"");
                l.setSampleType(org.apache.commons.lang3.StringUtils.isNotBlank(trees[2])?trees[2]:"");
            });
        }
        //添加新加的项目
        list.stream().filter(l->Objects.isNull(l.getId())).forEach(this::save);
        Map<String, Object> map = new HashMap<>();
        list.sort((o1, o2) -> {
            String field1 = o1.getManHourGroup();
            String field2 = o2.getManHourGroup();

            boolean isEmpty1 = field1 == null || field1.isEmpty();
            boolean isEmpty2 = field2 == null || field2.isEmpty();

            if (isEmpty1 && isEmpty2) {
                return 0;
            } else if (isEmpty1) {
                return 1;
            } else if (isEmpty2) {
                return -1;
            } else {
                int num1 = extractNumber(field1);
                int num2 = extractNumber(field2);
                return Integer.compare(num1, num2);
            }
        });
        try {
            map.put("productList", list.subList((page - 1) * 50, page * 50));
        } catch (IndexOutOfBoundsException e) {
            map.put("productList", list.subList((page - 1) * 50, list.size()));
        }
        map.put("total", list.size());
        return map;
    }

    private int extractNumber(String s) {
        // ä»Žå­—符串中提取数字的逻辑，这里假设字段的格式是 "text<number>"
        String number = s;
        if (!s.matches("\\d+")) {
            number = s.replaceAll("\\D", "");
        }
        return Integer.parseInt(number);
    }

    @Override
    public IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items) {
        IPage<StandardProductList> iPage = new Page<>();
        iPage.setSize(100);
        iPage.setCurrent(page);
        return standardProductListMapper.standardProductListIPage(id, tree, iPage, laboratory, item, items);
    }

    @Override
    public Map<String, List<?>> selectStandardProductEnumByMethodId(Integer id, String tree, String item) {
        HashMap<String, List<?>> map = new HashMap<>();
        map.put("item", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
                .eq(StandardProductList::getStandardMethodListId, id)
                .like(StandardProductList::getTree, tree)
                .select(StandardProductList::getInspectionItem)
                .groupBy(StandardProductList::getInspectionItem)));
        if (ObjectUtils.isNotEmpty(item)) {
            map.put("items", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
                    .eq(StandardProductList::getStandardMethodListId, id)
                    .eq(StandardProductList::getInspectionItem, item)
                    .like(StandardProductList::getTree, tree)
                    .select(StandardProductList::getInspectionItemSubclass)
                    .groupBy(StandardProductList::getInspectionItemSubclass)));
        } else {
            map.put("items", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
                    .eq(StandardProductList::getStandardMethodListId, id)
                    .like(StandardProductList::getTree, tree)
                    .select(StandardProductList::getInspectionItemSubclass)
                    .groupBy(StandardProductList::getInspectionItemSubclass)));
        }
        return map;
    }
}





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

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.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.basic.mapper.StandardTemplateMapper;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.mapper.StandardTemplateMapper;
import com.ruoyi.inspect.pojo.StandardTemplate;
import com.ruoyi.inspect.service.StandardTemplateService;
import com.ruoyi.basic.service.StandardTemplateService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;


 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;
@@ -10,17 +10,18 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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 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.framework.exception.ErrorException;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
@@ -51,24 +52,17 @@

    private StandardProductListMapper standardProductListMapper;

    private StandardProductListService standardProductListService;

    private StandardTemplateService standardTemplateService;

    private StructureTestObjectService structureTestObjectService;


    @Override
    public List<FactoryDto> selectStandardTreeList() {
        List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeList();
        for (FactoryDto factoryDto : factoryDtos) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                laboratoryDto.getChildren().sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
                        - (o2.getSort() == null ? 0 : o2.getSort()));
                for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
//                    if (sampleTypeDto.getChildren().size() == 0) {
                        sampleTypeDto.getChildren().addAll(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
//                    }
                    if (sampleTypeDto.getChildren().size() == 0) {
                        sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
                    }
                }
            }
        }
@@ -80,19 +74,14 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addStandardTree(StandardTree standardTree) {
        LambdaQueryWrapper<StandardTree> wrapper = Wrappers.<StandardTree>lambdaQuery()
        StandardTree tree = standardTreeMapper.selectOne(Wrappers.<StandardTree>lambdaQuery()
                .eq(StandardTree::getFactory, standardTree.getFactory())
                .eq(StandardTree::getLaboratory, standardTree.getLaboratory())
                .eq(StandardTree::getSampleType, standardTree.getSampleType())
                .eq(StandardTree::getSample, standardTree.getSample())
                .eq(StandardTree::getModel, standardTree.getModel());
        if (StringUtils.isNotBlank(standardTree.getSample())) {
            wrapper.eq(StandardTree::getSample, standardTree.getSample());
        }

        StandardTree tree = standardTreeMapper.selectOne(wrapper);
                .eq(StandardTree::getModel, standardTree.getModel()));
        if (tree != null) {
            throw new BaseException("该型号已存在");
            throw new ErrorException("该型号已存在");
        }
        return standardTreeMapper.insert(standardTree);
    }
@@ -109,18 +98,6 @@
                    standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]).eq(StandardTree::getModel, trees[4]));
                }
                break;
            /*case 4:
                standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
                break;
            case 3:
                standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
                break;
            case 2:
                standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]));
                break;
            case 1:
                standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]));
                break;*/
        }
        return 1;
    }
@@ -166,10 +143,6 @@
        StandardProductList productList = JSON.parseObject(JSON.toJSONString(product.get("standardProductList")), StandardProductList.class);
        if (productList.getMethodS() != null) {
            standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids).like(StandardProductList::getMethod, productList.getMethodS()));
            return 1;
        }
        if (productList.getRadiusList() != null) {
            standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids).like(StandardProductList::getRadiusList, productList.getRadius()));
            return 1;
        }
        standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids));
@@ -442,70 +415,6 @@
    }

    @Override
    public boolean updateTreeSort(List<FactoryDto> list) {
        List<StructureTestObject> testObjects = new ArrayList<>();
        for (FactoryDto factoryDto : list) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                List<SampleTypeDto> children = laboratoryDto.getChildren();
                int sort = 0;
                // å¾ªçŽ¯ç¬¬ä¸‰å±‚
                for (SampleTypeDto child : children) {
                    StructureTestObject structureTestObject = new StructureTestObject();
                    structureTestObject.setSort(sort);
                    structureTestObject.setId(child.getSampleTypeId());
                    testObjects.add(structureTestObject);
                    sort++;
                }
            }
        }
        structureTestObjectService.updateBatchById(testObjects);

        return true;
    }

    /**
     * ä¿®æ”¹æ ‡å‡†æ•°
     * @param standardTree
     * @return
     */
    @Override
    public int updateStandardTree(StandardTree standardTree) {
        // ä¿®æ”¹åç§°åŒ¹é…çš„标准树下的检验项目
        // æŸ¥è¯¢æ‰€æœ‰å¯¹è±¡+名称的树

        List<StandardProductList> standardProductLists = standardProductListService.list(Wrappers.<StandardProductList>lambdaUpdate()
                .eq(StandardProductList::getSample, standardTree.getSample())
                .eq(StandardProductList::getSampleType, standardTree.getSampleType())
                .eq(StandardProductList::getModel, standardTree.getOldModel()));
        if (CollectionUtils.isNotEmpty(standardProductLists)) {
            for (StandardProductList standardProductList : standardProductLists) {
                // ä¿®æ”¹æ ·å“åç§°
                standardProductList.setModel(standardTree.getModel());
                // ä¿®æ”¹æ ‘名称
                // éœ€è¦æˆªå–第四级, é¿å…ä¸‰å››çº§åç§°ä¸€æ ·ä¿®æ”¹é”™è¯¯
                String[] trees = standardProductList.getTree().split(" - ");
                trees[4] = standardTree.getModel();
                List<String> list = CollUtil.newArrayList(trees);
                String newName = CollUtil.join(list, " - ");
                standardProductList.setTree(newName);
            }
            standardProductListService.updateBatchById(standardProductLists);
        }

        // ä¿®æ”¹æ ‡å‡†æ•°æ£€éªŒé¡¹ç›®
        LambdaUpdateWrapper<StandardTree> wrapper = Wrappers.<StandardTree>lambdaUpdate()
                .eq(StandardTree::getFactory, standardTree.getFactory())
                .eq(StandardTree::getLaboratory, standardTree.getLaboratory())
                .eq(StandardTree::getSampleType, standardTree.getSampleType())
                .eq(StandardTree::getModel, standardTree.getOldModel())
                .set(StandardTree::getModel, standardTree.getModel());
        if (StringUtils.isNotBlank(standardTree.getSample())) {
            wrapper.eq(StandardTree::getSample, standardTree.getSample());
        }
        return standardTreeMapper.update(null, wrapper);
    }

    @Override
    public void resetTreeOfPrice(String tree, Integer standardId) {
        standardProductListMapper.update(null, Wrappers.<StandardProductList>lambdaUpdate().like(StandardProductList::getTree, tree).eq(StandardProductList::getStandardMethodListId, standardId).set(StandardProductList::getPrice, null));
    }
@@ -521,9 +430,6 @@
                .set(StandardProductList::getAsk, null)
                .set(StandardProductList::getTell, null)
                .set(StandardProductList::getSection, null)
                .set(StandardProductList::getCores, null)
                .set(StandardProductList::getConductorMaterial, null)
                .set(StandardProductList::getConductorType, null)
                .set(StandardProductList::getPrice, null)
                .set(StandardProductList::getManHour, null));
    }

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.ruoyi.basic.service.impl;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;

import javax.annotation.Resource;
import java.util.List;

@Service
@AllArgsConstructor
public class StructureItemParameterServiceImpl extends ServiceImpl<StructureItemParameterMapper, StructureItemParameter> implements StructureItemParameterService {

    @Resource
    private StructureItemParameterMapper structureItemParameterMapper;

    @Override
    public void removeNoSample(String sample) {
        structureItemParameterMapper.removeNoSample("\""+sample+"\"");
    }

    @Override
    public List<StructureItemParameter> selectTestObjectInspectionItem(String specimenName) {
        return structureItemParameterMapper.selectItemParameterList1(specimenName);
    }

    @Override
    public List<StructureItemParameter> selectTestInspectionItemSub(String inspectionItemSubclass) {
        return  structureItemParameterMapper.selectItemParameterList2(inspectionItemSubclass);
    }
}

 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/basic/vo/StandardProductVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.basic.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * æŸ¥è¯¢æ ‡å‡†åº“配置工时返回对象
 */
@Data
public class StandardProductVO implements Serializable {

    @ApiModelProperty(value = "工时(H)")
    private String manHour;

    @ApiModelProperty(value = "工时分组")
    private String manHourGroup;

    @ApiModelProperty(value = "区间设置")
    private String section;

}

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectPartServiceImpl.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/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"/>
@@ -14,13 +14,7 @@
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="objectId" column="object_id" jdbcType="INTEGER"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,name,name_en,
        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

ÎļþÒÑɾ³ý

 basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml

ÎļþÒÑɾ³ý

 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"/>
@@ -27,35 +27,7 @@
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <update id="updateSection">
        UPDATE standard_product_list
        SET price=#{productList.price},
            man_hour=#{productList.manHour},
            section=#{productList.section},
            cores=#{productList.cores},
            conductor_material=#{productList.conductorMaterial},
            conductor_type=#{productList.conductorType},
            ask=#{productList.ask},
            tell=#{productList.tell},
            update_user=#{productList.updateUser},
            update_time=#{productList.updateTime}
        WHERE id = #{productList.id}
    </update>
    <update id="updateSortUp">
        update standard_product_list
        set sort = sort - 1
        where tree = #{tree}
          and standard_method_list_id = #{methodId}
          and sort between #{beginIndex} + 1 and #{endIndex}
    </update>
    <update id="updateSortDown">
        update standard_product_list
        set sort = sort + 1
        where tree = #{tree}
          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 +44,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,18 +64,17 @@
            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}
        and model=#{model}
        <if test="isCableTag != null and isCableTag != ''">
            and (inspection_item_class like concat('%结构尺寸%') or
            inspection_item_class like concat('%电缆电性能%')or
            inspection_item_class like concat('%绝缘%')or
            inspection_item_class like concat('%电缆燃烧性能%'))
        <if test="sampleType != null and sampleType != ''">
            and sample_type =#{sampleType}
        </if>
        order by sort asc,
        <if test="sample != null and sample != ''">
            and sample =#{sample}
        </if>
            case when man_hour_group is NULL then 1
                      when man_hour_group ='' then 1  else 0 end,
                 CASE
@@ -111,34 +82,37 @@
                     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}
          and tree =#{tree}
        <if test="isCableTag != null and isCableTag != ''">
            and (inspection_item_class like concat('%结构尺寸%') or
            inspection_item_class like concat('%电缆电性能%')or
            inspection_item_class like concat('%绝缘%')or
            inspection_item_class like concat('%电缆燃烧性能%'))
        </if>
        order by sort asc,
            case when man_hour_group is NULL then 1
        order by    case when man_hour_group is NULL then 1
                      when man_hour_group ='' then 1  else 0 end,
                 CASE
                     WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- å¦‚果以数字开头，则按照数字大小排序
                     WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- æå–字母后面的数字部分
                ,id asc
    </select>
    <select id="selectPartColor" resultType="java.util.Map">
        select color,
               color_code
        from product_part
        where part_no = #{partNo}
        union all
        select color,
               color_code
        from structure_test_object_part
        where part_no = #{partNo}


    <select id="getStandardProductByInsProduct" resultType="com.ruoyi.basic.vo.StandardProductVO">
        select
            CASE
                WHEN man_hour is null or man_hour='' THEN '0'
                ELSE man_hour
                END AS man_hour,
            man_hour_group,
            section
        from standard_product_list
        where (laboratory = #{laboratory} or laboratory is null or laboratory='')
          and sample_type = #{sampleType}
          and (sample = #{sample} or sample is null or sample='')
          and (model = #{model} or model is null or model='')
          and inspection_item=#{inspectionItem}
          and (inspection_item_subclass=#{inspectionItemSubclass} or inspection_item_subclass is null or inspection_item_subclass='')
          and (son_laboratory = #{sonLaboratory} or son_laboratory is null or son_laboratory='')
          and standard_method_list_id=#{standardMethodListId}
          and state=1
    </select>
</mapper>

 basic-server/src/main/resources/mapper/StandardProductListSupplierAskMapper.xml

ÎļþÒÑɾ³ý

 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,7 +26,7 @@
            ${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>


 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,90 +16,37 @@
        <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"/>
        <result property="sort" column="sort"/>
        <result property="partNo" column="part_no"/>
        <result property="sampleTypeEn" column="sample_type_en"/>
        <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"/>
        <result property="sampleEn" column="sample_en"/>
        <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>

    <sql id="selectStandardTree">
        sample    sample2,
               inspection_item,
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               method,
               son_laboratory,
               unit,
               ask_tell  tell,
               ask,
               price,
               man_hour,
               man_hour_group,
               man_day,
               inspection_item_type,
               inspection_value_type,
               bsm,
               template_id,
               laboratory,
               checkout_number,
               section,
               dic,
               0         state,
        #{model}
        model,
        #{sample}
        sample,
        #{trees}
        tree,
        id
        structure_item_parameter_id,
        radius_list,
        rates
    </sql>

    <select id="selectStandardTreeList" resultMap="FactoryDto">
        select '中天科技检测中心'        factory,
               l.laboratory_name laboratory,
               sto.specimen_name sample_type,
               p.name            sample,
               st.model,
               sto.code,
               sto.id  sample_type_id,
               sto.sort,
               sto.specimen_name_en sample_type_en,
               p.name_en sample_en
               sto.code
        from laboratory l
                 left join structure_test_object sto on sto.laboratory_id = l.id
                 left join product p on p.object_id = sto.id
@@ -107,8 +54,7 @@
            and st.sample = p.name
        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 +74,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 +100,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 +109,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,8 +123,36 @@
        where sto.specimen_name = #{sampleType}
        group by sto.specimen_name
    </select>
    <select id="selectStandardProductListByTree" resultType="com.ruoyi.inspect.pojo.StandardProductList">
        select <include refid="selectStandardTree"/>
    <select id="selectStandardProductListByTree" resultType="com.ruoyi.basic.pojo.StandardProductList">
        select sample    sample2,
               inspection_item,
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               method,
               son_laboratory,
               unit,
               ask_tell  tell,
               ask,
               price,
               man_hour,
               man_hour_group,
               man_day,
               inspection_item_type,
               inspection_value_type,
               bsm,
               template_id,
               laboratory,
               checkout_number,
               section,
               dic,
               0         state,
               #{model}  model,
               #{sample} sample,
               #{trees}  tree,
               id        structure_item_parameter_id
        from structure_item_parameter
        where (
                sample is NULL
@@ -189,19 +163,63 @@
          and (laboratory is null
            or laboratory = ''
            or laboratory = #{laboratory})
        order by inspection_item_class, inspection_item, id asc
    </select>
        order by case
                     when man_hour_group is NULL then 1
                     when man_hour_group = '' then 1
                     else 0 end,
                 CASE
                     WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- å¦‚果以数字开头，则按照数字大小排序
                     WHEN man_hour_group REGEXP '[0-9]+'
                         THEN CAST(SUBSTRING(man_hour_group, 2) AS UNSIGNED) END -- æå–字母后面的数字部分

    <select id="selectStandardProductListByTree2" resultType="com.ruoyi.inspect.pojo.StandardProductList">
        select <include refid="selectStandardTree"/>
                , id asc
    </select>
    <select id="selectStandardProductListByTree2" resultType="com.ruoyi.basic.pojo.StandardProductList">
        select sample    sample2,
               inspection_item,
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               method,
               son_laboratory,
               unit,
               ask_tell  tell,
               ask,
               price,
               man_hour,
               man_hour_group,
               man_day,
               inspection_item_type,
               inspection_value_type,
               bsm,
               template_id,
               laboratory,
               checkout_number,
               section,
               dic,
               0         state,
               #{model}  model,
               #{sample} sample,
               #{trees}  tree,
               id        structure_item_parameter_id
        from structure_item_parameter
        where sample LIKE CONCAT('%[', #{tree}, ']%')
          and (laboratory is null
            or laboratory = ''
            or laboratory = #{laboratory})
        order by inspection_item_class, inspection_item, id asc
    </select>
        order by case
                     when man_hour_group is NULL then 1
                     when man_hour_group = '' then 1
                     else 0 end,
                 CASE
                     WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- å¦‚果以数字开头，则按照数字大小排序
                     WHEN man_hour_group REGEXP '[0-9]+'
                         THEN CAST(SUBSTRING(man_hour_group, 2) AS UNSIGNED) END -- æå–字母后面的数字部分

                , id asc
    </select>
    <select id="getStandardTree2" resultMap="SampleTypeDto">
        select sto.specimen_name sample_type,
               p.name            sample,
@@ -211,15 +229,64 @@
                 left join standard_tree st on st.sample_type = sto.specimen_name
            and st.sample = p.name
    </select>
    <select id="selectStandardProductListByTree3" resultType="com.ruoyi.basic.pojo.StandardProductList">
        select sample    sample2,
               inspection_item,
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               method,
               son_laboratory,
               unit,
               ask_tell  tell,
               ask,
               price,
               man_hour,
               man_hour_group,
               man_day,
               inspection_item_type,
               inspection_value_type,
               bsm,
               template_id,
               laboratory,
               checkout_number,
               section,
               dic,
               0         state,
               #{model}  model,
               #{sample} sample,
               #{trees}  tree,
               id        structure_item_parameter_id
        from structure_item_parameter
        where (
                sample is NULL
                OR sample = ''
                or sample = '[]'
                OR sample LIKE CONCAT('%', #{tree}, '%')
            )
          and (laboratory is null
            or laboratory = ''
            or laboratory = #{laboratory})
        order by case
                     when man_hour_group is NULL then 1
                     when man_hour_group = '' then 1
                     else 0 end,
                 CASE
                     WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- å¦‚果以数字开头，则按照数字大小排序
                     WHEN man_hour_group REGEXP '[0-9]+'
                         THEN CAST(SUBSTRING(man_hour_group, 2) AS UNSIGNED) END -- æå–字母后面的数字部分

    <select id="getStandardTree3" resultType="com.ruoyi.inspect.dto.SampleDto">
                , id asc
    </select>
    <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
        select model label,
               model value
        from standard_tree
        where sample_type = #{sampleType}
          and sample is null
    </select>

    <select id="getLaboratory" resultType="java.lang.String">
        select l.laboratory_name
        from structure_test_object sto
@@ -240,7 +307,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
@@ -251,38 +318,5 @@
        select name
        from product
        where name = #{name}
    </select>
    <select id="selectStandardTreeListByPartNo" resultMap="FactoryDto">
        select '中天科技检测中心' factory,
               l.laboratory_name  laboratory,
               sto.specimen_name  sample_type,
               p.name             sample,
               st.model,
               CASE
                   WHEN p.id = (SELECT pp.product_id
                                FROM product_part pp
                                WHERE pp.part_no = #{partNo})
                       THEN #{partNo}
                   ELSE NULL
                   END AS sample_part_no,
               CASE
                   WHEN sto.id = (SELECT sto.test_object_id
                                  FROM structure_test_object_part sto
                                  WHERE sto.part_no = #{partNo})
                       THEN #{partNo}
                   ELSE NULL
                   END AS part_no
        from laboratory l
                 left join structure_test_object sto on sto.laboratory_id = l.id
                 left join product p on p.object_id = sto.id
                 left join standard_tree st on st.sample_type = sto.specimen_name
            and st.sample = p.name
        where (p.id = (select pp.product_id
                       from product_part pp
                       where pp.part_no = #{partNo})
            or sto.id = (select sto.test_object_id
                         from structure_test_object_part sto
                         where sto.part_no = #{partNo}))
        order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
    </select>
</mapper>

 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,
@@ -38,9 +38,7 @@
        ask_tell,
        inspection_item_class,
        inspection_item_class_en,
        code,
        radius_list,
        rates
        code
        from (select *,
        CASE
        WHEN INSTR(sample, ',') > 0 THEN
@@ -109,12 +107,44 @@
                 left join product p on p.object_id = sto.id
    </select>

    <resultMap id="itemDto" type="com.ruoyi.inspect.dto.TestItemDto">
    <select id="selectItemParameterList1" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
        select A.id,
        inspection_item,
        inspection_item_subclass,
        samples
        from (select *,
        CASE
        WHEN INSTR(sample, ',') > 0 THEN
        SUBSTRING_INDEX(SUBSTRING_INDEX(sample, '","', 1), '"', -1)
        when sample = '[""]' then null
        when sample = '[]' then null
        ELSE
        TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(sample, '[["', ''), '"]]', 1))
        END AS samples
        from structure_item_parameter) A
        left join structure_test_object sto on samples = specimen_name
        <where>
            <if test="specimenName != null and specimenName !=''">
                and A.sample like concat('%',#{specimenName},'%')
            </if>
        </where>
        GROUP BY inspection_item
    </select>
    <select id="selectItemParameterList2" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
        SELECT sp.id,sp.inspection_item_subclass FROM structure_item_parameter sp
        <where>
            <if test="inspectionItemSubclass != null and inspectionItemSubclass !=''">
                and sp.inspection_item  like concat('%',#{inspectionItemSubclass},'%')
            </if>
        </where>
    </select>

    <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,
@@ -15,17 +15,11 @@
        sto.code,
        sto.laboratory_id,
        GROUP_CONCAT(p.name) product,
        sto.specimen_name_en,
        sto.object_type
        sto.specimen_name_en
        from structure_test_object sto
        left join user u1 on sto.create_user = u1.id
        left join user u2 on sto.update_user = u2.id
        left join product p on p.object_id = sto.id
        left join product_part pp on pp.product_id = p.id
        left join structure_test_object_part stop ON stop.test_object_id = sto.id
        <if test="partNo != null and partNo != ''" >
            where pp.part_no = #{partNo} or stop.part_no = #{partNo}
        </if>
        group by sto.id
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">

 basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml

ÎļþÒÑɾ³ý

 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java

@@ -61,7 +61,7 @@

    @ApiOperation(value = "审核文件变更")
    @PostMapping("/checkManageDocumentAlter")
    public Result checkManageDocumentAlter(@RequestBody ManageDocumentAlter manageDocumentAlter){
    public Result checkManageDocumentAlter( ManageDocumentAlter manageDocumentAlter){
        return Result.success(manageDocumentAlterService.checkManageDocumentAlter(manageDocumentAlter));
    }


 cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java

@@ -60,8 +60,8 @@
    }

    @ApiOperation(value = "导出检验报告发放登记表")
    @GetMapping("/exportProcessReport")
    public Result exportProcessReport( ProcessReportDto processReportDto) {
    @PostMapping("/exportProcessReport")
    public Result exportProcessReport(@RequestBody ProcessReportDto processReportDto) {
        return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
    }


 cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java

@@ -21,5 +21,5 @@

    IPage<ProcessReport> pageProcessReport(Page page, @Param("ew") QueryWrapper<ProcessReport> queryWrappers);

    List<ProcessReport> getIds(List<Integer> ids);
    List<ProcessReport> getIds(@Param("ids") List<Integer> ids);
}

 cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java

@@ -76,8 +76,8 @@
    @Override
    public int delProcessDeal(Integer id) {
        ProcessDeal processDeal = processDealMapper.selectById(id);
        processDealMapper.deleteById(id);
        ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
        processDealMapper.deleteById(id);
        processTotaldeal.setTotalNum(processTotaldeal.getTotalNum()-processDeal.getNum());
        return processTotaldealMapper.updateById(processTotaldeal);
    }

 cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java

@@ -87,25 +87,6 @@
        String endDate = processMethodSearchNew.getEndDate();
        processMethodSearchNew.setBeginDate(null);
        processMethodSearchNew.setEndDate(null);
        // åˆ¤æ–­æ—¥æœŸæ˜¯å¦ä¸ºä»Šå¹´ï¼Œå¦‚果是今年则处理为今年的数据
        try {
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
            LocalDateTime startDateTime = LocalDateTime.parse(beginDate, formatter);
            LocalDateTime endDateTime = LocalDateTime.parse(endDate, formatter);
            int currentYear = LocalDateTime.now().getYear();
            // åˆ¤æ–­ä¼ å…¥çš„日期是否是今年的日期范围
            if (startDateTime.getYear() == currentYear && endDateTime.getYear() == currentYear) {
                // ä¼ å…¥çš„是今年的数据，直接返回当前的 beginDate å’Œ endDate
                beginDate = startDateTime.toString();
                endDate = endDateTime.toString();
            } else {
                beginDate = null;
                endDate = null;
            }
        } catch (Exception e) {
            beginDate = null;
            endDate = null;
        }
        return baseMapper.pageMethodSearchNew(page, QueryWrappers.queryWrappers(processMethodSearchNew), beginDate, endDate);
    }


 cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java

@@ -472,6 +472,10 @@
    public void exportQualityMonitorRatify(Integer detailsRatifyId, HttpServletResponse response) {
        QualityMonitorDetailsRatify qualityMonitorDetailsRatify = qualityMonitorDetailsRatifyMapper.selectOne(Wrappers.<QualityMonitorDetailsRatify>lambdaQuery().eq(QualityMonitorDetailsRatify::getQualityMonitorDetailsId, detailsRatifyId));

        if(ObjectUtils.isNull(qualityMonitorDetailsRatify)){
            throw new ErrorException("这条数据还没有填写相关的实施计划信息!!!");
        }

        // èŽ·å–路径
        InputStream inputStream = this.getClass().getResourceAsStream("/static/quality-monitor-details-ratify.docx");
        Configure configure = Configure.builder()

 cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java

@@ -45,10 +45,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

@@ -327,7 +324,9 @@
    @Override
    public void exportSuperviseDetailRecord(Integer superviseDetailsId, HttpServletResponse response) {
        QualitySuperviseDetailsRecord recordDto =  qualitySuperviseDetailsRecordMapper.selectSuperviseDetailRecord(superviseDetailsId);

        if(Objects.isNull(recordDto)) {
            throw new ErrorException("该数据未进行记录");
        }
        //获取技术负责人的签名地址
        String ratifyUrl = null;
        if (recordDto.getRatifyUserId() != null) {
@@ -494,6 +493,9 @@
    @Override
    public void superviseDetailAccordingExport(Integer superviseDetailAccordingId, HttpServletResponse response) {
        QualitySuperviseDetailsAccordingDto exportDto = qualitySuperviseDetailsAccordingMapper.selectSuperviseDetailsAccording(superviseDetailAccordingId);
        if(Objects.isNull(exportDto)) {
            throw new ErrorException("该数据未进行处理");
        }
        // å‘现部门
        String discovererUrl = null;
        if (exportDto.getRecordUserId() != null) {
@@ -737,6 +739,9 @@
    @Override
    public void exportSuperviseDetaillCorrect(Integer superviseDetailsCorrectId, HttpServletResponse response) {
        QualitySuperviseDetailsCorrect detailsCorrect = qualitySuperviseDetailsCorrectMapper.selectById(superviseDetailsCorrectId);
        if (ObjectUtils.isNull(detailsCorrect)) {
            throw new ErrorException("还没有填写纠正单的数据");
        }
        QualitySuperviseDetailsCorrectDto detailsCorrectDto = new QualitySuperviseDetailsCorrectDto();
        BeanUtils.copyProperties(detailsCorrect, detailsCorrectDto);
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");

 cnas-process/src/main/resources/static/report-deal.docx

Binary files differ

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java

@@ -54,7 +54,7 @@
    @GetMapping("/selectUserDepartmentLimsName")
    @ApiOperation(value = "获取当前登录用户部门")
    public Result<?> selectUserDepartmentLimsName(){
        return Result.success("成功", userService.selectUserDepartmentLimsName());
        return Result.success(userService.selectUserDepartmentLimsName());
    }

    @PostMapping("/upUserDepardLimsId")