From 9b2837d4b844099f3b7536065ada857b136c1c92 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 十二月 2024 15:29:12 +0800
Subject: [PATCH] 电路试验的驻波比csv报告解析2.0(加报告)+撤销项目还需要判断样品下的项目是不是全部都撤销了,如果都撤销了,样品也需要撤销
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java | 13 ++++
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 26 ++++----
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 1
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 1
inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java | 15 +++--
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductUserMapper.java | 4 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 19 ++++--
inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml | 47 ++++++++++-----
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResult2Mapper.java | 5 +
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 2
inspect-server/src/main/resources/mapper/InsProductUserMapper.xml | 10 +++
11 files changed, 98 insertions(+), 45 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResult2Mapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResult2Mapper.java
index 5dda5c7..dcd9a6b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResult2Mapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResult2Mapper.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.pojo.InsProductResult2;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author Administrator
@@ -11,6 +14,8 @@
* @Entity com.yuanchu.mom.pojo.InsProductResult2
*/
public interface InsProductResult2Mapper extends BaseMapper<InsProductResult2> {
+ void saveBatch(@Param("result2s") List<InsProductResult2> result2s);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductUserMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductUserMapper.java
index 4e61db5..c4a66ac 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductUserMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductUserMapper.java
@@ -2,6 +2,9 @@
import com.yuanchu.mom.pojo.InsProductUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author z1292
@@ -11,6 +14,7 @@
*/
public interface InsProductUserMapper extends BaseMapper<InsProductUser> {
+ void saveBatch(@Param("insProductUsers") List<InsProductUser> insProductUsers);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
index 972f6b6..4dd71b4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -60,6 +60,7 @@
//鏌ヨ涓旇繃婊ゅ嚭鏈夌數璺瘯楠岀殑鏍峰搧
List<InsSample> selectSample(Integer insOrderId);
+
}
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 b3db4df..7b7aded 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
@@ -355,7 +355,7 @@
dianLuUtils.readDianLuFile2(sampleId, insOrderFile);
}
} catch (Exception e) {
- System.err.println("闄勪欢涓婁紶閿欒");
+ throw new ErrorException(e.getMessage());
}
return 0;
}
@@ -765,6 +765,8 @@
.in(InsProductResult2::getInsProductId, insProductResultDtos.getInsProductResult2s().stream().map(InsProductResult2::getInsProductId).distinct().collect(Collectors.toList()))
.eq(InsProductResult2::getNum, orderState.getNum())
.eq(InsProductResult2::getFrequency, insProductResultDtos.getFrequency()));
+ List<InsProductResult2> result2s = new ArrayList<>();
+ List<InsProductUser> insProductUsers = new ArrayList<>();
for (InsProductResult2 insProductResult2 : insProductResultDtos.getInsProductResult2s()) {
InsProduct insProduct = new InsProduct();
insProduct.setId(insProductResult2.getInsProductId());//椤圭洰id
@@ -842,10 +844,13 @@
}
result2.setCreateUser(userId);
result2.setUpdateUser(userId);
- insProductResult2Mapper.insert(result2);
- insProduct.setUpdateUser(userId);
- insProductMapper.updateById(insProduct);
- insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+ result2s.add(result2);
+ //insProductResult2Mapper.insert(result2);
+ //insProduct.setUpdateUser(userId);
+ //insProducts.add(insProduct);
+ //insProductMapper.updateById(insProduct);
+ insProductUsers.add(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+ //insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
/*鏇存柊鏍峰搧鐨勬楠岀姸鎬�*/
insSample.setInsState(1);
Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
@@ -861,8 +866,10 @@
//濡傛灉鎵�鏈夐」鐩兘鏈夌粨璁�,閭ｄ箞璇ユ牱鍝佺姸鎬佸凡妫�
insSample.setInsState(2);
}
- insSampleMapper.updateById(insSample);
}
+ insProductResult2Mapper.saveBatch(result2s);
+ insProductUserMapper.saveBatch(insProductUsers);
+ insSampleMapper.updateById(insSample);
/*鍒ゆ柇璇ョ珯鐐圭殑妫�楠岄」鐩槸鍚﹀叏閮ㄥ凡妫�*/
int count = insProductMapper.selectInsProductCountByOrderId(insSample.getInsOrderId());
if (count == 0) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
index 26770d2..d4123f0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
@@ -99,13 +99,24 @@
if (insProducts.stream().map(InsProduct::getId).collect(Collectors.toList()).equals(ids)) {
//濡傛灉璇ユ楠屽崟涓嬬殑鎵�鏈夐」鐩叏閮ㄩ兘鎾ら攢,閭ｄ箞杩欎釜鍗曞瓙涔熼渶瑕佹挙閿�
insOrder.setState(3);
- } else {
+ }
+ else {
List<InsProduct> products = insProductMapper.selectBatchIds(ids);
//棣栧厛鏍规嵁閫夋嫨鐨勯」鐩甶d杩涜鎾ら攢椤圭洰
updateBatchById(products.stream().map(insProduct -> {
insProduct.setState(0);
return insProduct;
}).collect(Collectors.toList()));
+ //濡傛灉璇ユ楠屽崟鏌愪釜鏍峰搧涓嬬殑椤圭洰鍏ㄩ儴閮芥挙閿�浜�,閭ｄ箞杩欎釜鏍峰搧涔熼渶瑕佸垹鎺�
+ List<Integer> sampleIds = products.stream().map(InsProduct::getInsSampleId).distinct().collect(Collectors.toList());
+ for (Integer sampleId : sampleIds) {
+ Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, sampleId)
+ .eq(InsProduct::getState, 1));
+ if(count<=0){
+ insSampleMapper.deleteById(sampleId);
+ }
+ }
}
//insProductMapper.updateInspected(id);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
index 3542482..729e5a6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
@@ -106,14 +106,18 @@
for (String s : list) {
String[] mHzs = s.split("MHz")[0].split("-");
//鍐嶅垽鏂繖涓鐐规槸鍚﹀湪棰戞鐨勮寖鍥村唴
- if (Integer.parseInt(stringListEntry.getKey()) <= Integer.parseInt(mHzs[1]) && Integer.parseInt(stringListEntry.getKey()) >= Integer.parseInt(mHzs[0])) {
+ if (stringListEntry.getKey().equals("700")){
+ insProductResult2.setFrequency("703-803MHz");
+ break;
+ }
+ else if (Integer.parseInt(stringListEntry.getKey()) <= Integer.parseInt(mHzs[1]) && Integer.parseInt(stringListEntry.getKey()) >= Integer.parseInt(mHzs[0])) {
insProductResult2.setFrequency(s);
break;
}
}
- if (ObjectUtils.isEmpty(insProductResult2.getFrequency())) {
- throw new ErrorException("娌℃湁鎵惧埌" + stringListEntry.getKey() + "瀵瑰簲鐨勯娈�");
- }
+ }
+ if (ObjectUtils.isEmpty(insProductResult2.getFrequency())) {
+ throw new ErrorException("娌℃湁鎵惧埌" + stringListEntry.getKey() + "瀵瑰簲鐨勯娈典俊鎭�,璇峰厛閫夋嫨棰戞淇℃伅杩涜淇濆瓨");
}
insProductResult2s.add(insProductResult2);
}
@@ -303,8 +307,7 @@
filteredList.add(result2);
}
}
- System.out.println(filteredList);
- //insProductResult2Service.saveBatch(filteredList);
+ insProductResult2Service.saveBatch(filteredList);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
index 154acef..9b083d5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
@@ -881,8 +881,6 @@
size++;
}
}
-
-
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index dc22aae..8924bde 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -155,7 +155,7 @@
if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")
+ .getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害") && insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);
@@ -163,7 +163,7 @@
if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")
+ .getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害") && insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);
@@ -180,7 +180,7 @@
if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("骞呭害鍋忓樊")
+ .getInspectionItemSubclass().equals("骞呭害鍋忓樊")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
@@ -188,7 +188,7 @@
if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")
+ .getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
@@ -963,7 +963,7 @@
}
}
}
- if (inspectionItemSubclass.contains("浜掕皟") && i > (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) && i <= ((ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + (angles + 1) * portRow * often)) {
+ if (inspectionItemSubclass.contains("浜掕皟") && i > (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) && i <= ((ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + (angles + 1) * portRow * often)) {
ff = (int) ((ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + (angles + 1) * portRow * often);
if (itemSet.add("浜掕皟")) {
index.getAndIncrement();
@@ -1060,7 +1060,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.contains("鏈�澶ц�﹀悎搴�") && i > (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) && i <= ((ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + (angles + 1))) {
+ if (inspectionItemSubclass.contains("鏈�澶ц�﹀悎搴�") && i > (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) && i <= ((ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + (angles + 1))) {
gg = ((ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + (angles + 1));
if (itemSet.add("鏈�澶ц�﹀悎搴�")) {
index.getAndIncrement();
@@ -1153,7 +1153,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.contains("鏈�灏忚�﹀悎搴�") && i > (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) && i <= ((gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) + (angles + 1))) {
+ if (inspectionItemSubclass.contains("鏈�灏忚�﹀悎搴�") && i > (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) && i <= ((gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) + (angles + 1))) {
hh = (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) + (angles + 1);
if (itemSet.add("鏈�灏忚�﹀悎搴�")) {
index.getAndIncrement();
@@ -1246,7 +1246,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
+ if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("骞呭害鍋忓樊")).collect(Collectors.toList());
List<InsProductResult2> result2s = insProductResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -1352,7 +1352,7 @@
}
}
}
- if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
+ if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")).collect(Collectors.toList());
List<InsProductResult2> result2s = insProductResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -2385,7 +2385,7 @@
if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")
+ .getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);
@@ -2393,7 +2393,7 @@
if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")
+ .getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);
@@ -2410,7 +2410,7 @@
if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("骞呭害鍋忓樊")
+ .getInspectionItemSubclass().equals("骞呭害鍋忓樊")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
@@ -2418,7 +2418,7 @@
if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")
+ .getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
diff --git a/inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml b/inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml
index de575c0..883e299 100644
--- a/inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml
@@ -1,23 +1,38 @@
锘�<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsProductResult2Mapper">
-
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProductResult2">
- <id column="id" property="id" />
- <result column="ins_product_id" property="insProductId" />
- <result column="equip_value" property="equipValue" />
- <result column="equip_name" property="equipName" />
- <result column="create_user" property="createUser" />
- <result column="update_user" property="updateUser" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="frequency" property="frequency" />
- <result column="often" property="often" />
- <result column="port" property="port" />
- <result column="angle" property="angle" />
- <result column="value" property="value" />
- <result column="result" property="result" />
+ <id column="id" property="id"/>
+ <result column="ins_product_id" property="insProductId"/>
+ <result column="equip_value" property="equipValue"/>
+ <result column="equip_name" property="equipName"/>
+ <result column="create_user" property="createUser"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="frequency" property="frequency"/>
+ <result column="often" property="often"/>
+ <result column="port" property="port"/>
+ <result column="angle" property="angle"/>
+ <result column="value" property="value"/>
+ <result column="result" property="result"/>
</resultMap>
-
+ <insert id="saveBatch">
+ INSERT INTO ins_product_result_2 (ins_product_id, equip_value, equip_name,
+ frequency, port, angle, value, result, often, num)
+ VALUES
+ <foreach collection="result2s" item="result2" separator=",">
+ ( #{result2.insProductId},
+ #{result2.equipValue},
+ #{result2.equipName},
+ #{result2.frequency},
+ #{result2.port},
+ #{result2.angle},
+ #{result2.value},
+ #{result2.result},
+ #{result2.often},
+ #{result2.num})
+ </foreach>
+ </insert>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsProductUserMapper.xml b/inspect-server/src/main/resources/mapper/InsProductUserMapper.xml
index d04fe31..4f7ad33 100644
--- a/inspect-server/src/main/resources/mapper/InsProductUserMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductUserMapper.xml
@@ -15,4 +15,14 @@
id,create_user,create_time,
ins_product_id
</sql>
+ <insert id="saveBatch">
+ INSERT INTO ins_product_user (create_user, create_time, ins_product_id)
+ VALUES
+ <foreach collection="insProductUsers" item="insProductUser" separator=",">
+ ( #{insProductUser.createUser},
+ #{insProductUser.createTime},
+ #{insProductUser.insProductId}
+ )
+ </foreach>
+ </insert>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 673b974..9ba09f1 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -23,7 +23,6 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
-
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(
select * from(
--
Gitblit v1.9.3