检验任务移植

zhuo

2025-02-18 4c64a8f71dbbd65e72864fcefb8578958e4dda51

检验任务移植

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,271 @@
package com.ruoyi.inspect.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.dto.InsOrderPlanDTO;
import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
import com.ruoyi.inspect.dto.InsProductBindingDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.service.InsOrderFileService;
import com.ruoyi.inspect.service.InsOrderPlanService;
import com.ruoyi.inspect.service.InsProductService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * æ£€éªŒä»»åŠ¡-控制层
 */
@RestController
@RequestMapping("/insOrderPlan")
@Api(tags = "检验任务")
@AllArgsConstructor
public class InsOrderPlanController {

    private InsOrderPlanService insOrderPlanService;

    private InsOrderFileService insOrderFileService;

    private InsProductService insProductService;


    @ApiOperation(value = "获取检验任务列表")
    @GetMapping("/selectInsOrderPlanList")
    public Result selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO){
        return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
    }

    @ApiOperation(value = "检验单详情-任务切换")
    @GetMapping("/inspectionOrderDetailsTaskSwitching")
    public Result inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO) throws Exception {
        return Result.success(insOrderPlanService.inspectionOrderDetailsTaskSwitching(page, insOrderPlanDTO));
    }

    @ApiOperation(value = "认领任务计划")
    @PostMapping("/claimInsOrderPlan")
    public Result claimInsOrderPlan(@RequestBody InsOrderPlanDTO data) {
        return Result.success(insOrderPlanService.claimInsOrderPlan(data));
    }


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

    @PostMapping("/getInsProduct")
    @ApiOperation("获取检验项目和模板内容")
    public Result<?> getInsProduct(InsOrderPlanProductDto insOrderPlanProductDto) {
        return Result.success(insOrderPlanService.getInsProduct(insOrderPlanProductDto));
    }


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

    @ApiOperation(value = "判断交接的试验室")
    @PostMapping("/upPlanUser2")
    public Result<?> upPlanUser2(Integer orderId) {
        return Result.success(insOrderPlanService.upPlanUser2(orderId));
    }


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

    @ApiOperation(value = "校验检验任务提交")
    @PostMapping("/checkSubmitPlan")
    public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
        return Result.success(insOrderPlanService.checkSubmitPlan(orderId, laboratory));
    }


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


    /**
     *
     * @param param æ¨¡æ¿å†…容
     * @param currentTable å½“前模板id
     * @param sampleId å½“前样品id
     * @param orderId å½“前订单id
     * @param sonLaboratory å­è¯•éªŒå®¤
     * @return
     */
    @ApiOperation(value = "保存检验内容")
    @PostMapping("/saveInsContext")
    public Result<?> saveInsContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
        Map<String, Object> param2 = JSON.parseObject(param, Map.class);
        insOrderPlanService.saveInsContext(param2, currentTable, sampleId, orderId, sonLaboratory);
        return Result.success();
    }

    @ApiOperation(value = "查看检验单下的附件列表")
    @GetMapping("/getFileList")
    public Result<?> getFileList(Page page, InsOrderFile insOrderFile) throws Exception {
        return Result.success(insOrderPlanService.getFileList(page, insOrderFile));
    }


    @ApiOperation(value = "上传附件")
    @PostMapping("/uploadFile")
    public Result<?> taskUploadFile(Integer orderId, MultipartFile file) {
        return Result.success(insOrderPlanService.uploadFile(orderId, file));
    }


    @ApiOperation(value = "删除附件")
    @PostMapping("/delfile")
    public Result<?> delfile(Integer id) {
        return Result.success(insOrderFileService.removeById(id));
    }


    @ApiOperation(value = "下载附件")
    @GetMapping("/downFile")
    public Result<?> downFile(Integer id) {
        InsOrderFile insOrderFile = insOrderFileService.getById(id);
        HashMap<String, Object> map = new HashMap<>();
        map.put("type", insOrderFile.getType());
        map.put("fileUrl", insOrderFile.getFileUrl());
        return Result.success(map);
    }

    @ApiOperation(value = "填写温度与湿度")
    @PostMapping("/write")
    public Result<?> write(@RequestBody InsOrder insOrder) {
        return Result.success(insProductService.write(insOrder));
    }


    @ApiOperation(value = "电缆配置,查看配置标识")
    @PostMapping("/getCableTag")
    public Result<?> getCableTag(Integer id, String laboratory) {
        return Result.success(insOrderPlanService.getCableTag(id, laboratory));
    }

    @ApiOperation(value = "原材料,查看配置标识")
    @PostMapping("/getRawMaterialTag")
    public Result<?> getRawMaterialTag(Integer id, String laboratory) {
        return Result.success(insOrderPlanService.getRawMaterialTag(id, laboratory));
    }

    @ApiOperation(value = "查看重复标识")
    @PostMapping("/getRepetitionTag")
    public Result<?> getRepetitionTag(Integer id, String laboratory, String cableTag) {
        return Result.success(insOrderPlanService.getRepetitionTag(id, laboratory, cableTag));
    }

    @ApiOperation("获取不合格数据")
    @PostMapping("/getInsProductUnqualified")
    public Result<?> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto) {
        return Result.success(insOrderPlanService.getInsProductUnqualified(insOrderPlanProductDto));
    }

    @ApiOperation("新增不合格复测信息")
    @PostMapping("/addUnqualifiedRetest")
    public Result<?> addDisqualificationRetest(@RequestBody Map<String, Object> params) {
        // èŽ·å–检验对象的id
        List<Integer> ids = (List<Integer>) params.get("ids");
        return Result.success(insOrderPlanService.addDisqualificationRetest(ids));
    }

    @ApiOperation("获取不合格复测数据")
    @PostMapping("/getInsProductUnqualifiedRetest")
    public Result<?> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag) {
        return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(id, type, laboratory, cableTag, rawMaterialTag, retestTag));
    }

    /**
     *
     * @param param æ¨¡æ¿å†…容
     * @param currentTable å½“前模板id
     * @param sampleId å½“前样品id
     * @param orderId å½“前订单id
     * @param sonLaboratory å­è¯•éªŒå®¤
     * @return
     */
    @ApiOperation(value = "保存不合格复测检验内容")
    @PostMapping("/saveUnqualifiedContext")
    public Result<?> saveUnqualifiedContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
        Map<String, Object> param2 = JSON.parseObject(param, Map.class);
        insOrderPlanService.saveUnqualifiedContext(param2, currentTable, sampleId, orderId, sonLaboratory);
        return Result.success();
    }

    @ApiOperation(value = "查询原材料进货验证")
    @GetMapping("/getFactoryVerify")
    public Result<?> getFactoryVerify(Integer insOrderId) {
        return Result.success(insOrderPlanService.getFactoryVerify(insOrderId));
    }



    @ApiOperation(value = "保存原材料进货验证")
    @PostMapping("/addFactoryVerify")
    public Result<?> addFactoryVerify(@RequestBody InsOrderFactoryVerify factoryVerify) {
        return Result.success(insOrderPlanService.addFactoryVerify(factoryVerify));
    }


    @ApiOperation(value = "修改检验项内容")
    @PostMapping("/updateProductOnPlan")
    public Result<?> updateProductOnPlan(@RequestBody InsProduct insProduct) {
        insProductService.updateById(insProduct);
        return Result.success();
    }


    @ApiOperation(value = "根据检验项id查询检验项树信息")
    @GetMapping("/getProductTreeByProductId")
    public Result<List<InsProduct>> getProductTreeByProductId(Integer productId) {
        return Result.success(insProductService.getProductTreeByProductId(productId));
    }



    @ApiOperation(value = "特殊检验项绑定")
    @PostMapping("/bindingProductTreeByProductId")
    public Result<?> bindingProductTreeByProductId(@RequestBody InsProductBindingDto insProductBindingDto) {
        return Result.success(insProductService.bindingProductTreeByProductId(insProductBindingDto));
    }


    @ApiOperation(value = "特殊检验项绑定查询")
    @GetMapping("/getBindingProductByProductId")
    public Result<List<InsProduct>> getBindingProductByProductId(Integer productId) {
        return Result.success(insProductService.list(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getBindingProductId, productId)));
    }



    @ApiOperation(value = "删除特殊检验项绑定信息")
    @GetMapping("/delProductTreeByProductId")
    public Result<?> delProductTreeByProductId(Integer productId) {
        return Result.success(insProductService.removeBindingProductTree(productId));
    }
}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/EnterFactoryReport.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.ruoyi.inspect.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @Author zhuo
 * @Date 2024/8/12
 */
@Data
public class EnterFactoryReport {

    @ApiModelProperty("材料名称")
    private String sample;

    @ApiModelProperty("到货数量")
    private String qtyArrived;

    @ApiModelProperty("抽检数量")
    private String quantity;

    @ApiModelProperty("规格型号")
    private String partDesc;

    @ApiModelProperty("材料厂家")
    private String supplierName;

    @ApiModelProperty("批号")
    private String lotBatchNo;

    @ApiModelProperty("检测编号")
    private String code;
}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderDeviceRecordDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.inspect.dto;

import com.ruoyi.inspect.pojo.InsOrderDeviceRecord;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @Author zhuo
 * @Date 2024/12/22
 */
@Data
public class InsOrderDeviceRecordDto extends InsOrderDeviceRecord {

    @ApiModelProperty("设备编号")
    private String managementNumber;
}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanProductDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.ruoyi.inspect.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * æ£€éªŒä»»åŠ¡æ£€éªŒé¡¹æŸ¥è¯¢æ¡ä»¶
 *
 * @Author zhuo
 * @Date 2024/11/29
 */
@Data
public class InsOrderPlanProductDto {

    @ApiModelProperty("样品id")
    private Integer id;

    @ApiModelProperty("类型")
    private Integer type;

    @ApiModelProperty("试验室")
    private String laboratory;

    @ApiModelProperty("电缆配置标识")
    private String cableTag;

    @ApiModelProperty("原材料批次标识")
    private String rawMaterialTag;

    @ApiModelProperty("成品下单重复标识")
    private String repetitionTag;

}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/UnPassPageDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.inspect.dto;

import com.ruoyi.inspect.pojo.InsUnPass;
import lombok.Data;

import java.io.Serializable;

/**
 * @author æœ±ä½³å‰
 * @date 2024/5/8 12:38
 */
@Data
public class UnPassPageDto extends InsUnPass implements Serializable {

}

 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderDeviceRecordMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.ruoyi.inspect.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.dto.InsOrderDeviceRecordDto;
import com.ruoyi.inspect.pojo.InsOrderDeviceRecord;

import java.util.List;
import java.util.Set;

/**
 * cnas设备使用记录表(DeviceRecord)$desc
 *
 * @author makejava
 * @since 2024-12-21 11:11:01
 */
public interface InsOrderDeviceRecordMapper extends BaseMapper<InsOrderDeviceRecord> {

    /**
     * æŸ¥è¯¢è®¾å¤‡ä½¿ç”¨è®°å½•
     * @param insOrderId
     * @return
     */
    List<InsOrderDeviceRecordDto> selectDeviceNumber(Integer insOrderId);

    /**
     * æ ¹æ®ç¼–号查询设备id
     * @param deviceNumbers
     * @return
     */
    List<Integer> selectDeviceIdsByNumbers(Set<String> deviceNumbers);
}


 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderFactoryVerifyItemMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.inspect.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerifyItem;
import org.apache.ibatis.annotations.Mapper;

/**
 * åŽŸææ–™åŽ‚家进货验证检验项
 *
 * @author zhuo
 * @since 2024-09-26
 */
@Mapper
public interface InsOrderFactoryVerifyItemMapper extends BaseMapper<InsOrderFactoryVerifyItem> {

}


 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderFactoryVerifyMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.inspect.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import org.apache.ibatis.annotations.Mapper;

/**
 * åŽŸææ–™åŽ‚家进货验证
 *
 * @author zhuo
 * @since 2024-09-26
 */
@Mapper
public interface InsOrderFactoryVerifyMapper extends BaseMapper<InsOrderFactoryVerify> {

}


 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderFileMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.inspect.mapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.inspect.pojo.InsOrderFile;

/**
 * <p>
 * æ£€éªŒå•ä¸‹çš„附件列表 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-06-06 10:08:21
 */
public interface InsOrderFileMapper extends BaseMapper<InsOrderFile> {

    IPage<InsOrderFile> getFileList(Page page, QueryWrapper<InsOrderFile> ew, Integer insOrderId);
}

 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderStandardTemplateMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.inspect.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.pojo.InsOrderStandardTemplate;
import org.apache.ibatis.annotations.Mapper;

/**
 * è®¢å•æ ‡å‡†æ¨¡æ¿å¤åˆ¶
 *
 * @author zhuo
 * @since 2024-11-05
 */
@Mapper
public interface InsOrderStandardTemplateMapper extends BaseMapper<InsOrderStandardTemplate> {

}


 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductResultMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.ruoyi.inspect.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.pojo.InsProductResult;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @author Administrator
 * @description é’ˆå¯¹è¡¨ã€ins_product_result(检验项目的结果)】的数据库操作Mapper
 * @createDate 2024-03-28 10:29:37
 * @Entity com.yuanchu.mom.pojo.InsProductResult
 */
public interface InsProductResultMapper extends BaseMapper<InsProductResult> {

    List<InsProductResult> selDetail(@Param("ips") List<Integer> ips);

    /**
     * æ ¹æ®è®¢å•id查询检验结果
     * @param orderId
     * @return
     */
    List<InsProductResult> selectResultByOrderId(Integer orderId);
}





 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.inspect.mapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.inspect.dto.UnPassPageDto;
import com.ruoyi.inspect.pojo.InsUnPass;

/**
 * @author æœ±ä½³å‰
 * @date 2024/5/8 13:05
 */
public interface InsUnPassMapper extends BaseMapper<InsUnPass> {
    IPage<UnPassPageDto> pageInsUnPass(IPage<UnPassPageDto> page, QueryWrapper<UnPassPageDto> ew);
}

 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedRetestResultMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.inspect.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.pojo.InsUnqualifiedRetestResult;
import org.apache.ibatis.annotations.Mapper;

/**
 * ä¸åˆæ ¼å¤æµ‹æ£€éªŒé¡¹ç›®çš„结果
 *
 * @author zhuo
 * @since 2024-09-03
 */
@Mapper
public interface InsUnqualifiedRetestResultMapper extends BaseMapper<InsUnqualifiedRetestResult> {

}


 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderDeviceRecordService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.inspect.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.pojo.InsOrderDeviceRecord;

/**
 * @Author zhuo
 * @Date 2024/12/22
 */
public interface InsOrderDeviceRecordService extends IService<InsOrderDeviceRecord> {
}

 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderFactoryVerifyItemService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.inspect.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerifyItem;

/**
 * åŽŸææ–™åŽ‚家进货验证检验项
 *
 * @author zhuo
 * @since 2024-09-26
 */
public interface InsOrderFactoryVerifyItemService extends IService<InsOrderFactoryVerifyItem> {

}


 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderFileService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.inspect.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.pojo.InsOrderFile;

/**
 * <p>
 * æ£€éªŒå•ä¸‹çš„附件列表 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-06-06 10:08:21
 */
public interface InsOrderFileService extends IService<InsOrderFile> {

}

 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
package com.ruoyi.inspect.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.inspect.dto.InsOrderPlanDTO;
import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
import com.ruoyi.inspect.vo.InsOrderPlanVO;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
import java.util.Map;

/**
 * æ£€éªŒä»»åŠ¡-业务层
 */
public interface InsOrderPlanService {
    IPage<InsOrderPlanVO> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO);

    IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO);

    boolean claimInsOrderPlan(InsOrderPlanDTO entity);

    void saveInsContext(Map<String, Object> insContext,Integer currentTable,Integer sampleId,Integer orderId,String sonLaboratory);

    Map<String, Object> doInsOrder(Integer id, String laboratory);

    int upPlanUser(Integer userId, Integer orderId,String sonLaboratory);

    int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode);

    List<InsProduct> getInsProduct(InsOrderPlanProductDto insOrderPlanProductDto);

    List<String> checkSubmitPlan(Integer orderId, String laboratory);

    IPage<InsOrderFile> getFileList(Page page, InsOrderFile insOrderFile);

    int uploadFile(Integer orderId, MultipartFile file);


    List<String> upPlanUser2(Integer orderId);

    int rawMaterialVerifyPlan(Integer orderId, String laboratory, Integer type, String tell, Integer userId);

    /**
     * ç”µç¼†é…ç½®. æŸ¥çœ‹æ ‡è¯†
     * @param id
     * @param laboratory
     * @return
     */
    List<Map<String, Object>> getCableTag(Integer id, String laboratory);

    /**
     * åŽŸææ–™æŸ¥çœ‹æ ‡è¯†
     * @param id
     * @param laboratory
     * @return
     */
    List<Map<String, Object>> getRawMaterialTag(Integer id, String laboratory);

    /**
     * æŸ¥çœ‹é‡å¤æ ‡è¯†
     * @param id
     * @param laboratory
     * @return
     */
    List<Map<String, Object>> getRepetitionTag(Integer id, String laboratory, String cableTag);

    /**
     * èŽ·å–不合格数据
     * @return
     */
    List<InsProduct> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto);

    /**
     * æ–°å¢žä¸åˆæ ¼å¤æµ‹å†…容给
     * @param ids
     * @return
     */
    boolean addDisqualificationRetest(List<Integer> ids);

    /**
     * èŽ·å–不合格复测数据
     * @param id
     * @param type
     * @param laboratory
     * @param cableTag
     * @param rawMaterialTag
     * @param retestTag
     * @return
     */
    List<InsProduct> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag);

    /**
     * ä¿å­˜ä¸åˆæ ¼å¤æµ‹æ£€éªŒå†…容
     */
    void saveUnqualifiedContext(Map<String, Object> insContext,Integer currentTable,Integer currentSampleId,Integer orderId,String sonLaboratory);

    /**
     * æŸ¥è¯¢åŽŸææ–™è¿›è´§éªŒè¯
     * @param insOrderId
     * @return
     */
    InsOrderFactoryVerify getFactoryVerify(Integer insOrderId);

    /**
     * ä¿å­˜åŽŸææ–™è¿›è´§éªŒè¯
     * @param factoryVerify
     * @return
     */
    boolean addFactoryVerify(InsOrderFactoryVerify factoryVerify);


    /**
     * ç”Ÿæˆpd临时
     * @param path
     * @return
     */
    String wordToPdfTemp(String path);
}

 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderStandardTemplateService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.inspect.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.pojo.InsOrderStandardTemplate;

/**
 * è®¢å•æ ‡å‡†æ¨¡æ¿å¤åˆ¶
 *
 * @author zhuo
 * @since 2024-11-05
 */
public interface InsOrderStandardTemplateService extends IService<InsOrderStandardTemplate> {

}


 inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnPassService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.inspect.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.dto.UnPassPageDto;
import com.ruoyi.inspect.pojo.InsUnPass;

import java.util.Map;

/**
 * @author æœ±ä½³å‰
 * @date 2024/5/8 13:00
 */
public interface InsUnPassService extends IService<InsUnPass> {

    IPage<UnPassPageDto> pageInsUnPass(Page page, UnPassPageDto unPassPageDto);
}

 inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedRetestProductService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.inspect.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct;

/**
 * ä¸åˆæ ¼æ£€éªŒé¡¹ç›®å¤æµ‹
 *
 * @author zhuo
 * @since 2024-09-03
 */
public interface InsUnqualifiedRetestProductService extends IService<InsUnqualifiedRetestProduct> {

}


 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderDeviceRecordServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.inspect.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.inspect.mapper.InsOrderDeviceRecordMapper;
import com.ruoyi.inspect.pojo.InsOrderDeviceRecord;
import com.ruoyi.inspect.service.InsOrderDeviceRecordService;
import org.springframework.stereotype.Service;

/**
 * @Author zhuo
 * @Date 2024/12/22
 */
@Service
public class InsOrderDeviceRecordServiceImpl extends ServiceImpl<InsOrderDeviceRecordMapper, InsOrderDeviceRecord> implements InsOrderDeviceRecordService {
}

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderFactoryVerifyItemServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.inspect.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.inspect.mapper.InsOrderFactoryVerifyItemMapper;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerifyItem;
import com.ruoyi.inspect.service.InsOrderFactoryVerifyItemService;
import org.springframework.stereotype.Service;

/**
 * åŽŸææ–™åŽ‚家进货验证检验项
 *
 * @author zhuo
 * @since 2024-09-26
 */
@Service
public class InsOrderFactoryVerifyItemServiceImpl extends ServiceImpl<InsOrderFactoryVerifyItemMapper, InsOrderFactoryVerifyItem> implements InsOrderFactoryVerifyItemService {

}


 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderFileServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.inspect.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.inspect.mapper.InsOrderFileMapper;
import com.ruoyi.inspect.pojo.InsOrderFile;
import com.ruoyi.inspect.service.InsOrderFileService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * æ£€éªŒå•ä¸‹çš„附件列表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-06-06 10:08:21
 */
@Service
public class InsOrderFileServiceImpl extends ServiceImpl<InsOrderFileMapper, InsOrderFile> implements InsOrderFileService {

}

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java

¶Ô±ÈÐÂÎļþ
ÎļþÌ«´ó

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderStandardTemplateServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.inspect.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.inspect.mapper.InsOrderStandardTemplateMapper;
import com.ruoyi.inspect.pojo.InsOrderStandardTemplate;
import com.ruoyi.inspect.service.InsOrderStandardTemplateService;
import org.springframework.stereotype.Service;

/**
 * è®¢å•æ ‡å‡†æ¨¡æ¿å¤åˆ¶
 *
 * @author zhuo
 * @since 2024-11-05
 */
@Service
public class InsOrderStandardTemplateServiceImpl extends ServiceImpl<InsOrderStandardTemplateMapper, InsOrderStandardTemplate> implements InsOrderStandardTemplateService {

}


 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnPassServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.ruoyi.inspect.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.dto.UnPassPageDto;
import com.ruoyi.inspect.mapper.InsUnPassMapper;
import com.ruoyi.inspect.pojo.InsUnPass;
import com.ruoyi.inspect.service.InsUnPassService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

/**
 * @author æœ±ä½³å‰
 * @date 2024/5/8 13:02
 */
@Service
public class InsUnPassServiceImpl extends ServiceImpl<InsUnPassMapper, InsUnPass> implements InsUnPassService {

    @Resource
    private InsUnPassMapper insUnPassMapper;

    @Override
    public IPage<UnPassPageDto> pageInsUnPass(Page page, UnPassPageDto unPassPageDto) {
        return insUnPassMapper.pageInsUnPass(page, QueryWrappers.queryWrappers(unPassPageDto));
    }
}

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedRetestProductServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.inspect.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.inspect.mapper.InsUnqualifiedRetestProductMapper;
import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct;
import com.ruoyi.inspect.service.InsUnqualifiedRetestProductService;
import org.springframework.stereotype.Service;

/**
 * ä¸åˆæ ¼æ£€éªŒé¡¹ç›®å¤æµ‹
 *
 * @author zhuo
 * @since 2024-09-03
 */
@Service
public class InsUnqualifiedRetestProductServiceImpl extends ServiceImpl<InsUnqualifiedRetestProductMapper, InsUnqualifiedRetestProduct> implements InsUnqualifiedRetestProductService {

}


 inspect-server/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.inspect.mapper.InsOrderDeviceRecordMapper">

    <!-- è®¢å•id查询设备使用记录 -->
    <select id="selectDeviceNumber" resultType="com.ruoyi.inspect.dto.InsOrderDeviceRecordDto">
        select dr.*,
               d.management_number
        from device_record dr
                 left join device d on d.id = dr.device_id
        where dr.ins_order_id = #{insOrderId}
    </select>

    <!-- æ ¹æ®ç¼–号查询设备id -->
    <select id="selectDeviceIdsByNumbers" resultType="java.lang.Integer">
        select id
        from device
        where management_number in
        <foreach collection="deviceNumbers" index="index" open="(" separator="," close=")" item="val">
            #{val}
        </foreach>
    </select>
</mapper>

 inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.inspect.mapper.InsOrderFileMapper">
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <select id="getFileList" resultType="com.ruoyi.inspect.pojo.InsOrderFile">
        select A.*
        from (select iof.*, name
              from ins_order_file iof
                       left join user u on iof.create_user = u.id
              where iof.ins_order_id = #{insOrderId}) A
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
</mapper>

 inspect-server/src/main/resources/mapper/InsProductResultMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.inspect.mapper.InsProductResultMapper">
    <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.InsProductResult">
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="insProductId" column="ins_product_id" jdbcType="INTEGER"/>
        <result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
        <result property="comValue" column="com_value" jdbcType="VARCHAR"/>
        <result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <select id="selDetail" resultMap="BaseResultMap">
        select *
        from ins_product_result
        where 1=1
            <!--and ins_product_id in (#{ips})-->
        <if test="ips != null and ips.size() > 0">
            <!-- ä½¿ç”¨foreach元素构建IN子句 -->
            and ins_product_id in
            <foreach item="item" collection="ips" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
    </select>

    <!-- æ ¹æ®è®¢å•id查询检验结果 -->
    <select id="selectResultByOrderId" resultType="com.ruoyi.inspect.pojo.InsProductResult">
        select ipr.equip_value
        from ins_product_result ipr
                 left join ins_product ip on ip.id = ipr.ins_product_id
                 left join ins_sample is2 on is2.id = ip.ins_sample_id
        where is2.ins_order_id = #{orderId}
    </select>
</mapper>

 inspect-server/src/main/resources/mapper/InsUnPassMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.inspect.mapper.InsUnPassMapper">

    <select id="pageInsUnPass" resultType="com.ruoyi.inspect.dto.UnPassPageDto">
        SELECT * FROM
            ins_un_pass iu
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
</mapper>

 performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml

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

    <select id="performanceShiftPage" resultMap="performanceShiftPageMap">
        SELECT
        u2.name name,
        GROUP_CONCAT(s.work_time, '：', s.shift, '：', s.id order by s.work_time SEPARATOR ';') AS shift_time, u2.id user_id
        FROM performance_shift s
        LEFT JOIN (SELECT distinct u.* from
@@ -62,6 +63,7 @@

    <select id="performanceShiftYear" resultType="java.util.Map">
        SELECT
        u2.name name,
        s.user_id, u2.account,
        DATE_FORMAT(s.work_time, '%c') work_time,
        GROUP_CONCAT(DATE_FORMAT(s.work_time, '%c'), '：', s.shift order by s.work_time SEPARATOR ';') month_str
@@ -90,6 +92,7 @@

    <select id="performanceShiftYearList" resultType="map">
        SELECT
        u.name name,
        s.user_id, u.account,
        DATE_FORMAT(s.work_time, '%c') work_time,
        GROUP_CONCAT(DATE_FORMAT(s.work_time, '%c'), '：', s.shift order by s.work_time SEPARATOR ';') month_str
@@ -111,7 +114,8 @@

    <select id="performanceShiftList" resultMap="performanceShiftPageMap">
        SELECT
        GROUP_CONCAT(s.work_time, '：', s.shift, '：', s.id order by s.work_time SEPARATOR ';') AS shift_time, u.id user_id, u.department
        u.name name,
        GROUP_CONCAT(s.work_time, '：', s.shift, '：', s.id order by s.work_time SEPARATOR ';') AS shift_time, u.id user_id
        FROM performance_shift s
        LEFT JOIN user u on u.id = s.user_id
        <where>