修改巡检计划查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -263,6 +263,12 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 
     @Override
     public Page<HashMap<String, Object>> getPlanTaskInfoNew(PlanTaskPageParam params) {
+        if (StringUtils.isEmpty(params.getBeginDate())) {
+            params.setBeginDate("");
+        }
+        if (StringUtils.isEmpty(params.getEndDate())) {
+            params.setEndDate("");
+        }
         long total = planTaskMapper.countPlanTask(params);
         List<HashMap<String, Object>> content = planTaskMapper.getPlanTaskInfo(params);
         Page<HashMap<String, Object>> result = new PageImpl<HashMap<String, Object>>(content, params, total);

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -24,27 +24,33 @@
 <!--	        )-->
 			<if test="beginDate!=null and endDate!=null and endDate != '' and beginDate != ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
-
 			</if>
+
 			<if test="beginDate=='' and endDate != null and endDate != ''">
 				AND a.end_Time <![CDATA[<=]]> #{endDate}
-
 			</if>
+
 			<if test="beginDate!=null and beginDate != '' and endDate == ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate}
+			</if>
 
+			<if test="beginDate=='' and beginDate != null and endDate == ''">
+				AND a.begin_Time <![CDATA[>=]]> #{beginDate}
 			</if>
 
-		<if test="status!=null"> and b.is_finish  = #{status}</if>
-		<if test="planId!=null"> and a.plan_id = #{planId}</if>
-		<if test="routeId!=null"> and a.route_id = #{routeId}</if>
-		<if test="orgCode!=null">
-		 and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})
-		 </if>
-		<if test="searchDay!=null and searchDay != '' and searchDay == 1">
-		 and a.`check_date` = curdate()
-		</if>
+			<if test="endDate=='' and endDate != null and beginDate == ''">
+				AND a.end_Time <![CDATA[<=]]> #{endDate}
+			</if>
 
+			<if test="status!=null"> and b.is_finish  = #{status}</if>
+			<if test="planId!=null"> and a.plan_id = #{planId}</if>
+			<if test="routeId!=null"> and a.route_id = #{routeId}</if>
+			<if test="orgCode!=null">
+			 	and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})
+			</if>
+			<if test="searchDay!=null and searchDay != '' and searchDay == 1">
+				and a.`check_date` = curdate()
+			</if>
 		</where>
 		order by b.id) t
 	</select>
@@ -116,6 +122,13 @@
 
 			</if>
 
+			<if test="beginDate=='' and beginDate != null and endDate != ''">
+				AND a.begin_Time <![CDATA[>=]]> #{beginDate}
+			</if>
+
+			<if test="endDate=='' and endDate != null">
+				AND a.end_Time <![CDATA[<=]]> #{endDate}
+			</if>
 
 			<if test="status!=null"> and b.is_finish = #{status}</if>
 			<if test="routeId!=null"> and a.route_id = #{routeId}</if>