From 276a147601837be1f738e087b6828f95f33d7d1b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 九月 2023 10:42:11 +0800
Subject: [PATCH] 修改bug4.0 9.9
---
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 20 +++++++++++---------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java | 2 +-
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
index 8d99714..9e52a9b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
@@ -27,7 +27,7 @@
IPage<Map<String, Object>> selectRawInspectsList(Page<Object> page, String formTime, String code, Integer insState, String name);
//鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ョ湅璇︽儏
- List<Map<String, Object>> selectRawInspectsListById(Integer id);
+ Map<String, Object> selectRawInspectsListById(Integer id);
}
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 93976f0..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
*/
- List<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/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index b5ad1d0..ad82f48 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
@@ -105,7 +105,7 @@
//鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@Override
- public List<Map<String, Object>> selectRawInspectsListById(Integer id) {
+ public Map<String, Object> selectRawInspectsListById(Integer id) {
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 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
--
Gitblit v1.9.3