From be1b426b7d765a546f4a26b60e80aa49a57079b9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 一月 2024 16:25:11 +0800
Subject: [PATCH] 1、优化采购模块数量不能为小数点问题2、新增客服巡查巡楼记录功能模块3、新增页面导出功能4、优化记录查询条件新增时间段查询条件5、其他界面性调整
---
java110-db/src/main/resources/mapper/common/MachineServiceDaoImplMapper.xml | 51 ++++++++++++++++++++-------------------------------
1 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/MachineServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/MachineServiceDaoImplMapper.xml
index 0dc222c..c4361a7 100755
--- a/java110-db/src/main/resources/mapper/common/MachineServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/MachineServiceDaoImplMapper.xml
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="machineServiceDaoImpl">
<!-- 淇濆瓨璁惧淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessMachineInfo" parameterType="Map">
- insert into business_machine(
- machine_mac,machine_id,machine_code,auth_code,operate,machine_version,community_id,b_id,
- machine_name,machine_type_cd,machine_ip,location_type_cd,location_obj_id,state,direction,heartbeat_time,type_id
- ) values (
- #{machineMac},#{machineId},#{machineCode},#{authCode},#{operate},#{machineVersion},
- #{communityId},#{bId},#{machineName},#{machineTypeCd},#{machineIp},
- #{locationTypeCd},#{locationObjId},#{state},#{direction},#{heartbeatTime},#{typeId}
- )
+ insert into business_machine(machine_mac, machine_id, machine_code, auth_code, operate, machine_version,
+ community_id, b_id,
+ machine_name, machine_type_cd, machine_ip, location_type_cd, location_obj_id,
+ state, direction, heartbeat_time, type_id)
+ values (#{machineMac}, #{machineId}, #{machineCode}, #{authCode}, #{operate}, #{machineVersion},
+ #{communityId}, #{bId}, #{machineName}, #{machineTypeCd}, #{machineIp},
+ #{locationTypeCd}, #{locationObjId}, #{state}, #{direction}, #{heartbeatTime}, #{typeId})
</insert>
-
<!-- 鏌ヨ璁惧淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessMachineInfo" parameterType="Map" resultType="Map">
@@ -24,7 +21,8 @@
machineVersion,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.machine_name,t.machine_name
machineName,t.machine_type_cd,t.machine_type_cd machineTypeCd,t.machine_ip,t.machine_ip machineIp,
t.location_type_cd,t.location_obj_id,t.state,t.location_type_cd,t.location_obj_id,t.location_type_cd
- locationTypeCd,t.location_obj_id locationObjId,t.direction,t.heartbeat_time,t.heartbeat_time heartbeatTime,t.type_id typeId
+ locationTypeCd,t.location_obj_id locationObjId,t.direction,t.heartbeat_time,t.heartbeat_time
+ heartbeatTime,t.type_id typeId
from business_machine t
where 1 =1
<if test="machineMac !=null and machineMac != ''">
@@ -63,7 +61,6 @@
<if test="typeId !=null and typeId != ''">
and t.type_id= #{typeId}
</if>
-
<if test="locationTypeCd !=null and locationTypeCd != ''">
and t.location_type_cd= #{locationTypeCd}
</if>
@@ -76,10 +73,7 @@
<if test="direction !=null and direction != ''">
and t.direction = #{direction}
</if>
-
-
</select>
-
<!-- 淇濆瓨璁惧淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveMachineInfoInstance" parameterType="Map">
@@ -126,7 +120,6 @@
<if test="machineIp !=null and machineIp != ''">
and t.machine_ip= #{machineIp}
</if>
-
<if test="locationTypeCd !=null and locationTypeCd != ''">
and t.location_type_cd= #{locationTypeCd}
</if>
@@ -139,9 +132,7 @@
<if test="direction !=null and direction != ''">
and t.direction = #{direction}
</if>
-
</insert>
-
<!-- 鏌ヨ璁惧淇℃伅 add by wuxw 2018-07-03 -->
<select id="getMachineInfo" parameterType="Map" resultType="Map">
@@ -154,9 +145,11 @@
t.location_type_cd,t.location_obj_id,t.heartbeat_time,t.heartbeat_time heartbeatTime,
td1.name stateName,t.create_time createTime,t.direction,td3.name directionName,t.type_id typeId
from machine t
- left join t_dict td on t.machine_type_cd=td.status_cd and td.table_name='machine' and td.table_columns='machine_type_cd'
+ left join t_dict td on t.machine_type_cd=td.status_cd and td.table_name='machine' and
+ td.table_columns='machine_type_cd'
left join t_dict td1 on t.state = td1.status_cd and td1.table_name='machine' and td1.table_columns='state'
- left join t_dict td3 on t.direction = td3.status_cd and td3.table_name='machine' and td3.table_columns='direction'
+ left join t_dict td3 on t.direction = td3.status_cd and td3.table_name='machine' and
+ td3.table_columns='direction'
left join community_location c on t.location_type_cd = c.location_id and t.status_cd = '0'
where 1 =1
<if test="machineMac !=null and machineMac != ''">
@@ -184,7 +177,7 @@
and t.b_id= #{bId}
</if>
<if test="machineName !=null and machineName != ''">
- and t.machine_name= #{machineName}
+ and t.machine_name like '%${machineName}%'
</if>
<if test="machineTypeCd !=null and machineTypeCd != ''">
and t.machine_type_cd= #{machineTypeCd}
@@ -223,9 +216,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼璁惧淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateMachineInfoInstance" parameterType="Map">
@@ -282,16 +273,17 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ璁惧鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryMachinesCount" parameterType="Map" resultType="Map">
select count(1) count
from machine t
- left join t_dict td on t.machine_type_cd=td.status_cd and td.table_name='machine' and td.table_columns='machine_type_cd'
+ left join t_dict td on t.machine_type_cd=td.status_cd and td.table_name='machine' and
+ td.table_columns='machine_type_cd'
left join t_dict td1 on t.state = td1.status_cd and td1.table_name='machine' and td1.table_columns='state'
- left join t_dict td3 on t.direction = td3.status_cd and td3.table_name='machine' and td3.table_columns='direction'
+ left join t_dict td3 on t.direction = td3.status_cd and td3.table_name='machine' and
+ td3.table_columns='direction'
left join community_location c on t.location_type_cd = c.location_id and t.status_cd = '0'
where 1 =1
<if test="machineMac !=null and machineMac != ''">
@@ -322,7 +314,7 @@
and t.b_id= #{bId}
</if>
<if test="machineName !=null and machineName != ''">
- and t.machine_name= #{machineName}
+ and t.machine_name like '%${machineName}%'
</if>
<if test="machineTypeCd !=null and machineTypeCd != ''">
and t.machine_type_cd= #{machineTypeCd}
@@ -351,8 +343,5 @@
<if test="state !=null and state != ''">
and t.state = #{state}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0