通信LIMS后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
晏有为
2024-05-23 10de56ca16261e6a4eec49dfd32f0a6b232f7baf 
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java


@@ -1,6 +1,5 @@


package com.yuanchu.mom.controller;




import cn.hutool.core.bean.BeanUtil;


import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONArray;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


@@ -15,13 +14,13 @@


import com.yuanchu.mom.service.InsOrderService;


import com.yuanchu.mom.service.InsOrderTemplateService;


import com.yuanchu.mom.service.InsProductService;


import com.yuanchu.mom.service.InsSampleService;


import com.yuanchu.mom.utils.JackSonUtil;


import com.yuanchu.mom.vo.Result;


import io.swagger.annotations.*;


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.beans.BeanUtils;


import org.springframework.context.annotation.Bean;


import org.springframework.web.bind.annotation.*;




import java.time.LocalDateTime;


@@ -32,7 +31,7 @@


@RestController


@AllArgsConstructor


@RequestMapping("/insOrder")


@Api("检验单模块")


@Api(tags="检验单模块")


public class InsOrderController {




    private InsOrderService insOrderService;


@@ -110,10 +109,9 @@


    public Result<?> selectInsOrderTemplateById(Integer id) {


        return Result.success("成功", insOrderTemplateService.selectInsOrderTemplateById(id));


    }




    @ValueClassify("检验下单")


    @ApiOperation(value = "删除检验单模板")


    @PostMapping("/delInsOrderTemplate")


    @ValueAuth


    public Result<?> delInsOrderTemplate(Integer id) {


        return Result.success(insOrderTemplateService.delInsOrderTemplate(id));


    }


@@ -134,8 +132,8 @@


        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);


        return Result.success(insOrderService.costStatistics(page, costStatisticsDto));


    }


    @ValueClassify("样品缺陷指数")


    @ApiOperation(value = "样品缺陷指数", tags = "样品缺陷指数")


    @ValueClassify("统计图表")


    @ApiOperation(value = "样品缺陷指数")


    @PostMapping("/selectSampleDefects")


    public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {


        return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));