Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-25 cfdaaae8690e188f6971057259873aa408ebc9e3

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -1,10 +1,12 @@
package com.yuanchu.mom.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +21,7 @@
 */
@RestController
@RequestMapping("/insOrderPlan")
@Api("/检验任务")
@AllArgsConstructor
public class InsOrderPlanController {

@@ -28,6 +31,7 @@
    @PostMapping("/selectInsOrderPlanList")
    public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        page.setOptimizeCountSql(false);
        InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
        return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
    }
@@ -40,8 +44,34 @@

    @ApiOperation(value = "执行检验操作")
    @PostMapping("/doInsOrder")
    public Result<?> doInsOrder(Integer id) {
        return Result.success(insOrderPlanService.doInsOrder(id));
    public Result<?> doInsOrder(Integer id, String laboratory) {
        return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
    }

    @ApiOperation(value = "任务交接")
    @PostMapping("/upPlanUser")
    public Result<?> upPlanUser(Integer userId, Integer orderId) {
        return Result.success(insOrderPlanService.upPlanUser(userId, orderId));
    }

    @ApiOperation(value = "复核检验任务")
    @PostMapping("/verifyPlan")
    public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
        return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
    }

    @ApiOperation(value = "检验任务提交")
    @PostMapping("/submitPlan")
    public Result<?> submitPlan(Integer orderId, String laboratory) {
        int num = insOrderPlanService.submitPlan(orderId, laboratory);
        return num==1?Result.success():Result.fail("提交失败，部分项目还未进行检验");
    }

    @ApiOperation(value = "保存检验内容")
    @PostMapping("/saveInsContext")
    @ValueAuth
    public Result<?> saveInsContext(@RequestBody Map<String, Object> param){
        insOrderPlanService.saveInsContext(param);
        return Result.success();
    }
}