From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index f235d16..518bfc0
--- a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessInspectionRoutePointRelInfo" parameterType="Map">
insert into business_inspection_route_point_rel(
- inspection_id,operate,inspection_route_id,irp_rel_id,remark,community_id,b_id
+ inspection_id,operate,inspection_route_id,irp_rel_id,community_id,b_id,point_start_time,point_end_time,sort_number
) values (
- #{inspectionId},#{operate},#{inspectionRouteId},#{irpRelId},#{remark},#{communityId},#{bId}
+ #{inspectionId},#{operate},#{inspectionRouteId},#{irpRelId},#{communityId},#{bId},#{pointStartTime},#{pointEndTime},#{sortNumber}
)
</insert>
@@ -17,8 +17,8 @@
<!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessInspectionRoutePointRelInfo" parameterType="Map" resultType="Map">
select t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_route_id,t.inspection_route_id
- inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.remark,t.community_id,t.community_id
- communityId,t.b_id,t.b_id bId
+ inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.community_id,t.community_id
+ communityId,t.b_id,t.b_id bId,t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime,t.sort_number,t.sort_number sortNumber
from business_inspection_route_point_rel t
where 1 =1
<if test="inspectionId !=null and inspectionId != ''">
@@ -33,9 +33,6 @@
<if test="irpRelId !=null and irpRelId != ''">
and t.irp_rel_id= #{irpRelId}
</if>
- <if test="remark !=null and remark != ''">
- and t.remark= #{remark}
- </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
@@ -49,8 +46,8 @@
<!-- 淇濆瓨宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveInspectionRoutePointRelInfoInstance" parameterType="Map">
insert into inspection_route_point_rel(
- inspection_id,inspection_route_id,irp_rel_id,remark,status_cd,community_id,b_id
- ) select t.inspection_id,t.inspection_route_id,t.irp_rel_id,t.remark,'0',t.community_id,t.b_id from
+ inspection_id,inspection_route_id,irp_rel_id,status_cd,community_id,b_id,point_start_time,point_end_time,sort_number
+ ) select t.inspection_id,t.inspection_route_id,t.irp_rel_id,'0',t.community_id,t.b_id,t.point_start_time,t.point_end_time,t.sort_number from
business_inspection_route_point_rel t where 1=1
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
@@ -61,9 +58,6 @@
</if>
<if test="irpRelId !=null and irpRelId != ''">
and t.irp_rel_id= #{irpRelId}
- </if>
- <if test="remark !=null and remark != ''">
- and t.remark= #{remark}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -78,11 +72,15 @@
<!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭� add by wuxw 2018-07-03 -->
<select id="getInspectionRoutePointRelInfo" parameterType="Map" resultType="Map">
select t.inspection_id,t.inspection_id inspectionId,t.inspection_route_id,t.inspection_route_id
- inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.remark,t.status_cd,t.status_cd
+ inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.status_cd,t.status_cd
statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
- ip.inspection_id inspectionId,ip.machine_id machineId,ip.remark,
- ip.inspection_name inspectionName
+ ip.inspection_id inspectionId,ip.remark,td.name pointTypeName,
+ ip.inspection_name inspectionName,ip.point_obj_type,ip.point_obj_id,ip.point_obj_name,
+ ip.point_obj_type pointObjType,ip.point_obj_id pointObjId,ip.point_obj_name pointObjName,
+ t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime,t.sort_number,t.sort_number sortNumber
from inspection_route_point_rel t,inspection_point ip
+ left join t_dict td on ip.point_obj_type = td.status_cd and td.table_name = 'inspection_point'
+ and td.table_columns = 'point_obj_type'
where 1 =1
and t.inspection_id = ip.inspection_id
and ip.status_cd = '0'
@@ -95,9 +93,6 @@
<if test="irpRelId !=null and irpRelId != ''">
and t.irp_rel_id= #{irpRelId}
</if>
- <if test="remark !=null and remark != ''">
- and t.remark= #{remark}
- </if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
@@ -108,7 +103,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- order by t.create_time desc
+ order by t.sort_number desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -128,11 +123,17 @@
<if test="inspectionRouteId !=null and inspectionRouteId != ''">
, t.inspection_route_id= #{inspectionRouteId}
</if>
- <if test="remark !=null and remark != ''">
- , t.remark= #{remark}
- </if>
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
+ </if>
+ <if test="pointStartTime !=null and pointStartTime != ''">
+ , t.point_start_time= #{pointStartTime}
+ </if>
+ <if test="pointEndTime !=null and pointEndTime != ''">
+ , t.point_end_time= #{pointEndTime}
+ </if>
+ <if test="sortNumber !=null and sortNumber != ''">
+ , t.sort_number= #{sortNumber}
</if>
where 1=1
<if test="irpRelId !=null and irpRelId != ''">
@@ -159,9 +160,6 @@
</if>
<if test="irpRelId !=null and irpRelId != ''">
and t.irp_rel_id= #{irpRelId}
- </if>
- <if test="remark !=null and remark != ''">
- and t.remark= #{remark}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
--
Gitblit v1.8.0