Commit 2ca678ee authored by 李秀明's avatar 李秀明

Merge remote-tracking branch 'origin/develop_dl' into develop_dl

parents a981c2e8 feebf096
......@@ -2851,6 +2851,7 @@
AND 30 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) >= 0
</if>
ORDER BY dayNum DESC
</select>
<select id="selectZJEquipmentSpecificWWXByIds" resultType="java.util.Map">
......
......@@ -140,7 +140,8 @@
biz_org_name,
design_org,
design_org_telephone,
lead_designer
lead_designer,
system_describe
)
VALUES(
#{id},
......@@ -171,7 +172,8 @@
#{bizOrgName},
#{designOrg},
#{designOrgTelephone},
#{leadDesigner}
#{leadDesigner},
#{systemDescribe}
)
</insert>
<insert id="insertFile">
......@@ -221,7 +223,8 @@
biz_org_name=#{bizOrgName},
design_org = #{designOrg},
lead_designer = #{leadDesigner},
design_org_telephone = #{designOrgTelephone}
design_org_telephone = #{designOrgTelephone},
system_describe = #{systemDescribe}
where id = #{id}
</update>
<delete id="deleteFilre">
......@@ -6315,7 +6318,7 @@
)
, 0) AS faultEquipNum,
IFNULL(SUM(IF(wlesal.clean_time IS NULL,1,0)), 0) AS unClearNum,
IFNULL(SUM(IF(wlesal.confirm_type IS NOT NULL,1,0)), 0) AS handledNum
IFNULL(SUM(IF(wlesal.clean_time IS NOT NULL,1,0)), 0) AS handledNum
FROM
wl_equipment_specific_alarm_log wlesal
LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, wlesal.system_ids )
......
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