diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewProProgressMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewProProgressMapper.xml index a633199..b561048 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewProProgressMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewProProgressMapper.xml @@ -26,6 +26,7 @@ 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} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjEnergyReductionMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjEnergyReductionMapper.xml index 701fa62..cc65969 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjEnergyReductionMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjEnergyReductionMapper.xml @@ -203,7 +203,7 @@ select tx_type txType,content content,tx_time txTime from sj_new_async_warn - data_type=3 and tx_time between #{startTime} and #{endTime} + data_type=3 and project_id=#{bidCode} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewConstructionProgressMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewConstructionProgressMapper.xml index acae2dc..8ad641f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewConstructionProgressMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewConstructionProgressMapper.xml @@ -98,7 +98,6 @@ AND status = '3' - ORDER BY create_time ASC diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewHjjcAnalysisMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewHjjcAnalysisMapper.xml index 668fa7c..b21b49a 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewHjjcAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewHjjcAnalysisMapper.xml @@ -29,8 +29,6 @@ DATE_FORMAT(jc_time, '%H') ORDER BY jcTime asc - - diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewOverallBenefitsMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewOverallBenefitsMapper.xml index 545495a..afcceab 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewOverallBenefitsMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewOverallBenefitsMapper.xml @@ -124,9 +124,6 @@ and dev.project_id=#{bidCode} - - and time between #{startTime} and #{endTime} - 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 - - and tx_time between #{startTime} and #{endTime} - and project_id = #{bidCode} @@ -158,11 +152,6 @@ INNER JOIN ( SELECT progress_id, MAX(in_time) AS latest_in_time FROM sj_new_construction_progress_real - - - and in_time between #{startTime} and #{endTime} - - 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 - - and tx_time between #{startTime} and #{endTime} - and project_id = #{bidCode} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewProManageMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewProManageMapper.xml index 8797a06..499a009 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewProManageMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjNewProManageMapper.xml @@ -120,9 +120,6 @@ FROM sj_new_async_warn data_type=2 - - and tx_time between #{startTime} and #{endTime} - AND tx_type = #{txType} @@ -140,9 +137,6 @@ FROM sj_new_async_warn data_type=2 - - and tx_time between #{startTime} and #{endTime} - AND tx_type = #{txType} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/sjNewQualityMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/sjNewQualityMapper.xml index 79de992..6297bef 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/sjNewQualityMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/sjNewQualityMapper.xml @@ -51,12 +51,6 @@ AND tx_type = #{txType} - - AND tx_time >= #{startTestDay} - - - AND tx_time <= #{endTestDay} - and project_id = #{projectId}