From e341cd5d33759cf1da2ea8bc7dd9a8c017b91228 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 17:04:42 +0800
Subject: [PATCH] MOM系统-9-09
---
system-run/src/main/resources/application-dev.yml | 2 +-
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 10 ++++++----
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 2 ++
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index f53b6c8..5df5261 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -106,6 +106,8 @@
//鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@Override
public Map<String, Object> selectRawInspectsListById(Integer id) {
+ Map<String, Object> map = rawInspectMapper.selectRawInspectsListById(id);
+ MyUtil.PrintLog(map.toString());
return rawInspectMapper.selectRawInspectsListById(id);
}
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index eae9690..c51a136 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -60,10 +60,10 @@
<!--鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ョ湅璇︽儏-->
<resultMap id="oneMap" type="map">
- <id property="rcode" column="rcode"/>
+ <id property="code" column="rcode"/>
<result property="formTime" column="formTime"/>
<result property="creatTime" column="creatTime"/>
- <result property="rname" column="rname"/>
+ <result property="name" column="rname"/>
<result property="specifications" column="specifications"/>
<result property="runit" column="runit"/>
<result property="number" column="number"/>
@@ -72,7 +72,7 @@
<result property="userName" column="user_name"/>
<collection property="children" resultMap="twoMap" javaType="List"/>
</resultMap>
- <resultMap id="twoMap" type="map">
+ <resultMap id="twoMap" type="Map">
<id property="rpId" column="rpId"/>
<result property="rpName" column="rpName"/>
<result property="rpUnit" column="rpUnit"/>
@@ -80,7 +80,8 @@
<result property="internal" column="internal"/>
<result property="testValue" column="test_value"/>
<result property="testState" column="test_state"/>
- <result property="devName" column="devName"/>
+ <result property="deviceName" column="devName"/>
+ <result property="deviceId" column="deviceId"/>
<result property="uName" column="uName"/>
</resultMap>
@@ -103,6 +104,7 @@
test_value,
test_state,
device.name devName,
+ device.`id` deviceId,
user.name uName
from mom_ocean.raw_ins_product rp
left join mom_ocean.raw_inspect r on rp.raw_inspect_id = r.id
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 7eb7e36..ecbb862 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
logging:
config: classpath:logback-spring.xml
# 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- file-location:
+ file-location: /abc
# 鏁版嵁搴撳浠借矾寰�
backup:
--
Gitblit v1.9.3