统计+首页+电路试验提交bug

zss

2024-12-17 aad28a866d7d200e1228f7a5d053348e7f9653a4

统计+首页+电路试验提交bug

 inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java

@@ -24,14 +24,14 @@
    @ValueClassify("统计图表")
    @ApiOperation(value = "查询每日业务统计")
    @GetMapping("/businessStatisticsByDay")
    public Result businessStatisticsByDay(){
        return Result.success(reportService.businessStatisticsByDay());
    public Result businessStatisticsByDay(String startTime,String endTime,String type){
        return Result.success(reportService.businessStatisticsByDay(startTime,endTime,type));
    }
    @ValueClassify("统计图表")
    @ApiOperation(value = "查询检测项目统计")
    @GetMapping("/testProductByDay")
    public Result testProductByDay(){
        return Result.success(reportService.testProductByDay());
    public Result testProductByDay(String startTime,String endTime,String type){
        return Result.success(reportService.testProductByDay(startTime,endTime,type));
    }
    @ValueAuth
    @ApiOperation(value = "查询日历任务图")
@@ -52,4 +52,18 @@
    public Result ScheduleByMe(String date){
        return Result.success(reportService.ScheduleByMe(date));
    }

    @ValueAuth
    @ApiOperation(value = "各站点工时")
    @PostMapping("/manHourByStation")
    public Result manHourByStation(String startTime,String endTime){
        return Result.success(reportService.manHourByStation(startTime,endTime));
    }

    @ValueAuth
    @ApiOperation(value = "各站点工时每个人所占百分比")
    @PostMapping("/manHourByPerson")
    public Result manHourByPerson(String startTime,String endTime){
        return Result.success(reportService.manHourByPerson(startTime,endTime));
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOutputWorkingHoursDto.java

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

import com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours;
import lombok.Data;

@Data
public class AuxiliaryOutputWorkingHoursDto extends AuxiliaryOutputWorkingHours {

    //站点
    private String sonLaboratory;

    private String getSonLaboratoryFromDto(AuxiliaryOutputWorkingHoursDto dto) {
        return dto.getSonLaboratory();
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java

@@ -3,18 +3,16 @@

import com.yuanchu.mom.pojo.Schedule;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

public interface ReportService {

    //每日业务统计
    Map<String,Object> businessStatisticsByDay();
    Map<String,Object> businessStatisticsByDay(String startTime,String endTime,String type);

    //检测项目统计
    Map<String,Object> testProductByDay();
    Map<String,Object> testProductByDay(String startTime,String endTime,String type);

    //首页-->日历任务图
    Map<String,Object> calendarWorkByWeek();
@@ -24,4 +22,10 @@

    //首页-->我的日程
    List<Schedule> ScheduleByMe(String date);

    //首页-->各站点工时
    Map<String,Double> manHourByStation(String startTime,String endTime);

    //首页-->各站点工时每个人所占百分比
    Map<String, Map<String, Double>> manHourByPerson(String startTime, String endTime);
}

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

@@ -1204,7 +1204,7 @@
        insSampleUserMapper.insert(insSampleUser);
        /*生成电路试验的站点报告并上传到附件中*/
        if (submitPlanDto.getLaboratory().equals("电路试验")) {
            //wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
//            wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
            //todo ç”µè·¯ç«™ç‚¹æŠ¥å‘Š æ­£å¼åº“部署放开
            try {
                wordUtils.generateWord(submitPlanDto.getTerm(), orderState);

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java

@@ -6,11 +6,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.AuxiliaryOutputWorkingHoursDto;
import com.yuanchu.mom.dto.CostStatisticsDto;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.ReportService;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
@@ -33,27 +35,55 @@
    private UserMapper userMapper;
    private RoleMapper roleMapper;
    private InsSampleUserMapper insSampleUserMapper;
    private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;

    //每日业务统计
    @Override
    public Map<String, Object> businessStatisticsByDay() {
    public Map<String, Object> businessStatisticsByDay(String startTime,String endTime,String type) {
        DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
        LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
        LocalDateTime oldStart=start  ;
        LocalDateTime oldEnd=end ;
        switch (type){
            case "周":
                oldStart = start.minusDays(7);
                oldEnd = end.minusDays(7);
                break;
            case "月":
                oldStart = start.minusMonths(1);
                oldEnd = end.minusMonths(1);
                break;
            case "å¹´":
                oldStart = start.minusYears(1);
                oldEnd = end.minusYears(1);
                break;
        }
        Map<String, Object> map = new HashMap<>();
        /*任务接收*/
        //今日任务接收
        Long receive = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).apply("DATE(create_time) = CURDATE()"));
        Long receive = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
                .eq(InsOrder::getState, 1)
                .between(InsOrder::getCreateTime, start, end));
        map.put("RECEIVE", receive);
        //昨日任务接收
        Long received = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
        Long received = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
                .eq(InsOrder::getState, 1)
                .between(InsOrder::getCreateTime, oldStart, oldEnd));
        //比例=(今天-昨天)/昨天
        BigDecimal ratio = new BigDecimal(receive - received).divide(new BigDecimal(received == 0 ? 1 : received), 2, BigDecimal.ROUND_HALF_UP);
        map.put("RECEIVE_RATIO", ratio);

        /*任务已完成*/
        //今日任务完成
        Long finishe = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 4).apply("DATE(create_time) = CURDATE()"));
        Long finishe = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
                .eq(InsOrder::getState, 4)
                .between(InsOrder::getCreateTime, start, end));
        map.put("FINISHE", finishe);
        //昨日任务完成
        Long finished = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 4).apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
        Long finished = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
                .eq(InsOrder::getState, 4)
                .between(InsOrder::getCreateTime, oldStart, oldEnd));
        //任务完成比例=(今天-昨天)/昨天
        BigDecimal finishedRatio = new BigDecimal(finishe - finished).divide(new BigDecimal(finished == 0 ? 1 : finished), 2, BigDecimal.ROUND_HALF_UP);
        map.put("FINISHE_RATIO", finishedRatio);
@@ -71,7 +101,7 @@
        /*检测费用*/
        //今日检测费用
        QueryWrapper<CostStatisticsDto> costStatisticsDtoQueryWrappers = new QueryWrapper<>();
        costStatisticsDtoQueryWrappers.eq("create_time", LocalDateTime.now());
        costStatisticsDtoQueryWrappers.between("create_time", start,end);
        IPage<CostStatisticsDto> page = new Page<>();
        page.setSize(-1);
        page.setCurrent(-1);
@@ -83,7 +113,7 @@
        map.put("PRICE", price);
        //昨日检测费用
        QueryWrapper<CostStatisticsDto> costWrappers = new QueryWrapper<>();
        costWrappers.eq("create_time", LocalDateTime.now().minusDays(1));
        costWrappers.between("create_time", oldStart,oldEnd);
        IPage<CostStatisticsDto> dtoIPage = insOrderMapper.selectCostStatistics(page, costWrappers);
        BigDecimal priced = BigDecimal.ZERO;
        for (CostStatisticsDto record : dtoIPage.getRecords()) {
@@ -112,11 +142,13 @@

        /*检测人员*/
        //今日检测人员
        List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery().apply("DATE(create_time) = CURDATE()"));
        List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
                .between(InsProductUser::getCreateTime, start, end));
        long person = insProductUsers.stream().map(InsProductUser::getCreateUser).distinct().count();
        map.put("PERSON", person);
        //昨日检测人员
        List<InsProductUser> insProductUserss = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery().apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
        List<InsProductUser> insProductUserss = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
                .between(InsProductUser::getCreateTime, oldStart, oldEnd));
        long persons = insProductUserss.stream().map(InsProductUser::getCreateUser).distinct().count();
        //比例=(今天-昨天)/昨天
        BigDecimal personRatio = new BigDecimal(person - persons).divide(new BigDecimal(persons == 0 ? 1 : persons), 2, BigDecimal.ROUND_HALF_UP);
@@ -124,14 +156,20 @@

        /*近十日任务接收量与完成量*/
        //获取近十日的横坐标
        LocalDate currentDate = LocalDate.now();
        LocalDate startDate = LocalDate.parse(startTime, format);
        LocalDate endDate = LocalDate.parse(endTime, format);
        List<LocalDate> lastTenDays = new ArrayList<>();
        List<Long> receTenDays = new ArrayList<>();
        List<Long> finTenDays = new ArrayList<>();
        for (int i = 9; i > -1; i--) {
            lastTenDays.add(currentDate.minusDays(i));
            receTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")));
            finTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 4).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")));
        while (!startDate.isAfter(endDate)) {
            lastTenDays.add(startDate);
            receTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
                    .eq(InsOrder::getState, 1)
                    .between(InsOrder::getCreateTime,startDate.atStartOfDay(),startDate.atTime(23,59,59))));
            finTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
                    .eq(InsOrder::getState, 4)
                    .between(InsOrder::getCreateTime,startDate.atStartOfDay(),startDate.atTime(23,59,59))));
            startDate = startDate.plusDays(1);
        }
        map.put("DAYS", lastTenDays);
        map.put("RECETENDAYS", receTenDays);
@@ -141,24 +179,39 @@

    //检测项目统计
    @Override
    public Map<String, Object> testProductByDay() {
    public Map<String, Object> testProductByDay(String startTime,String endTime,String type) {
        DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
        LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
        LocalDateTime oldStart=start  ;
        LocalDateTime oldEnd=end ;
        Map<String, Object> map = new HashMap<>();
        /*项目接收*/
        //今日项目接收量
        Long receive = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).apply("DATE(create_time) = CURDATE()"));
        Long receive = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .between(InsProduct::getCreateTime, start, end));
        map.put("RECEVICE", receive);
        //昨日项目接收量
        Long received = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
        Long received = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .between(InsProduct::getCreateTime, oldStart, oldEnd));
        //比例=(今天-昨天)/昨天
        BigDecimal ratio = new BigDecimal(receive - received).divide(new BigDecimal(received == 0 ? 1 : received), 2, BigDecimal.ROUND_HALF_UP);
        map.put("RECEIVE_RATIO", ratio);

        /*项目完成*/
        //今日项目完成量
        Long finishe = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).isNotNull(InsProduct::getInsResult).apply("DATE(create_time) = CURDATE()"));
        Long finishe = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .isNotNull(InsProduct::getInsResult)
                .between(InsProduct::getCreateTime, start, end));
        map.put("FINISHE", finishe);
        //昨日项目完成量
        Long finished = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).isNotNull(InsProduct::getInsResult).apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
        Long finished = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .isNotNull(InsProduct::getInsResult)
                .between(InsProduct::getCreateTime, oldStart, oldEnd));
        //任务完成比例=(今天-昨天)/昨天
        BigDecimal finishedRatio = new BigDecimal(finishe - finished).divide(new BigDecimal(finished == 0 ? 1 : finished), 2, BigDecimal.ROUND_HALF_UP);
        map.put("FINISHE_RATIO", finishedRatio);
@@ -175,7 +228,10 @@

        /*今日项目合格率*/
        //今日完成量中的合格量/今日完成量
        Long accept = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).eq(InsProduct::getInsResult,1).apply("DATE(create_time) = CURDATE()"));
        Long accept = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .eq(InsProduct::getInsResult, 1)
                .between(InsProduct::getCreateTime, start, end));
        map.put("ACCEPT", accept);
        BigDecimal acceptRate = new BigDecimal(accept).divide(new BigDecimal(finishe == 0 ? 1 : finishe), 2, BigDecimal.ROUND_HALF_UP);
        map.put("ACCEPT_RATE_TODAY", acceptRate);
@@ -192,14 +248,21 @@

        /*近十日的项目接收量与完成量*/
        //获取近十日的横坐标
        LocalDate currentDate = LocalDate.now();
        LocalDate startDate = LocalDate.parse(startTime, format);
        LocalDate endDate = LocalDate.parse(endTime, format);
        List<LocalDate> lastTenDays = new ArrayList<>();
        List<Long> receTenDays = new ArrayList<>();
        List<Long> finTenDays = new ArrayList<>();
        for (int i = 9; i > -1; i--) {
            lastTenDays.add(currentDate.minusDays(i));
            receTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")));
            finTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).isNotNull(InsProduct::getInsResult).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")));
        while (!startDate.isAfter(endDate))  {
            lastTenDays.add(startDate);
            receTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
                    .eq(InsProduct::getState, 1)
                    .between(InsProduct::getCreateTime,startDate.atStartOfDay(),startDate.atTime(23,59,59))));
            finTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
                    .eq(InsProduct::getState, 1)
                    .isNotNull(InsProduct::getInsResult)
                    .between(InsProduct::getCreateTime,startDate.atStartOfDay(),startDate.atTime(23,59,59))));
            startDate = startDate.plusDays(1);
        }
        map.put("DAYS", lastTenDays);
        map.put("RECETENDAYS", receTenDays);
@@ -228,18 +291,19 @@
                    .in(InsOrder::getInsState, insState)
                    .apply("DATE(create_time) = CURDATE() - INTERVAL " + j + " DAY"));
            //如果当前登录人是测试工程师或者是检测组长,需要过滤出检验人是他们的订单或者是还没检验的订单
            if (name.equals("测试工程师") || name.equals("检测组长")){
            if (name.equals("测试工程师") || name.equals("检测组长")) {
                insOrders = insOrders.stream().filter(insOrder -> {
                    List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insOrder.getId()));
                    List<Integer> sampleId = insSamples.stream().map(InsSample::getId).collect(Collectors.toList());
                    List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
                            .in(InsSampleUser::getInsSampleId, sampleId)
                            .eq(InsSampleUser::getState, 0)  //检验人
                            .in(InsSampleUser::getInsSampleId, sampleId));
                    );
                    return insSampleUsers.size() == 0 || insSampleUsers.stream().map(InsSampleUser::getUserId).collect(Collectors.toList()).contains(userId);
                }).collect(Collectors.toList());
            }
            //如果当前登录人是送样员,需过滤出单子的送样员是当前人的订单
            else if (name.equals("送样员")){
            else if (name.equals("送样员")) {
                insOrders = insOrders.stream().filter(insOrder ->
                        ObjectUtils.isNotEmpty(insOrder.getIssueUser()) && insOrder.getIssueUser().equals(userId)
                ).collect(Collectors.toList());
@@ -283,4 +347,55 @@
        LocalDateTime endTime = localDate.plusDays(1).atStartOfDay().minusSeconds(1);
        return scheduleMapper.selectList(Wrappers.<Schedule>lambdaQuery().eq(Schedule::getUserId, userId).between(Schedule::getScheduleTime, startTime, endTime));
    }

    //首页-->各站点的工时
    @Override
    public Map<String, Double> manHourByStation(String startTime, String endTime) {
        DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
        LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
        //查询这个时间内所有的工时
        List<AuxiliaryOutputWorkingHours> auxiliaryOutputWorkingHours = auxiliaryOutputWorkingHoursMapper.selectList(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
                .between(AuxiliaryOutputWorkingHours::getCreateTime, start, end));
        //根据检验项查出来的站点进行分类
        List<AuxiliaryOutputWorkingHoursDto> outputWorkingHoursDtos = auxiliaryOutputWorkingHours.stream().map(auxiliaryOutputWorkingHours1 -> {
            AuxiliaryOutputWorkingHoursDto auxiliaryOutputWorkingHoursDto = new AuxiliaryOutputWorkingHoursDto();
            BeanUtils.copyProperties(auxiliaryOutputWorkingHours1, auxiliaryOutputWorkingHoursDto);
            InsProduct insProduct = insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId());
            auxiliaryOutputWorkingHoursDto.setSonLaboratory(insProduct.getSonLaboratory());
            return auxiliaryOutputWorkingHoursDto;
        }).collect(Collectors.toList());
        Map<String, Double> map = outputWorkingHoursDtos.stream()
                .collect(Collectors.groupingBy(
                        AuxiliaryOutputWorkingHoursDto::getSonLaboratory,
                        Collectors.summingDouble(AuxiliaryOutputWorkingHours::getOutputWorkTime)));
        return map;
    }

    //首页-->各站点工时每个人所占百分比
    @Override
    public Map<String, Map<String, Double>> manHourByPerson(String startTime, String endTime) {
        DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
        LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
        //查询这个时间内所有的工时
        List<AuxiliaryOutputWorkingHours> auxiliaryOutputWorkingHours = auxiliaryOutputWorkingHoursMapper.selectList(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
                .between(AuxiliaryOutputWorkingHours::getCreateTime, start, end));
        //根据检验项查出来的站点进行分类
        List<AuxiliaryOutputWorkingHoursDto> outputWorkingHoursDtos = auxiliaryOutputWorkingHours.stream().map(auxiliaryOutputWorkingHours1 -> {
            AuxiliaryOutputWorkingHoursDto auxiliaryOutputWorkingHoursDto = new AuxiliaryOutputWorkingHoursDto();
            BeanUtils.copyProperties(auxiliaryOutputWorkingHours1, auxiliaryOutputWorkingHoursDto);
            InsProduct insProduct = insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId());
            auxiliaryOutputWorkingHoursDto.setSonLaboratory(insProduct.getSonLaboratory());
            return auxiliaryOutputWorkingHoursDto;
        }).collect(Collectors.toList());
        Map<String, Map<String, Double>> mapMap = outputWorkingHoursDtos.stream()
                .collect(Collectors.groupingBy(
                        AuxiliaryOutputWorkingHoursDto::getSonLaboratory,
                        Collectors.groupingBy(
                                t -> userMapper.selectById(t.getCheck()).getName(),
                                Collectors.summingDouble(AuxiliaryOutputWorkingHours::getOutputWorkTime))));

        return mapMap;
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java

@@ -106,6 +106,7 @@
        InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
        //查询项目
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState,1)
                .eq(InsProduct::getInsSampleId, insSample.getId())
                .eq(InsProduct::getSonLaboratory, "电路试验"));
        //获取最大端口数量,角度数量,频段数量
@@ -2337,6 +2338,7 @@

            //查询项目
            List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                    .eq(InsProduct::getState,1)
                    .eq(InsProduct::getInsSampleId, insSample.getId())
                    .eq(InsProduct::getSonLaboratory, "电路试验"));
            //获取最大端口数量,角度数量,频段数量