From e7f7daae5d21ad2988cadd25b6987ca5e7ef8001 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 09:51:20 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 3 ++-
standard-server/src/main/resources/mapper/MaterialMapper.xml | 48 ++++++++++++++++++++++++++----------------------
sys/src/main/resources/application-dev.yml | 2 +-
3 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 58bf6cb..a7ad0c4 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -33,11 +33,12 @@
<select id="selectLinkAll" resultType="java.util.Map">
SELECT d.id,
+ l.entrust_coding entrustCoding,
DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
l.`entrusted` supplier,
d.`sample_number` mcode,
d.`sample_name` name,
- d.`specifications_models` specifications,
+ d.`spe_name` specifications,
d.`unit`,
d.`samples_number` num,
d.specifications_models specificationsId,
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 3c1d7a9..7e625a6 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -7,7 +7,7 @@
where state = 1
and type = #{type}
order by create_time desc
- limit #{num1}, #{num2}
+ limit #{num1}, #{num2}
</select>
<select id="selectMaterialById" resultType="Map">
select m.id,
@@ -53,42 +53,46 @@
</resultMap>
<select id="FourTree" resultMap="OneLevelTreeMap">
- SELECT m.`type`, m.`id` materialId, m.`name` materialName, s.id standardId, s.name standardName,
- f.id specificationsId, f.name specificationsName
+ SELECT m.`type`,
+ m.`id` materialId,
+ m.`name` materialName,
+ s.id standardId,
+ s.name standardName,
+ f.id specificationsId,
+ f.name specificationsName
FROM material m
LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s
ON s.material_id = m.`id`
- LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id`, f.`create_time` FROM specifications f WHERE f.`state` = 1) f
+ LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id`, f.`create_time`
+ FROM specifications f
+ WHERE f.`state` = 1) f
ON f.standard_id = s.id
WHERE m.`state` = 1
ORDER BY f.create_time DESC
</select>
<select id="getTreeByMaterialId" resultMap="getTreeById">
- SELECT
- m.id mId,
- m.`name` mName,
- sd.id sdId,
- sd.`name` sdName,
- ss.id ssId,
- ss.`name` ssName
- FROM
- material m,
- standard sd,
- specifications ss
- WHERE
- m.id = sd.material_id
+ SELECT m.id mId,
+ m.`name` mName,
+ sd.id sdId,
+ sd.`name` sdName,
+ ss.id ssId,
+ ss.`name` ssName
+ FROM material m,
+ standard sd,
+ specifications ss
+ WHERE m.id = sd.material_id
AND sd.id = ss.standard_id
AND m.id = #{id}
AND m.state != 0
AND sd.state != 0
AND ss.state !=0
</select>
-<resultMap id="getTreeById" type="map">
- <result property="id" column="mId"/>
- <result property="name" column="mName"/>
- <collection property="children" resultMap="getStan" javaType="List"/>
-</resultMap>
+ <resultMap id="getTreeById" type="map">
+ <result property="id" column="mId"/>
+ <result property="name" column="mName"/>
+ <collection property="children" resultMap="getStan" javaType="List"/>
+ </resultMap>
<resultMap id="getStan" type="map">
<result property="id" column="sdId"/>
<result property="name" column="sdName"/>
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 9c767c3..1ad89a8 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -75,7 +75,7 @@
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
password: null
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
- timeout: 2000
+ timeout: 20
# redis杩炴帴姹犻厤缃�
pool:
# 鏈�澶у彲鐢ㄨ繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
--
Gitblit v1.9.3