2024-4-28 word转pdf完成

Crunchy

2024-04-28 c39517f22b502e2d1ec155beda41162c749f2c26

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

@@ -1,6 +1,5 @@
package com.yuanchu.mom.service.impl;

import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -19,7 +18,6 @@
import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -73,7 +71,7 @@
                standardProductList.setSample(standardTree.getSample());
                standardProductList.setModel(standardTree.getModel());
                standardProductList.setStandardMethodListId(standardMethod.getId());
                standardProductList.setState(1);
                standardProductList.setState(0);
                standardProductList.setId(null);
                standardProductList.setCreateUser(null);
                standardProductList.setCreateTime(null);
@@ -154,12 +152,24 @@
    public void reTreeBySampleType(String sampleType) {
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        CompletableFuture.supplyAsync(() -> {
            //根据样品名称查询所有检测项目参数(能力)
            System.out.println(sampleType);
            List<String> sampleTree = new ArrayList<>();
            if(sampleType != null){
                sampleTree = JSON.parseArray(sampleType, String.class);
            }
            List<StandardProductList> productList = standardTreeMapper.getStandardProductListBySample(sampleType);
            List<StandardProductList> productList1 = JSON.parseArray(JSON.toJSONString(productList), StandardProductList.class);
            List<StandardMethodList> methodList = standardTreeMapper.getStandardMethodListBySample(sampleType);
            List<StandardMethodList> methodList = standardTreeMapper.getStandardMethodListBySample(sampleTree.get(0));
            List<StandardMethodList> methodList1 = JSON.parseArray(JSON.toJSONString(methodList), StandardMethodList.class);
            List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getSampleType, sampleType));
            List<StandardTree> treeList;
            if(sampleTree.size()==1){
                treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getSampleType, sampleTree.get(0)));
                treeList.addAll(standardTreeMapper.selectStandardTreeList2(sampleTree.get(0)));
            }else if(sampleTree.size()==2){
                treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getSampleType, sampleTree.get(0)).eq(StandardTree::getSample, sampleTree.get(1)));
            }else{
                treeList = standardTreeMapper.selectList(null);
            }
            for (StandardTree tree : treeList) {
                String treeStr = tree.getFactory() + " - " + tree.getLaboratory() + " - " + tree.getSampleType() + (tree.getSample() == null ? "" : " - " + tree.getSample()) + (tree.getModel() == null ? "" : " - " + tree.getModel());
                List<StandardMethodList> standardMethodList = JSON.parseArray(JSON.toJSONString(standardMethodListService.selectsStandardMethodByFLSSM(treeStr).get("standardMethodList")), StandardMethodList.class);
@@ -181,6 +191,7 @@
                                        pl2.setUpdateTime(LocalDateTime.now());
                                        pl2.setId(pl1.getId());
                                        pl2.setSample(tree.getSample());
                                        pl2.setDic(pl1.getDic());
                                        //如果标准库里面的要求有值则不更新,要求为null则同步更新
                                        if (ObjectUtils.isNotEmpty(pl1.getAsk())){
                                            pl2.setAsk(null);
@@ -206,7 +217,7 @@
                                    pl2.setSample(tree.getSample());
                                    pl2.setModel(tree.getModel());
                                    pl2.setStandardMethodListId(sl1.getId());
                                    pl2.setState(1);
                                    pl2.setState(0);
                                    pl2.setId(null);
                                    pl2.setCreateUser(null);
                                    pl2.setCreateTime(null);
@@ -240,7 +251,7 @@
                            standardProductList.setSample(tree.getSample());
                            standardProductList.setModel(tree.getModel());
                            standardProductList.setStandardMethodListId(sl2.getId());
                            standardProductList.setState(1);
                            standardProductList.setState(0);
                            standardProductList.setId(null);
                            standardProductList.setCreateUser(null);
                            standardProductList.setCreateTime(null);