小功能调整

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;
@@ -202,7 +203,9 @@
                    str.setSample(builder.toString());
                }
                str.setInspectionItem(list1.get(4).toString());
                if (list1.get(5) != null) {
                str.setInspectionItemEn(list1.get(5).toString());
                }
                if (list1.get(6) == null) {
                    str.setInspectionItemSubclass(null);
                } else {
@@ -216,16 +219,24 @@
                StructureItemParameter db_str;
                if (StringUtils.isEmpty(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)){
                    str.setId(db_str.getId());