From 36b1e0df911a72aa483944685ada722192ff04c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 05 五月 2024 19:18:37 +0800
Subject: [PATCH] 标准库增加区间设置功能
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 8 ++++----
user-server/src/main/resources/mapper/EnumMapper.xml | 10 +---------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 3 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 8 +++++++-
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 1 -
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index 7f9a25b..32ea873 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -94,7 +94,6 @@
@ApiModelProperty(value = "妫�楠屾鏁�")
private Integer checkoutNumber;
- @ValueTableShow(12)
@ApiModelProperty(value = "鍖洪棿")
private String section;
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 1edd34a..8f9872a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -1,6 +1,5 @@
package com.yuanchu.mom.service.impl;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -92,10 +91,11 @@
List<Device> devices = deviceMapper.selectList(Wrappers.<Device>lambdaQuery().eq(Device::getDeviceStatus, 0).isNotNull(Device::getInsProductIds));
List<Device> devices2 = new ArrayList<>();
for (Device device : devices) {
- List<Integer> ids = JSON.parseArray(device.getInsProductIds(), Integer.class);
- for (Integer i : ids) {
- if (i == id) {
+ String[] ids = device.getInsProductIds().split(",");
+ for (String i : ids) {
+ if (i.equals(id+"")) {
devices2.add(device);
+ break;
}
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index ebbc99a..144fbff 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -241,8 +241,14 @@
}
insSampleMapper.updateById(insSample);
});
- return null;
+ return insContext.keySet().stream().findFirst().orElse(null);
}).thenAccept(res -> {
+ if(res!=null){
+ int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
+ // TODO: 2024/5/4 闇�瑕侀�氳繃pid鑾峰彇妫�楠屽崟褰撳墠璇曢獙瀹ゆ墍鏈夐」鐩槸鍚︽湁妫�楠岀粨鏋滃悗杩涜鍒ゆ柇妫�楠屽崟鏄惁鏇存敼鎴愨�滃凡妫�鈥濈姸鎬�
+// InsProduct insProduct = insProductMapper.selectById(pId);
+// insSampleMapper.selectList(Wrappers.<>)
+ }
}).exceptionally(e -> {
e.printStackTrace();
return null;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index f3a44c8..12c55aa 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -117,6 +117,9 @@
if(sp.getManHour()!=null&&!sp.getManHour().equals("")){
pl.setManHour(sp.getManHour());
}
+ if(sp.getSection()!=null&&!sp.getSection().equals("")){
+ pl.setSection(sp.getSection());
+ }
break;
}
}
diff --git a/user-server/src/main/resources/mapper/EnumMapper.xml b/user-server/src/main/resources/mapper/EnumMapper.xml
index 9920a55..67d1afa 100644
--- a/user-server/src/main/resources/mapper/EnumMapper.xml
+++ b/user-server/src/main/resources/mapper/EnumMapper.xml
@@ -14,12 +14,6 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,label,value,
- create_user,create_time,update_user,
- update_time
- </sql>
-
<select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums">
select * from (
select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
@@ -33,10 +27,8 @@
</select>
<select id="selectEnumByCategory" resultType="com.yuanchu.mom.pojo.Enums">
- select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
+ select e.id,e.category,e.label,e.value,e.order_num,e.type
from enums e
- left join user u2 on u2.id = e.create_user
- left join user u3 on u3.id = e.update_user
where e.category=#{category}
</select>
</mapper>
--
Gitblit v1.9.3