Skip to content

A
amos-boot-biz
Commit f75450fe authored by 李秀明's avatar 李秀明
Browse files
Options

fix(消防巡查): 重做巡查计划：重做完后页面默认没有查出来，需要选择时间才能查出来

【web端】站端3711：运维管理>消防巡查>重做巡查计划： 重做完后页面默认没有查出来，需要选择时间才能查出来 Closes http://113.142.68.105:5080/zentao/bug-view-15607.html
parent 96224594
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 76 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/PointTreeVo.java
View file @ f75450fe
......@@ -153,7 +153,7 @@ public class PointTreeVo {
private String groupType;
/**
* 画布id
* 机构编码
*/
private String bizOrgCode;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
View file @ f75450fe
......@@ -263,12 +263,6 @@ 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
View file @ f75450fe
......@@ -13,44 +13,24 @@
<where>
<if test="pointNo!=null"> and d.point_no like concat('%',#{pointNo},'%')</if>
<if test="pointName!=null"> and d.name like concat('%',#{pointName},'%')</if>
<!-- AND-->
<!-- ((<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}</if>)-->
<!-- OR-->
<!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{beginDate}</if>)-->
<!-- OR-->
<!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{endDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
<!-- OR-->
<!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
<!-- )-->
<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="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>
<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 == null or beginDate == '') and endDate != null and endDate != ''">
AND a.end_time <![CDATA[<=]]> #{endDate}
</if>
<if test="beginDate != null and beginDate != '' and (endDate == null or 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>
</where>
order by b.id) t
</select>
......@@ -99,37 +79,15 @@
<where>
<if test="pointNo!=null"> and d.point_no like concat('%',#{pointNo},'%')</if>
<if test="pointName!=null"> and d.name like concat('%',#{pointName},'%')</if>
<!-- AND-->
<!-- ((<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}</if>)-->
<!-- OR-->
<!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{beginDate}</if>)-->
<!-- OR-->
<!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{endDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
<!-- OR-->
<!-- (<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
<!-- )-->
<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 test="beginDate != null and endDate != null and beginDate != '' and endDate != '' ">
AND a.begin_time <![CDATA[>=]]> #{beginDate} AND a.end_time <![CDATA[<=]]> #{endDate}
</if>
<if test="beginDate!=null and beginDate != '' and endDate == ''">
and a.begin_Time <![CDATA[>=]]> #{beginDate}
<if test="(beginDate == null or beginDate == '') and endDate != null and endDate != ''">
AND a.end_time <![CDATA[<=]]> #{endDate}
</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 test="beginDate != null and beginDate != '' and (endDate == null or endDate == '')">
and a.begin_time <![CDATA[>=]]> #{beginDate}
</if>
<if test="status!=null"> and b.is_finish = #{status}</if>
<if test="routeId!=null"> and a.route_id = #{routeId}</if>
<if test="planId!=null"> and a.plan_id = #{planId}</if>
......@@ -141,7 +99,7 @@
and a.`check_date` = curdate()
</if>
</where>
order by b.id
order by b.id desc
<choose>
<when test="pageSize==-1"></when>
<when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
......@@ -276,7 +234,7 @@
p_plan_task pt
INNER JOIN p_plan p ON pt.plan_id = p.id
) a
<include refid="plan-task-app-where"/>
<if test="orderBy != null and orderBy != ''"> order by ${orderBy} </if>
......@@ -527,7 +485,7 @@
ptd.route_id routeId,
ptd.plan_id planId,
ptd.user_id AS userId,
ptd.end_time AS endTime,
pptd.id as planTaskDetailId,
(select p_plan.dept_id from p_plan where p_plan.id=ptd.plan_id) depId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment