From 4ad61e4c257621124625a89853eaa8334a11b0be Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 11:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java | 2
standard-server/src/main/resources/mapper/TechnologyMapper.xml | 2
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 20 +++++----
base-server/src/main/resources/mapper/DeviceMapper.xml | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java | 11 +++++
inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java | 6 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 16 +++++++-
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java | 2
base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml | 3 +
9 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index 9509b45..d3ae2f5 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -30,7 +30,7 @@
</if>
<if test="message!=null and message!=''">
and code like concat('%',#{message},'%')
- or name like concat('%',#{message},'%')
+ or device.name like concat('%',#{message},'%')
</if>
</select>
<!--鏍规嵁璁惧鍒嗙粍鏌ヨ璁惧-->
diff --git a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 1f593da..088dc3b 100644
--- a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -16,7 +16,7 @@
<result property="name" column="father"/>
</resultMap>
<select id="selectAllTechTem" resultMap="selectAllTechTemMap">
- select e.name elname,
+ select e.name elname,
father
from mom_ocean.technology_template t,
mom_ocean.element e,
@@ -24,6 +24,7 @@
where e.id = et.element_id
and t.id = tech_tem_id
and t.state = 1
+ and et.state=1
and type=#{type}
<if test="message!=null and message!=''">
and father like concat('%',#{message},'%')
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
index 0e75f40..9bdff45 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
@@ -57,5 +57,16 @@
rawInsProductService.updaterawInsProduct(userId,rpId,testValue,devId);
return Result.success();
}
+
+ @ApiOperation(value = "鏇存敼璁惧")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "rpId", value = "鍘熸潗鏂欐楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "DevId", value = "璁惧id", dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/updateDevByRpId")
+ public Result updateDevByRpId(Integer rpId ,Integer devId) {
+ rawInsProductService.updateDevByRpId(rpId,devId);
+ return Result.success();
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
index 3b4f62d..7b18939 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
@@ -22,5 +22,11 @@
void updaterawInsProduct(int userId, Integer rpId ,String testValue,Integer devId);
+ /**
+ * 鍙洿鏀硅澶�,涔嬪墠鐨勬楠屽�煎垹鎺�
+ * @param rpId
+ * @param devId
+ */
+ void updateDevByRpId(Integer rpId, Integer devId);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
index b213411..60ef624 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
@@ -39,7 +39,7 @@
* @param id
* @return
*/
- Map<String, Object> selectRawInspectsListById(Integer id);
+ Map<String,Object> selectRawInspectsListById(Integer id);
/**
* 鏇存柊妫�楠岀姸鎬�
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
index 31bc55f..98ea903 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
@@ -8,6 +8,7 @@
import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.service.RawInsProductService;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
@@ -32,7 +33,7 @@
//鏇存柊妫�楠岄」鐩�(濉啓妫�楠屽��,妫�楠岃澶�)
@Override
- public void updaterawInsProduct(int userId,Integer rpId ,String testValue,Integer devId) {
+ public void updaterawInsProduct(int userId, Integer rpId, String testValue, Integer devId) {
RawInsProduct rawInsProduct = rawInsProductMapper.selectById(rpId);
//璧嬪�艰澶�
rawInsProduct.setDeviceId(devId);
@@ -49,7 +50,7 @@
if (list.contains(0)) {
//濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
rawInsProduct.setTestState(0);
- }else {
+ } else {
rawInsProduct.setTestState(1);
}
/*鏇存柊鍘熸潗鏂欐楠岄」鐩〃*/
@@ -60,6 +61,17 @@
rawInspectMapper.updateById(rawInspect);
}
+ //鍙洿鏀硅澶�,涔嬪墠鐨勬楠屽�煎垹鎺�
+ @Override
+ public void updateDevByRpId(Integer rpId, Integer devId) {
+ RawInsProduct rawInsProduct = new RawInsProduct();
+ rawInsProduct.setId(rpId);
+ rawInsProduct.setDeviceId(devId);
+ rawInsProduct.setTestValue(null);
+ rawInsProduct.setTestState(null);
+ rawInsProductMapper.updateById(rawInsProduct);
+ }
+
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index 1c9b84b..eae9690 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -62,6 +62,7 @@
<resultMap id="oneMap" type="map">
<id property="rcode" column="rcode"/>
<result property="formTime" column="formTime"/>
+ <result property="creatTime" column="creatTime"/>
<result property="rname" column="rname"/>
<result property="specifications" column="specifications"/>
<result property="runit" column="runit"/>
@@ -84,24 +85,25 @@
</resultMap>
<select id="selectRawInspectsListById" resultMap="oneMap">
- select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
- r.code rcode,
- r.name rname,
+ select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
+ r.code rcode,
+ r.name rname,
specifications,
- r.unit runit,
+ r.unit runit,
number,
+ DATE_FORMAT(r.create_time, '%Y-%m-%d') creatTime,
supplier,
judge_state,
user_name,
- rp.id rpId,
- rp.name rpName,
- rp.unit rpUnit,
+ rp.id rpId,
+ rp.name rpName,
+ rp.unit rpUnit,
required,
internal,
test_value,
test_state,
- device.name devName,
- user.name uName
+ device.name devName,
+ user.name uName
from mom_ocean.raw_ins_product rp
left join mom_ocean.raw_inspect r on rp.raw_inspect_id = r.id
left join mom_ocean.device
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
index e7d2ba5..a1d1766 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
@@ -58,7 +58,7 @@
@PostMapping("/compile")
public Result compile(Integer id) {
ordersService.compile(id);
- return Result.success("缂栧埗浜у搧"+id+"瀹屾垚!");
+ return Result.success("缂栧埗浜у搧瀹屾垚!");
}
}
diff --git a/standard-server/src/main/resources/mapper/TechnologyMapper.xml b/standard-server/src/main/resources/mapper/TechnologyMapper.xml
index c01980b..b4b32e1 100644
--- a/standard-server/src/main/resources/mapper/TechnologyMapper.xml
+++ b/standard-server/src/main/resources/mapper/TechnologyMapper.xml
@@ -12,7 +12,7 @@
<!--鍙充晶鏁版嵁灞曠ず 宸ヨ壓璺嚎-->
<resultMap id="selectAllTecMap" type="map">
- <id property="name" column="father"/>
+ <id property="father" column="father"/>
<collection property="children" resultMap="selectAllTecMaps" javaType="List"/>
</resultMap>
<resultMap id="selectAllTecMaps" type="map">
--
Gitblit v1.9.3