zouyu
2025-03-11 0800df1e422c8f7e5fee825410bfed8344ee3629
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrder;
@@ -46,8 +48,6 @@
        return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
    }
    //用于检验下单区别查看所有订单和只查看同一个委托单位的订单
    @ApiOperation(value = "判断当前客户紧急额度是否用完")
    @GetMapping("/hasSendUrgentOrder")
@@ -65,12 +65,14 @@
    @ApiOperation(value = "分配按钮")
    @PostMapping("/upInsOrder")
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    public Result<?> upInsOrder(@RequestBody UpInsOrderDTO upInsOrderDTO) {
        return Result.success(insOrderService.upInsOrder(upInsOrderDTO));
    }
    @ApiOperation(value = "下单按钮")
    @PostMapping("/addInsOrder")
    @Log(title = "检验下单", businessType = BusinessType.INSERT)
    public Result<?> addInsOrder(String str) {
        Map<String, Object> map = JSON.parseObject(str, Map.class);
        JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
@@ -90,6 +92,7 @@
    @ApiOperation(value = "查询检验下单内容详情")
    @GetMapping("/getInsOrder")
    @Log(title = "检验下单", businessType = BusinessType.OTHER)
    public Result<?> getInsOrder(Integer orderId) {
        return Result.success(insOrderService.getInsOrder(orderId));
    }
@@ -100,18 +103,21 @@
            @ApiImplicitParam(name = "state", value = "审核结果 1:通过 2:不通过", dataTypeClass = Integer.class)
    })
    @PostMapping("/upInsOrderOfState")
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
        return Result.success(insOrderService.upInsOrderOfState(insOrder));
    }
    @ApiOperation(value = "保存检验模板按钮")
    @PostMapping("/addInsOrderTemplate")
    @Log(title = "检验下单", businessType = BusinessType.INSERT)
    public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
        return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
    }
    @ApiOperation(value = "删除检验模板按钮")
    @PostMapping("/delInsOrderTemplate")
    @Log(title = "检验下单", businessType = BusinessType.DELETE)
    public Result<?> delInsOrderTemplate(Integer id) {
        return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
    }
@@ -130,8 +136,7 @@
    @ApiOperation(value = "通过检验单查询检验数据(数据查看)")
    @GetMapping("/selectSampleAndProductByOrderId")
    public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
        SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
    public Result<?> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto) {
        return Result.success(insOrderService.selectSampleAndProductByOrderId(sampleProductDto));
    }
    //数据查看下的查看详情(单根垂直燃烧和松套管
@@ -142,6 +147,7 @@
    @ApiOperation(value = "导出已检委托单")
    @PostMapping("/exportChecked")
    @Log(title = "检验下单", businessType = BusinessType.EXPORT)
    public void exportChecked(@RequestBody Map<String, Object> data, HttpServletResponse response) {
        insOrderService.exportChecked(data,response);
    }
@@ -155,6 +161,7 @@
    @ApiOperation(value = "撤销按钮")
    @PutMapping("/updateStatus")
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    public Result<?> updateStatus(Integer id) {
        insOrderService.updateStatus(id);
        return Result.success();
@@ -209,6 +216,7 @@
     * @param data
     * @return
     */
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    @PostMapping("/revoke")
    public Result<?> revoke(@RequestBody Map<String, Object> data)   {
        insProductService.revoke(data);
@@ -253,13 +261,12 @@
        return Result.success(insProductService.revokeReviewProduct(orderId,sampleId));
    }
    /**
     * 撤销审核通过
     * @param orderId
     * @return
     */
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    @GetMapping("/revocationPassed")
    public Result<?> revocationPassed(Integer orderId){
        insProductService.revocationPassed(orderId);
@@ -271,6 +278,7 @@
     * @param orderId
     * @return
     */
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    @GetMapping("/revocationCancel")
    public Result<?> revocationCancel(Integer orderId){
        insProductService.revocationCancel(orderId);
@@ -280,6 +288,7 @@
    @ApiOperation(value = "待检的撤销")
    @PutMapping("/updateInspected")
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    public Result<?> updateInspected(Integer orderId,String ids){
        insProductService.updateInspected(orderId,ids);
        return Result.success();
@@ -287,6 +296,7 @@
    @ApiOperation(value = "撤销审核按钮")
    @PostMapping("/checkUpdate")
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    public Result<?> checkUpdate(Integer orderId,Integer state){
        insProductService.checkUpdate(orderId,state);
        return Result.success();