Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
YeeAmosFireAutoSysRoot
Commits
8790c862
Commit
8790c862
authored
Mar 20, 2021
by
maoying
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
6e70fc3b
902aedbf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
dbTemplate_alarm.xml
...ysStart/src/main/resources/db/mapper/dbTemplate_alarm.xml
+1
-1
dbTemplate_equipment_specific.xml
...ain/resources/db/mapper/dbTemplate_equipment_specific.xml
+1
-1
dbTemplate_fire_equip.xml
...rt/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
+1
-1
No files found.
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_alarm.xml
View file @
8790c862
...
@@ -105,7 +105,7 @@
...
@@ -105,7 +105,7 @@
END AS type,
END AS type,
wlesa.update_date as createDate,
wlesa.update_date as createDate,
wlesa.recovery_date as recoveryDate,
wlesa.recovery_date as recoveryDate,
wws.full_name
as warehouseStructureName,
CONCAT(IFNULL(wws.full_name,''),' ',IFNULL(wlsd.description,''))
as warehouseStructureName,
(
(
SELECT
SELECT
group_concat(DISTINCT f.`name`)
group_concat(DISTINCT f.`name`)
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml
View file @
8790c862
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
manage.name as system_name
manage.name as system_name
from
from
wl_stock_detail as sto
wl_stock_detail as sto
left join wl_equipment_specific as spe on sto.
qr_code = spe.qr_code
left join wl_equipment_specific as spe on sto.
equipment_specific_id = spe.id
<if
test=
"equipmentId != null and equipmentId!='null' "
>
<if
test=
"equipmentId != null and equipmentId!='null' "
>
left join f_equipment_fire_equipment as fire on spe.id = fire.fire_equipment_id
left join f_equipment_fire_equipment as fire on spe.id = fire.fire_equipment_id
</if>
</if>
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
View file @
8790c862
...
@@ -164,7 +164,7 @@
...
@@ -164,7 +164,7 @@
WHEN 'false' THEN '否'
WHEN 'false' THEN '否'
ELSE ind.value END 'e_value',
ELSE ind.value END 'e_value',
ein.unit as eq_point_unit,
ein.unit as eq_point_unit,
str.full_name
as source_name,
CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,''))
as source_name,
(
(
SELECT
SELECT
group_concat(DISTINCT f.`name`)
group_concat(DISTINCT f.`name`)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment