新增需求机修改bug

This commit is contained in:
haozq 2026-01-27 17:35:46 +08:00
parent 3110f54278
commit 5639e03b61
7 changed files with 2 additions and 38 deletions

View File

@ -26,6 +26,7 @@
<update id="updateData">
update sj_new_construction_progress set
gx_type=#{gxType},gx=#{gx},plan_start_time=#{planStartTime},in_user=#{inUser},
plan_end_time=#{planEndTime},
in_device=#{inDevice},progress=#{progress}, end_time=#{endTime}, status=#{status},
update_time=now(), remark=#{remark}, project_id=#{bidCode}
where id=#{id}

View File

@ -203,7 +203,7 @@
select tx_type txType,content content,tx_time txTime
from sj_new_async_warn
<where >
data_type=3 and tx_time between #{startTime} and #{endTime}
data_type=3
<if test="bidCode!=null and bidCode!=''">
and project_id=#{bidCode}
</if>

View File

@ -98,7 +98,6 @@
AND status = '3'
</when>
</choose>
ORDER BY create_time ASC
</select>
</mapper>

View File

@ -29,8 +29,6 @@
DATE_FORMAT(jc_time, '%H')
ORDER BY jcTime asc
</select>
<select id="getwarnlist" resultType="com.securitycontrol.screen.domain.SjNewHjjcAnalysis">
SELECT content, tx_time as txTime,tx_type txType
@ -40,13 +38,5 @@
<if test="projectId != null and projectId != ''">
AND project_id = #{projectId}
</if>
<!-- 按开始日期过滤 -->
<if test="startTime != null and startTime != ''">
AND tx_time &gt;= #{startTime}
</if>
<!-- 按结束日期过滤 -->
<if test="endTime != null and endTime != ''">
AND tx_time &lt;= #{endTime}
</if>
</select>
</mapper>

View File

@ -124,9 +124,6 @@
<if test="bidCode!=null and bidCode!=''">
and dev.project_id=#{bidCode}
</if>
<if test="startTime!=null and startTime!=''">
and time between #{startTime} and #{endTime}
</if>
</where>
GROUP BY snfr.dev_name,snfr.remark
ORDER BY errNum desc
@ -138,9 +135,6 @@
measure_data measureData,file_path filePath
FROM sj_new_benefit_analysis
<where>
<if test="startTime!=null and startTime!=''">
and tx_time between #{startTime} and #{endTime}
</if>
<if test="bidCode != null and bidCode != ''">
and project_id = #{bidCode}
</if>
@ -158,11 +152,6 @@
INNER JOIN (
SELECT progress_id, MAX(in_time) AS latest_in_time
FROM sj_new_construction_progress_real
<where>
<if test="startTime!=null and startTime!=''">
and in_time between #{startTime} and #{endTime}
</if>
</where>
GROUP BY progress_id
) t
ON sncr.progress_id = t.progress_id
@ -178,9 +167,6 @@
measure_data measureData,file_path filePath
FROM sj_new_benefit_analysis
<where>
<if test="startTime!=null and startTime!=''">
and tx_time between #{startTime} and #{endTime}
</if>
<if test="bidCode != null and bidCode != ''">
and project_id = #{bidCode}
</if>

View File

@ -120,9 +120,6 @@
FROM sj_new_async_warn
<where>
data_type=2
<if test="startTime!=null and startTime!=''">
and tx_time between #{startTime} and #{endTime}
</if>
<if test="txType != null and txType != ''">
AND tx_type = #{txType}
</if>
@ -140,9 +137,6 @@
FROM sj_new_async_warn
<where>
data_type=2
<if test="startTime!=null and startTime!=''">
and tx_time between #{startTime} and #{endTime}
</if>
<if test="txType != null and txType != ''">
AND tx_type = #{txType}
</if>

View File

@ -51,12 +51,6 @@
<if test="txType != null and txType != ''">
AND tx_type = #{txType}
</if>
<if test="startTestDay != null and startTestDay != ''">
AND tx_time &gt;= #{startTestDay}
</if>
<if test="endTestDay != null and endTestDay != ''">
AND tx_time &lt;= #{endTestDay}
</if>
<if test="projectId != null and projectId != ''">
and project_id = #{projectId}
</if>