Merge remote-tracking branch 'origin/dev' into dev

zss

2025-03-13 3b92cf3f9cd038c446e390aab18e759b0463d24a

 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;
@@ -17,6 +19,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
@@ -40,6 +43,7 @@
    //获取检验下单数据
    @ApiOperation(value = "查看所属单位检验单")
    @GetMapping("/selectInsOrderParameter")
    @PreAuthorize("@ss.hasPermi('business:order:queryAll')")
    public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) {
        return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
    }
@@ -52,40 +56,40 @@
    }

    //用于检验下单区别查看所有订单和只查看同一个委托单位的订单
    @ApiOperation(value = "查看所有检验单")
    @PostMapping("/selectAllInsOrderParameter")
    public Result selectAllInsOrderParameter() {
        return Result.success();
    }
//    @ApiOperation(value = "查看所有检验单")
//    @PostMapping("/selectAllInsOrderParameter")
//    public Result selectAllInsOrderParameter() {
//        return Result.success();
//    }


    @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")
    public Result<?> addInsOrder(String str) {
        Map<String, Object> map = JSON.parseObject(str, Map.class);
        JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
        List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
        InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
        List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
        List<List<Integer>> fiberPairing = JSON.parseArray(map.get("fiberPairing")+"");//光纤配置里的熔接配对
        return Result.success(insOrderService.addInsOrder(list, insOrder, pairing,fiberPairing));
    @Log(title = "检验下单", businessType = BusinessType.INSERT)
    public Result<?> addInsOrder(@RequestBody AddInsOrderDTO addInsOrderDTO) {
        return Result.success(insOrderService.addInsOrder(
                addInsOrderDTO.getList(),
                addInsOrderDTO.getInsOrder(),
                addInsOrderDTO.getPairing(),
                addInsOrderDTO.getFiberPairing()));
    }

    @ApiOperation(value = "查询订单最长预计时间")
    @PostMapping("/selectOrderManDay")
    @GetMapping("/selectOrderManDay")
    public Result<?> selectOrderManDay(Integer id) {
        int day = insProductService.selectOrderManDay(id);
        return Result.success("成功", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
        return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),"成功");
    }

    @ApiOperation(value = "查询检验下单内容详情")
    @PostMapping("/getInsOrder")
    @GetMapping("/getInsOrder")
    public Result<?> getInsOrder(Integer orderId) {
        return Result.success(insOrderService.getInsOrder(orderId));
    }
@@ -96,18 +100,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));
    }
@@ -119,15 +126,14 @@
    }

    @ApiOperation(value = "通过检验单模板id获取检验单模板内容")
    @PostMapping("/selectInsOrderTemplateById")
    @GetMapping("/selectInsOrderTemplateById")
    public Result<?> selectInsOrderTemplateById(Integer id) {
        return Result.success( insOrderTemplateService.selectInsOrderTemplateById(id),"成功");
    }

    @ApiOperation(value = "通过检验单查询检验数据（数据查看）")
    @PostMapping("/selectSampleAndProductByOrderId")
    public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
        SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
    @GetMapping("/selectSampleAndProductByOrderId")
    public Result<?> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto) {
        return Result.success(insOrderService.selectSampleAndProductByOrderId(sampleProductDto));
    }
    //数据查看下的查看详情（单根垂直燃烧和松套管
@@ -138,12 +144,13 @@

    @ApiOperation(value = "导出已检委托单")
    @PostMapping("/exportChecked")
    @Log(title = "检验下单", businessType = BusinessType.EXPORT)
    public void exportChecked(@RequestBody Map<String, Object> data, HttpServletResponse response) {
        insOrderService.exportChecked(data,response);
    }

    @ApiOperation(value = "费用统计获取总价")
    @PostMapping("/costStatistics2")
    @GetMapping("/costStatistics2")
    public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception {
        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
        return Result.success(insOrderService.costStatistics2(costStatisticsDto));
@@ -151,13 +158,14 @@

    @ApiOperation(value = "撤销按钮")
    @PutMapping("/updateStatus")
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    public Result<?> updateStatus(Integer id) {
        insOrderService.updateStatus(id);
        return Result.success();
    }

    //待检的撤销的查询待检项目
    @PostMapping("/selectNoProducts")
    @GetMapping("/selectNoProducts")
    public Result<?> selectNoProducts(@RequestBody Map<String, Object> data,Integer orderId ,String ids) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        InsProduct insProduct = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsProduct.class);
@@ -205,6 +213,7 @@
     * @param data
     * @return
     */
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    @PostMapping("/revoke")
    public Result<?> revoke(@RequestBody Map<String, Object> data)   {
        insProductService.revoke(data);
@@ -249,13 +258,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);
@@ -267,6 +275,7 @@
     * @param orderId
     * @return
     */
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    @GetMapping("/revocationCancel")
    public Result<?> revocationCancel(Integer orderId){
        insProductService.revocationCancel(orderId);
@@ -276,6 +285,7 @@

    @ApiOperation(value = "待检的撤销")
    @PutMapping("/updateInspected")
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    public Result<?> updateInspected(Integer orderId,String ids){
        insProductService.updateInspected(orderId,ids);
        return Result.success();
@@ -283,19 +293,20 @@

    @ApiOperation(value = "撤销审核按钮")
    @PostMapping("/checkUpdate")
    @Log(title = "检验下单", businessType = BusinessType.UPDATE)
    public Result<?> checkUpdate(Integer orderId,Integer state){
        insProductService.checkUpdate(orderId,state);
        return Result.success();
    }

    @ApiOperation(value = "标签打印按钮")
    @PostMapping("/labelPrinting")
    @GetMapping("/labelPrinting")
    public Result<?> labelPrinting(String ids) {
        return Result.success(insOrderService.labelPrinting(ids));
    }

    @ApiOperation(value = "查看费用统计列表")
    @PostMapping("/costStatistics")
    @GetMapping("/costStatistics")
    public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
@@ -303,7 +314,7 @@
    }

    @ApiOperation(value = "查看结果按钮(温度循环)")
    @PostMapping("/getInsOrderTemList")
    @GetMapping("/getInsOrderTemList")
    public Result getInsOrderTemList(@RequestBody Map<String, Object> data) {
        return Result.success(insOrderService.getInsOrderTemList(data));
    }