From b8045b11ca8af95cb5aeba464bff589e0b9f53b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 五月 2024 18:08:13 +0800
Subject: [PATCH] 光纤配置三层架构+辅助工时的审核与批准逻辑修改
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
index 7fe1161..ffb0d47 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
@@ -1,10 +1,13 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.PageTestObjectDto;
+import com.yuanchu.mom.dto.TestItemDto;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.StructureItemParameterMapper;
import com.yuanchu.mom.mapper.StructureTestObjectMapper;
import com.yuanchu.mom.pojo.StructureItemParameter;
@@ -15,6 +18,7 @@
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -45,7 +49,11 @@
@Override
public int addItemParameter(StructureItemParameter itemParameter) {
- return structureItemParameterMapper.insert(itemParameter);
+ if (itemParameter.getBsm().equals("")||itemParameter.getBsm()==null){
+ itemParameter.setBsm("0");
+ }
+ int insert = structureItemParameterMapper.insert(itemParameter);
+ return insert;
}
@Override
@@ -70,7 +78,10 @@
@Override
public int addTestObject(StructureTestObject testObject) {
- System.out.println(testObject);
+ Long count = structureTestObjectMapper.selectCount(Wrappers.<StructureTestObject>lambdaQuery().eq(StructureTestObject::getSpecimenName, testObject.getSpecimenName()));
+ if(count.compareTo(0L) > 0){
+ throw new ErrorException("妫�楠屽璞′笉鑳介噸澶�");
+ }
return structureTestObjectMapper.insert(testObject);
}
@@ -83,5 +94,21 @@
public int upTestObject(StructureTestObject testObject) {
return structureTestObjectMapper.updateById(testObject);
}
+
+ @Override
+ public List<StructureTestObject> selectTestObjectByName() {
+ return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName,StructureTestObject::getId));
+ }
+
+ //璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)
+ @Override
+ public List<Map<String, Object>> getInsProduction() {
+ return structureItemParameterMapper.getInsProduction();
+ }
+
+ @Override
+ public List<TestItemDto> getItemTree() {
+ return structureItemParameterMapper.getItemTree();
+ }
}
--
Gitblit v1.9.3