Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency

zhuo

2025-04-03 eb975b40828b3a930fb38b75c739a7385b14ee12

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

@@ -2,14 +2,12 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.enums.StandardProductListChcekTypeEnums;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
import com.ruoyi.basic.dto.FactoryDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListSupplierAskService;
@@ -53,16 +51,8 @@

    @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));
    public Result addStandardTree(@RequestBody ModelAddDto modelAddDto) {
        return Result.success(standardTreeService.addStandardTree(modelAddDto));
    }

    @ApiOperation(value = "根据标准树进行标准查询")
@@ -87,27 +77,6 @@
        return Result.success(standardProductListService.updateSection(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, String> map) {
        String ids = map.get("ids");
        String tree = map.get("tree");
        return Result.success(standardTreeService.addStandardProduct(ids, tree));
    }

    @ApiOperation(value = "删除标准树的层级")
    @DeleteMapping("/delStandardTree")
    public Result delStandardTree(String tree) {
@@ -122,8 +91,8 @@

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

    @ApiOperation(value = "批量查询检验项目")
@@ -144,7 +113,7 @@
        return Result.success(standardMethodListService.selectStandardMethodEnum());
    }

    @ApiOperation(value = "获取产品架构")
    @ApiOperation(value = "获取检验对象架构树")
    @GetMapping("/getStandardTree2")
    public Result getStandardTree2() {
        return Result.success(standardTreeService.getStandardTree2());
@@ -253,14 +222,14 @@
    @ApiOperation(value = "删除厂家要求值绑定")
    @DeleteMapping("/deleteProductSupplierAsk")
    public Result deleteProductSupplierAsk(Integer supplierAskId) {
        standardProductListSupplierAskService.removeById(supplierAskId);
        standardProductListSupplierAskService.deleteProductSupplierAsk(supplierAskId);
        return Result.success();
    }

    @ApiOperation(value = "修改标准树")
    @ApiOperation(value = "修改型号")
    @PostMapping("/updateStandardTree")
    public Result updateStandardTree(@RequestBody StandardTree standardTree) {
        return Result.success(standardTreeService.updateStandardTree(standardTree));
    public Result updateStandardTree(@RequestBody ModelAddDto modelAddDto) {
        return Result.success(standardTreeService.updateStandardTree(modelAddDto));
    }

    @ApiOperation(value = "检验项要求值复制对比")
@@ -279,6 +248,11 @@
    @PostMapping("/updateStandardProductListBatch")
    public Result updateStandardProductListBatch(@RequestBody Map<String, Object> param) {
        List<StandardProductList> standardProductList = (List<StandardProductList>) param.get("standardProductList");
        if(CollectionUtils.isEmpty(standardProductList)){
            for (StandardProductList productList : standardProductList) {
                productList.setCheckStatus(StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
            }
        }
        return Result.success(standardProductListService.updateBatchById(standardProductList));
    }

@@ -287,4 +261,24 @@
    public Result copyStandardProductSort(@RequestBody CopyStandardProductListDto copyStandardProductListDto) {
        return Result.success(standardProductListService.copyStandardProductSort(copyStandardProductListDto));
    }

    @ApiOperation(value = "标准树下检验项提交")
    @PostMapping("/productListSubmit")
    public Result productListSubmit(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
        standardProductListService.productListSubmit(standardProductListUpdateRecord);
        return Result.success();
    }

    @ApiOperation(value = "标准树下检验项审核")
    @PostMapping("/productListCheck")
    public Result productListCheck(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
        standardProductListService.productListCheck(standardProductListUpdateRecord);
        return Result.success();
    }

    @ApiOperation("查询标准库是否存在审核中状态")
    @GetMapping("/existCheckingRecord")
    public Result existCheckingRecord(){
        return Result.success(standardProductListService.existCheckingRecord());
    }
}