检验项目接口调整

cuilei

2 天以前 e5f765d4694258dfb36a57014afaca3ebe609e30

检验项目接口调整

 src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java

@@ -1,16 +1,9 @@
package org.jeecg.modules.qms.controller;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
@@ -19,7 +12,6 @@
import org.jeecg.modules.qms.entity.InspectionItem;
import org.jeecg.modules.qms.entity.InspectionTools;
import org.jeecg.modules.qms.service.IInspectionItemService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -78,6 +70,27 @@
        QueryWrapper<InspectionItem> queryWrapper = QueryGenerator.initQueryWrapper(inspectionItem, req.getParameterMap());
        Page<InspectionItem> page = new Page<InspectionItem>(pageNo, pageSize);
        IPage<InspectionItem> pageList = inspectionItemService.page(page, queryWrapper);
        List<InspectionItem> records = pageList.getRecords();
        Set<String> uniqueToolIds = records.stream()
                .map(InspectionItem::getInspectionTools)
                .filter(StringUtils::isNotBlank)
                .flatMap(tools -> Arrays.stream(tools.split(",")))
                .map(String::trim)
                .collect(Collectors.toSet());
        Map<String, String> toolIdNameMap = inspectionToolsService.listByIds(uniqueToolIds).stream()
                .collect(Collectors.toMap(InspectionTools::getId, InspectionTools::getToolName));

        records.forEach(record -> {
            String inspectionTools = record.getInspectionTools();
            if (StringUtils.isNotBlank(inspectionTools)) {
                String toolNames = Arrays.stream(inspectionTools.split(","))
                        .map(String::trim)
                        .map(toolIdNameMap::get)
                        .filter(Objects::nonNull)
                        .collect(Collectors.joining(","));
                record.setInspectionToolNames(toolNames);
            }
        });
        return Result.OK(pageList);
    }
    

 src/main/java/org/jeecg/modules/qms/entity/InspectionItem.java

@@ -1,13 +1,8 @@
package org.jeecg.modules.qms.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
@@ -88,4 +83,9 @@
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    /**测量工具名称*/
    @ApiModelProperty(value = "测量工具名称")
    @TableField(exist = false)
    private String inspectionToolNames;
}