Commit d771c271 authored by chenzhao's avatar chenzhao

Merge branch 'develop_dl_3.7.0.8' of http://39.98.45.134:8090/moa/amos-boot-biz…

Merge branch 'develop_dl_3.7.0.8' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_3.7.0.8
parents 255839a8 e070fbae
...@@ -1302,8 +1302,8 @@ ...@@ -1302,8 +1302,8 @@
<select id="getCheckMissedEquipInfo" resultType="Map"> <select id="getCheckMissedEquipInfo" resultType="Map">
SELECT SELECT
cl.category_name AS equipName, cl.`name` AS equipName,
cl.building_name AS equipPosition, cl.address AS equipPosition,
'漏检' AS result, '漏检' AS result,
cl.data_source_name AS remark cl.data_source_name AS remark
FROM FROM
...@@ -1318,8 +1318,8 @@ ...@@ -1318,8 +1318,8 @@
<select id="getCheckQualifiedEquipInfo" resultType="Map"> <select id="getCheckQualifiedEquipInfo" resultType="Map">
SELECT SELECT
cl.category_name AS equipName, cl.`name` AS equipName,
cl.building_name AS equipPosition, cl.address AS equipPosition,
pii.name AS checkItem, pii.name AS checkItem,
'合格' AS result, '合格' AS result,
pc.check_time AS checkDate, pc.check_time AS checkDate,
...@@ -1337,8 +1337,8 @@ ...@@ -1337,8 +1337,8 @@
<select id="getCheckNotQualifiedEquipInfo" resultType="Map"> <select id="getCheckNotQualifiedEquipInfo" resultType="Map">
SELECT SELECT
cl.category_name AS equipName, cl.`name` AS equipName,
cl.building_name AS equipPosition, cl.address AS equipPosition,
pii.name AS checkItem, pii.name AS checkItem,
'不合格' AS result, '不合格' AS result,
pc.check_time AS checkDate, pc.check_time AS checkDate,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment