修改代码

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

@@ -1165,10 +1165,12 @@
 		LEFT JOIN p_route pr ON pr.id = ppk.route_id
 		<where>
 			<if test="param.userId != null "> find_in_set(#{param.userId}, ppk.user_id) </if>
-			<if test="param.beginTime != null and param.beginTime != '' "> and ppk.begin_time <![CDATA[>=]]>  #{param.beginTime} </if>
-			<if test="param.endTime != null and param.endTime != ''"> and ppk.end_time  <![CDATA[<=]]>  #{param.endTime} </if>
-			<if test="param.taskName != null"> and pp.name like concat(concat("%", #{param.taskName}), "%") </if>
-			<if test="param.routeId!=null"> and ppk.route_id = #{param.routeId} </if>
+			<if test="param.beginDate != null and param.beginDate != '' "> ppk.begin_time <![CDATA[>=]]>  #{param.beginDate} </if>
+			<if test="param.endDate != null and param.endDate != ''"> and ppk.end_time  <![CDATA[<=]]>  #{param.endDate} </if>
+			<if test="param.taskName != null and param.taskName != ''"> and pp.name like concat('%',#{param.taskName},'%') </if>
+			<if test="param.status != null"> and pptd.STATUS = #{param.status} </if>
+			<if test="param.routeId != null"> and ppk.route_id = #{param.routeId} </if>
+			<if test="param.bizOrgCode != null"> and pp.biz_org_code like concat('%',#{param.bizOrgCode},'%')  </if>
 		</where>
 		ORDER BY
 			ppk.begin_time DESC
@@ -1198,12 +1200,13 @@
 			<if test="param.taskName != null and param.taskName != ''"> and pp.name like concat('%',#{param.taskName},'%') </if>
 			<if test="param.status != null"> and pptd.STATUS = #{param.status} </if>
 			<if test="param.routeId != null"> and ppk.route_id = #{param.routeId} </if>
+			<if test="param.bizOrgCode != null"> and pp.biz_org_code like concat('%',#{param.bizOrgCode},'%')  </if>
 		</where>
 		ORDER BY
 			ppk.begin_time DESC
 		<choose>
 			<when test="param.pageSize==-1"></when>
-			<when test="param.pageSize!=-1">limit #{param.offset}, #{param.pageSize}</when>
+			<when test="param.pageSize!=-1">limit #{param.pageNumber}, #{param.pageSize}</when>
 		</choose>
 	</select>
 
@@ -1215,7 +1218,7 @@
 			pp.biz_org_name AS stationName,
 			ppk.begin_time AS beginTime,
 			ppk.end_time AS endTime,
-			SEC_TO_TIME(UNIX_TIMESTAMP(ppk.end_time) - UNIX_TIMESTAMP(ppk.begin_time)) AS difSecond,
+			(UNIX_TIMESTAMP(ppk.end_time) - UNIX_TIMESTAMP(ppk.begin_time)) AS difSecond,
 			( CASE pptd.is_finish WHEN 0 THEN '未完成' WHEN 1 THEN '已完成' WHEN 2 THEN '超时漏检' END ) AS taskStatus
 		FROM
 			`p_plan_task` ppk