完成检验下单接口联调及自测

zouyu

2025-03-12 47ff9c863e736ff06c39ba44ddfd736c8329a9b7

完成检验下单接口联调及自测

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java

@@ -16,6 +16,7 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -54,7 +55,7 @@
    @Override
    public List<StandardProductList> selectStandardProductList(InsSample1 insSample) {
        String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】
        String[] splits = insSample.getFactory().split(" - ");
        String[] splits = StringUtils.isNotEmpty(insSample.getFactory())?insSample.getFactory().split(" - "):new String[0];
        List<StandardProductList> list = new ArrayList<>();
        if(splits.length<4){
            list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0],"","");
@@ -77,13 +78,12 @@
                }
            }
        }
        String[] split1 = insSample.getFactory().split(" - ");
        //判断长度
        if (split1.length > 4) {
            if (ObjectUtils.isNotEmpty(split1[3])) {
                list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),split1[3])).collect(Collectors.toList());
            }else if (split1[3].isEmpty()) {
                list = list.stream().filter(list1 ->  Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSampleType(),split1[2])).collect(Collectors.toList());
        if (splits.length > 4) {
            if (ObjectUtils.isNotEmpty(splits[3])) {
                list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),splits[3])).collect(Collectors.toList());
            }else if (splits[3].isEmpty()) {
                list = list.stream().filter(list1 ->  Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSampleType(),splits[2])).collect(Collectors.toList());
            }
        }
        list = list.stream().filter(a -> {

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

@@ -85,7 +85,7 @@
    @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 = "查询检验下单内容详情")