|
@@ -142,8 +142,8 @@
|
|
|
<if test="projectStatus != null and projectStatus != ''">
|
|
|
and project_status = #{projectStatus}
|
|
|
</if>
|
|
|
- <if test="startTime != null "><!-- 开始时间检索 -->
|
|
|
- and date_format(plan_demand_sub_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
|
|
|
+ <if test="beginTime != null "><!-- 开始时间检索 -->
|
|
|
+ and date_format(plan_demand_sub_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
|
|
|
</if>
|
|
|
<if test="endTime != null "><!-- 结束时间检索 -->
|
|
|
and date_format(plan_demand_sub_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
|
|
@@ -172,8 +172,8 @@
|
|
|
<if test="projectStatus != null and projectStatus != ''">
|
|
|
and project_status = #{projectStatus}
|
|
|
</if>
|
|
|
- <if test="startTime != null "><!-- 开始时间检索 -->
|
|
|
- and date_format(plan_demand_sub_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
|
|
|
+ <if test="beginTime != null "><!-- 开始时间检索 -->
|
|
|
+ and date_format(plan_demand_sub_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
|
|
|
</if>
|
|
|
<if test="endTime != null "><!-- 结束时间检索 -->
|
|
|
and date_format(plan_demand_sub_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
|
|
@@ -226,8 +226,8 @@
|
|
|
<if test="projectStatus != null and projectStatus != ''">
|
|
|
AND p.project_status = #{projectStatus}
|
|
|
</if>
|
|
|
- <if test="startTime != null "><!-- 开始时间检索 -->
|
|
|
- and date_format(p.plan_demand_sub_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
|
|
|
+ <if test="beginTime != null "><!-- 开始时间检索 -->
|
|
|
+ and date_format(p.plan_demand_sub_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
|
|
|
</if>
|
|
|
<if test="endTime != null "><!-- 结束时间检索 -->
|
|
|
and date_format(p.plan_demand_sub_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
|