修改委托信息

Fixiaobai

2023-08-31 bb79df40aa4c1c80f294f2d1965304a3215744cb

修改委托信息

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java

@@ -139,6 +139,10 @@
        Object object = RedisUtil.get(token);
        Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
        LinkDetection linkDetection = linkDetectionMapper.selectById(inspectionVo.getId());
        inspectionVo.setMcode(linkDetection.getSampleNumber());
        inspectionVo.setExperiment(linkDetection.getExperiment());
        inspectionVo.setSpecificationId(linkDetection.getSpecificationsModels());
        inspectionVo.setUnit(linkDetection.getUnit());
        return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
    }


 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java

@@ -100,4 +100,9 @@
    @JsonSerialize
    @NotNull(message = "检验项目版本不能为空")
    private Integer version;

    /**
     * 型号id
     */
    private String specificationId;
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java

@@ -159,7 +159,12 @@
        inspectionMaterialMapper.insert(inspectionMaterial);
        /*新增检验项目表*/
        //根据样品名称编号以及型号规格获取型号id
        Integer specificationId = getSpecificationId(inspectionVo.getName(), inspectionVo.getMcode(), inspectionVo.getSpecifications());
        Integer specificationId = null;
        if(ObjectUtils.isNotEmpty(inspectionVo.getSpecificationId())){
            specificationId =Integer.parseInt(inspectionVo.getSpecificationId());
        }else{
            specificationId=getSpecificationId(inspectionVo.getName(), inspectionVo.getMcode(), inspectionVo.getSpecifications());
        }
        //如果试验项目字段不为空则按该字段的项目进行匹配
        if (ObjectUtils.isNotEmpty(inspectionVo.getExperiment())) {
            //获取试验项目信息(结构,导线外径)

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java

@@ -23,6 +23,7 @@

import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;

/**
@@ -57,17 +58,28 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public String addLinkBasicInformation(LinkBasicInformation linkBasicInformation) {
        System.out.println(linkBasicInformation.getLinkDetectionList());
        QueryWrapper<LinkBasicInformation> queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda().select(LinkBasicInformation::getId).eq(LinkBasicInformation::getUid, linkBasicInformation.getUid());
        LinkBasicInformation linkBasicInformation1 = linkBasicInformationMapper.selectOne(queryWrapper);
        Optional<Integer> optionalId = Optional.ofNullable(linkBasicInformation1)
                .map(LinkBasicInformation::getId);
        AtomicBoolean b=new AtomicBoolean(true);
        optionalId.ifPresent(l->{
            //执行删除
            linkDetectionMapper.deleteByLinkbasic(linkBasicInformation1.getId());
            linkBasicInformationMapper.deleteByID(linkBasicInformation1.getId());
            QueryWrapper<LinkDetection>queryWrapperLd = new QueryWrapper<>();
            queryWrapperLd.lambda().select(LinkDetection::getInspectionStatus).eq(LinkDetection::getLinkBasicId,linkBasicInformation1.getId());
            List<LinkDetection> linkDetections = linkDetectionMapper.selectList(queryWrapperLd).stream().filter(ld->ld.getInspectionStatus()==2).collect(Collectors.toList());
            if(linkDetections.size()<1){
                //执行删除
                linkDetectionMapper.deleteByLinkbasic(linkBasicInformation1.getId());
                linkBasicInformationMapper.deleteByID(linkBasicInformation1.getId());
                b.set(false);
            }else {
                b.set(true);
            }
        });
        if(b.get()){
            return "提交失败，含有已报检样品";
        }
        //委托编号
        String code = MyUtil.getTimeSixNumberCode("SL", "SL");
        linkBasicInformation.setEntrustCoding(code);
@@ -143,10 +155,7 @@
    @Override
    public List<Map<String,Object>> lookProByVer(String name, String mcode, String specifications,Integer version, Integer id) {
        LinkDetection linkDetection = linkDetectionMapper.selectById(id);
        System.out.println(linkDetection);
        List<String> experiments = Arrays.stream(linkDetection.getExperiment().split(",")).collect(Collectors.toList());
        System.out.println(experiments);
        System.out.println("==============================");
        //根据型号id和项目信息查询项目信息
        List<Map<String, Object>> products = new ArrayList<>();
        for (String exper : experiments) {