Merge remote-tracking branch 'origin/master'

“zhuo”

2023-08-10 cf347859a3a023f48bdb82e7702c0df8858759db

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java

@@ -7,6 +7,7 @@

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.service.RawMaterialService;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.service.InspectionService;

import javax.annotation.Resource;

/**
@@ -66,13 +68,13 @@
    @GetMapping("/selectAll")
    public Result selectAll(Integer type) {
        switch (type) {
            case 0 :
            case 0:
                //原材料
                return Result.success(rawMaterialService.selectRawmaAll());
            case 1 :
            case 1:
                //委托单
                return Result.success(linkBasicInformationService.selectLinkAll());
            case 2 :
            case 2:
                //成品检验
                return Result.success("请输入检验信息!");
        }
@@ -88,7 +90,7 @@
    })
    @GetMapping("/selectRawmaById")
    public Result selectRawmaById(Integer id, String startTime, String endTime) throws ParseException {
        return Result.success(rawMaterialService.selectRawmaById(id,startTime,endTime));
        return Result.success(rawMaterialService.selectRawmaById(id, startTime, endTime));
    }


@@ -97,6 +99,8 @@
            @ApiImplicitParam(name = "bid", value = "委托报检单id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "did", value = "委托报检样品id", dataTypeClass = Integer.class, required = true)
    })


    @GetMapping("/selectLinkByid")
    public Result selectLinkByid(Integer bid, Integer did) {
        return Result.success(linkBasicInformationService.selectLinkByid(bid, did));
@@ -133,7 +137,6 @@
        }
        return Result.success(inspectionService.updateInspectsById(id));
    }


}