小功能调整

value

2024-06-13 00310b8b5bf002f0135ba0b60715b17e5a3da31f

小功能调整

 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java

@@ -8,6 +8,7 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.PageTestObjectDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -172,8 +173,8 @@
        List<StructureItemParameter> lists = new ArrayList<>();
        AtomicReference<String> sample = new AtomicReference<>();
        ExcelUtil.readBySax(inputStream, 0, (i, l, list1) -> {
            if(i == 0 && l == 1){
                sample.set(list1.get(1)+"");
            if (i == 0 && l == 1) {
                sample.set(list1.get(1) + "");
            }
            if (i == 0 && l >= 1) {
                StructureItemParameter str = new StructureItemParameter();
@@ -183,26 +184,28 @@
                    String brand = (String) list1.get(1);
                    StringBuilder builder = new StringBuilder();
                    builder.append("[");
                    if (ObjectUtil.isNotEmpty(list1.get(2))){
                    if (ObjectUtil.isNotEmpty(list1.get(2))) {
                        String production = (String) list1.get(2);
                        if (!production.contains("、")){
                            builder.append(String.format("[\"%s\",\"%s\"]",brand,production));
                        }else{
                            Arrays.stream(production.split("、")).forEach(item->{
                                builder.append(String.format("[\"%s\",\"%s\"],",brand,item));
                        if (!production.contains("、")) {
                            builder.append(String.format("[\"%s\",\"%s\"]", brand, production));
                        } else {
                            Arrays.stream(production.split("、")).forEach(item -> {
                                builder.append(String.format("[\"%s\",\"%s\"],", brand, item));
                            });
                            builder.deleteCharAt(builder.length() - 1);
                        }
                    }else{
                    } else {
                        builder.append("[");
                        builder.append(String.format("\"%s\"",brand));
                        builder.append(String.format("\"%s\"", brand));
                        builder.append("]");
                    }
                    builder.append("]");
                    str.setSample(builder.toString());
                }
                str.setInspectionItem(list1.get(4).toString());
                str.setInspectionItemEn(list1.get(5).toString());
                if (list1.get(5) != null) {
                    str.setInspectionItemEn(list1.get(5).toString());
                }
                if (list1.get(6) == null) {
                    str.setInspectionItemSubclass(null);
                } else {
@@ -214,20 +217,28 @@
                    str.setInspectionItemSubclassEn(String.valueOf(list1.get(7).toString()));
                }
                StructureItemParameter db_str;
                if (StringUtils.isEmpty(str.getInspectionItemSubclass())){
                if (StringUtils.isEmpty(str.getInspectionItemSubclass())) {
                    // æ¯”较两个条件
                    db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
                            .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                            .eq(StructureItemParameter::getSample, str.getSample())
                    );
                }else{
                    db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
                            .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                            .eq(StructureItemParameter::getSample, str.getSample())
                            .eq(StructureItemParameter::getInspectionItemSubclass,str.getInspectionItemSubclass())
                    );
                    try {
                        db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
                                .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                                .eq(StructureItemParameter::getSample, str.getSample())
                        );
                    } catch (Exception e) {
                        throw new ErrorException("重复查询：" + str.getInspectionItem());
                    }
                } else {
                    try {
                        db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
                                .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                                .eq(StructureItemParameter::getSample, str.getSample())
                                .eq(StructureItemParameter::getInspectionItemSubclass, str.getInspectionItemSubclass())
                        );
                    } catch (Exception e) {
                        throw new ErrorException("重复查询：" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
                    }
                }
                if (ObjectUtils.isNotEmpty(db_str)){
                if (ObjectUtils.isNotEmpty(db_str)) {
                    str.setId(db_str.getId());
                }
                if (list1.get(8) == null) {
@@ -299,7 +310,7 @@
                }
                str.setInspectionItemType(jy);
                String validateValueType = list1.get(18).toString();
                if (StringUtils.isNotBlank(validateValueType)){
                if (StringUtils.isNotBlank(validateValueType)) {
                    Enums enums = enumService.getOne(Wrappers.lambdaQuery(Enums.class)
                            .eq(Enums::getCategory, "检验值类型")
                            .eq(Enums::getLabel, validateValueType));

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java

@@ -34,7 +34,7 @@
        map.put("head", PrintChina.printChina(Product.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectProductListByObjectId");
        if(map1.get("look")==1) product.setCreateUser(map1.get("userId"));
        map.put("body", productMapper.selectPage(page, QueryWrappers.queryWrappers(product)));
        map.put("body", productMapper.selectPage(page, QueryWrappers.queryWrappers(product).eq("object_id", product.getObjectId())));
        return map;
    }


 cnas-server/src/main/java/com/yuanchu/mom/service/impl/StructureItemParameterServiceImpl.java

@@ -19,6 +19,6 @@

    @Override
    public void removeNoSample(String sample) {
        structureItemParameterMapper.removeNoSample(sample);
        structureItemParameterMapper.removeNoSample("\""+sample+"\"");
    }
}

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

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

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

import java.util.List;

@Data
public class InsulatingDto {

    private Integer standardMethodListId;

    private Integer num;

    private List<InsProduct> insProduct;

}

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

@@ -15,4 +15,8 @@

    private List<SampleProductDto> childSampleList;

    private InsulatingDto insulating;

    private SheathDto sheath;

}

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

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

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

import java.util.List;

@Data
public class SheathDto {

    private Integer standardMethodListId;

    private List<InsProduct> insProduct;

}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java

@@ -212,4 +212,6 @@
    private Integer insFiberId;

    private Integer insFibersId;

    private Integer standardMethodListId;
}

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

@@ -24,10 +24,7 @@

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

@@ -147,6 +144,22 @@
            if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
                addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
            }
            if(ObjectUtil.isNotEmpty(a.getInsulating())){
                List<InsProduct> ip2 = new ArrayList<>();
                for (Integer i = 0; i < a.getInsulating().getNum(); i++) {
                    ip2.addAll(a.getInsulating().getInsProduct());
                }
                for (InsProduct product : ip2) {
                    product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
                }
                addInsProductMethod(a.getId(), ip2, null, 0);
            }
            if(ObjectUtil.isNotEmpty(a.getSheath())){
                for (InsProduct product : a.getSheath().getInsProduct()) {
                    product.setStandardMethodListId(a.getSheath().getStandardMethodListId());
                }
                addInsProductMethod(a.getId(), a.getSheath().getInsProduct(), null, 0);
            }
            if(ObjectUtil.isNotEmpty(a.getChildSampleList())){
                for (SampleProductDto b : a.getChildSampleList()) {
                    for (int i = 0; i < b.getNum(); i++) {
@@ -188,7 +201,7 @@
                    }
                }
            }
        });
        })  ;
        for (List<Integer> i : pairing) {
            SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0) - 1)), SampleProductDto.class);
            sample.setSampleCode(list.get(i.get(0)-1).getSampleCode() + "/" +list.get(i.get(1)-1).getSampleCode());