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,8 +2,10 @@

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.service.StandardMethodListService;
@@ -220,7 +222,7 @@
    @ApiOperation(value = "删除厂家要求值绑定")
    @DeleteMapping("/deleteProductSupplierAsk")
    public Result deleteProductSupplierAsk(Integer supplierAskId) {
        standardProductListSupplierAskService.removeById(supplierAskId);
        standardProductListSupplierAskService.deleteProductSupplierAsk(supplierAskId);
        return Result.success();
    }

@@ -246,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));
    }

@@ -255,16 +262,23 @@
        return Result.success(standardProductListService.copyStandardProductSort(copyStandardProductListDto));
    }

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

    @ApiOperation(value = "标准树下检验项修改记录分页查询")
    @GetMapping("/standardProductListRecordPage")
    public Result standardProductListRecordPage(Page page, StandardProductListUpdateRecord standardProductListUpdateRecord) {
        return Result.success(standardProductListService.standardProductListRecordPage(page,standardProductListUpdateRecord));
    @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());
    }
}