检验任务代码迁移2

zouyu

2025-03-14 f50ebfa99b322690788a3c5cb4e5d8337acdbc64

检验任务代码迁移2

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

@@ -36,14 +36,14 @@

    @ApiOperation(value = "动态获取tab表头")
    @GetMapping("/getTabHeader")
    public Result<?> getTabHeader(@RequestParam("sonLaboratory") String sonLaboratory, @RequestParam("samples") String samples) {
    public Result<?> getTabHeader(@RequestParam("sonLaboratory") String sonLaboratory, String samples) {
        return Result.success(insOrderPlanService.getTabHeader(sonLaboratory, samples));
    }

    @ApiOperation(value = "查看结果按钮")
    @GetMapping("/getInsOrderPlanList")
    public Result getInsOrderPlanList(@RequestBody Map<String, Object> data) {
        return Result.success(insOrderPlanService.getInsOrderPlanList(data));
    @PostMapping("/getInsOrderPlanList")
    public Result getInsOrderPlanList(@RequestBody QueryResultDTO queryResultDTO) {
        return Result.success(insOrderPlanService.getInsOrderPlanList(queryResultDTO));
    }

    @ApiOperation(value = "导出委托费用")
@@ -59,8 +59,8 @@
    }

    @ApiOperation(value = "导出查看检验结果Excel")
    @GetMapping("/exportInsOrderPlanResult")
    public void exportInsOrderPlanResult(Map<String, Object> data, HttpServletResponse response) {
    @PostMapping("/exportInsOrderPlanResult")
    public void exportInsOrderPlanResult(@RequestBody QueryResultDTO data, HttpServletResponse response) {
        insOrderPlanService.exportInsOrderPlanResult(data, response);
    }


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

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

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

import java.io.Serializable;
import java.util.List;

/**
 * æ£€éªŒä»»åŠ¡-查看结果查询传输对象dto
 */
@Data
public class QueryResultDTO implements Serializable {

    /**
     * æ£€éªŒäºº
     */
    @ApiModelProperty("检验人")
    private String createUser;

    /**
     * å§”托编号
     */
    @ApiModelProperty("委托编号")
    private String entrustCode;

    /**
     * è¡¨å¤´æ•°æ®
     */
    @ApiModelProperty("表头数据")
    private String headerS;

    /**
     * æ—¶é—´èŒƒå›´
     */
    @ApiModelProperty("时间范围")
    private List<String> insTime;

    /**
     * æ ·å“ç¼–号
     */
    @ApiModelProperty("样品编号")
    private String sampleCode;

    /**
     * æ ·å“å¤§ç±»
     */
    @ApiModelProperty("样品大类")
    private String sampleType;

    /**
     * å­è¯•éªŒå®¤
     */
    @ApiModelProperty("子试验室")
    private String sonLaboratory;



}

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

@@ -30,15 +30,15 @@

    int updateInspected(@Param("id") Integer id);

    List<InsProduct> selectFiberInsProduct(List<Integer> ids, String laboratory);
    List<InsProduct> selectFiberInsProduct(@Param("ids")List<Integer> ids, @Param("laboratory")String laboratory);

    IPage<InsProduct> selectNoProducts(Page page, Integer orderId);

    int selectInsProductCountByOrderId(Integer orderId);

    List<InsProduct> findSagTemperatureProducts(Integer sampleId, String inspectionItem);
    List<InsProduct> findSagTemperatureProducts(@Param("sampleId")Integer sampleId, @Param("inspectionItem")String inspectionItem);

    List<InsProductVO> selectProductByOrderId(Integer orderId,String sonLaboratory);
    List<InsProductVO> selectProductByOrderId(@Param("orderId") Integer orderId,@Param("sonLaboratory")String sonLaboratory);

    List<InsProductFiberVO> selectInsProductInsFiberList(Integer sampleId);


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

@@ -2,10 +2,7 @@

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.InsProductResultDTO;
import com.ruoyi.inspect.dto.TasksShowDto;
import com.ruoyi.inspect.dto.UnInsProductsDTO;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrderFile;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
@@ -22,9 +19,9 @@
 */
public interface InsOrderPlanService {

    void exportInsOrderPlanResult(Map<String, Object> data, HttpServletResponse response);
    void exportInsOrderPlanResult(QueryResultDTO data, HttpServletResponse response);

    List<Map<String,Object>> getInsOrderPlanList(Map<String,Object> data);
    List<Map<String,Object>> getInsOrderPlanList(QueryResultDTO queryResultDTO);

    void exportCommissionFees(Map<String, Object> data,HttpServletResponse response);


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

@@ -17,6 +17,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -193,24 +194,18 @@
    @Autowired
    private RabbitTemplate rabbitTemplate;



    private ReentrantLock lock = new ReentrantLock();

    @Resource
    private ThreadPoolTaskExecutor threadPoolTaskExecutor;

    @Override
    public void exportInsOrderPlanResult(Map<String, Object> data, HttpServletResponse response) {
    public void exportInsOrderPlanResult(QueryResultDTO data, HttpServletResponse response) {
        List<Map<String,Object>> dataList = new ArrayList<>();
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            Object o = getTabHeader(data.get("sonLaboratory").toString(), data.get("samples").toString()).get("tableHeader");// èŽ·å–动态表头
            Object o = getTabHeader(data.getSonLaboratory(), data.getSampleType()).get("tableHeader");// èŽ·å–动态表头
            List<Map<String, Object>>  tableHeader = objectMapper.readValue(JSONUtil.toJsonStr(o), new TypeReference<List<Map<String, Object>>>() {
            });// è¡¨å¤´æ•°æ®
            Map<String, Object> table = objectMapper.readValue(JSONUtil.toJsonStr(data.get("trendsTable")), new TypeReference<Map<String, Object>>() {
            });
            List<Map<String, Object>> trendsTable = getInsOrderPlanList(table); // è¡¨æ ¼æ•°æ®
            // è¡¨å¤´æ•°æ®
            List<Map<String, Object>> trendsTable = getInsOrderPlanList(data); // è¡¨æ ¼æ•°æ®
            for (Map<String, Object> trend : trendsTable) {
                Map<String, Object> addMap = new HashMap<>();
                addMap.put("委托单号", trend.get("entrustCode"));
@@ -241,7 +236,7 @@

            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
                    .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                    .registerWriteHandler(new SheetWriteHandlerUtil(data.get("samples").toString(),head.size()))
                    .registerWriteHandler(new SheetWriteHandlerUtil(data.getSampleType(),head.size()))
                    .useDefaultStyle(true).relativeHeadRowIndex(1)
                    .registerWriteHandler(horizontalCellStyleStrategy)
                    .build();
@@ -337,29 +332,28 @@
        return headWriteCellStyle;
    }
    @Override
    public List<Map<String, Object>> getInsOrderPlanList(Map<String,Object> data) {
        String sampleType = data.get("sampleType").toString();
        String sonLaboratory = data.get("sonLaboratory").toString();
        String entrustCode = data.get("entrustCode").toString();
    public List<Map<String, Object>> getInsOrderPlanList(QueryResultDTO data) {
        String sampleType = data.getSampleType();
        String sonLaboratory = data.getSonLaboratory();
        String entrustCode = data.getEntrustCode();
        Integer createUser = null;
        String name = "";
        if(StringUtils.isNotBlank(data.get("createUser").toString())) {
             createUser = Integer.parseInt(data.get("createUser").toString());
        if(StringUtils.isNotBlank(data.getCreateUser())) {
             createUser = Integer.parseInt(data.getCreateUser());
             name = userMapper.selectById(createUser).getName();
        }
        String sampleCode = data.get("sampleCode").toString();
        String sampleCode = data.getSampleCode();
        String startTime = "";
        String endTime = "";
        List<Map<String, Object>> maps = new ArrayList<>();
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            if(StringUtils.isNotBlank(data.get("insTime").toString()) && !Objects.isNull(data.get("insTime"))) {
                List insTime = objectMapper.readValue(JSONUtil.toJsonStr(data.get("insTime")), List.class);
                startTime = insTime.get(0).toString();
                endTime = insTime.get(1).toString();
            if(CollectionUtils.isNotEmpty(data.getInsTime())) {
                startTime = data.getInsTime().get(0);
                endTime = data.getInsTime().get(1);
            }
            // è¡¨å¤´ä¿¡æ¯
            List<Map<String, Object>> headerS = objectMapper.readValue(JSONUtil.toJsonStr(data.get("headerS")), new TypeReference<List<Map<String, Object>>>() {
            List<Map<String, Object>> headerS = objectMapper.readValue(JSONUtil.toJsonStr(data.getHeaderS()), new TypeReference<List<Map<String, Object>>>() {
            });
            // åˆ¤æ–­æ˜¯å¦æ˜¯æ¸©åº¦å¾ªçŽ¯
            if(sampleType.equals("温度循环")) {
@@ -609,7 +603,7 @@
            }
        }

        if (samples.contains("温度循环")){
        if (Objects.nonNull(samples)&&samples.contains("温度循环")){
            addElementToMaps(maps, "循环次数", "inspectionItems");
            addElementToMaps(maps, "温度点", "inspectionItemSubclass");
            addElementToMaps(maps, "衰减系数1310", "attenuationCoefficient1310");
@@ -676,7 +670,7 @@
            }
            insOrderPlanDTO.setUserId(null);
        }
//        QueryWrapper<InsOrderPlanDTO> wrappers = QueryWrappers.queryWrappers(planDTO);
        QueryWrapper<InsOrderPlanDTO> wrappers = QueryWrappers.queryWrappers(new InsOrderPlanDTO());
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(
                page,
                userName,
@@ -687,7 +681,7 @@
                laboratory,
                insOrderPlanDTO.getEntrustCode(),
                insOrderPlanDTO.getInsState(),
                null,
                wrappers,
                insOrderPlanDTO.getSendTimeRange()
                );
        return insOrderPage;