From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/common/MachineRecordServiceDaoImplMapper.xml | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/MachineRecordServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/MachineRecordServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 9f0f8e3..4688ec3
--- a/java110-db/src/main/resources/mapper/common/MachineRecordServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/MachineRecordServiceDaoImplMapper.xml
@@ -7,10 +7,10 @@
<!-- 淇濆瓨璁惧涓婃姤淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessMachineRecordInfo" parameterType="Map">
insert into business_machine_record(
- file_time,machine_code,open_type_cd,id_card,machine_record_id,machine_id,operate,`name`,tel,community_id,b_id,file_id,record_type_cd
+ file_time,machine_code,open_type_cd,id_card,machine_record_id,machine_id,operate,`name`,tel,community_id,b_id,file_id,record_type_cd,similar
) values (
#{fileTime},#{machineCode},#{openTypeCd},#{idCard},#{machineRecordId},#{machineId},#{operate},#{name},#{tel},#{communityId},#{bId},#{fileId}
- ,#{recordTypeCd}
+ ,#{recordTypeCd},#{similar}
)
</insert>
@@ -20,7 +20,7 @@
select t.file_time,t.file_time fileTime,t.machine_code,t.machine_code machineCode,t.open_type_cd,t.open_type_cd
openTypeCd,t.id_card,t.id_card idCard,t.machine_record_id,t.machine_record_id
machineRecordId,t.machine_id,t.machine_id machineId,t.operate,t.name,t.tel,t.community_id,t.community_id
- communityId,t.b_id,t.b_id bId,t.file_id,t.file_id fileId,t.record_type_cd,t.record_type_cd recordTypeCd
+ communityId,t.b_id,t.b_id bId,t.file_id,t.file_id fileId,t.record_type_cd,t.record_type_cd recordTypeCd,t.similar
from business_machine_record t
where 1 =1
<if test="fileTime !=null and fileTime != ''">
@@ -69,9 +69,9 @@
<!-- 淇濆瓨璁惧涓婃姤淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveMachineRecordInfoInstance" parameterType="Map">
insert into machine_record(
- file_time,machine_code,open_type_cd,id_card,status_cd,machine_record_id,machine_id,`name`,tel,community_id,b_id,file_id,record_type_cd
+ file_time,machine_code,open_type_cd,id_card,status_cd,machine_record_id,machine_id,`name`,tel,community_id,b_id,file_id,record_type_cd,similar
) select
- t.file_time,t.machine_code,t.open_type_cd,t.id_card,'0',t.machine_record_id,t.machine_id,t.name,t.tel,t.community_id,t.b_id,t.file_id,t.record_type_cd
+ t.file_time,t.machine_code,t.open_type_cd,t.id_card,'0',t.machine_record_id,t.machine_id,t.name,t.tel,t.community_id,t.b_id,t.file_id,t.record_type_cd,t.similar
from business_machine_record t where 1=1
<if test="fileTime !=null and fileTime != ''">
and t.file_time= #{fileTime}
@@ -120,7 +120,7 @@
openTypeCd,t.id_card,t.id_card idCard,t.status_cd,t.status_cd statusCd,t.machine_record_id,t.machine_record_id
machineRecordId,t.machine_id,t.machine_id machineId,t.name,t.tel,t.community_id,t.community_id
communityId,t.b_id,t.b_id bId,t.file_id,t.file_id fileId,t.record_type_cd,t.record_type_cd recordTypeCd,td1.name
- openTypeName
+ openTypeName,t.create_time createTime,t.similar
from machine_record t,t_dict td1
where 1 =1
and t.open_type_cd = td1.status_cd
@@ -165,6 +165,7 @@
<if test="recordTypeCd !=null and recordTypeCd != ''">
and t.record_type_cd= #{recordTypeCd}
</if>
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -279,5 +280,18 @@
limit 0,7
</select>
+ <!-- 淇濆瓨璁惧涓婃姤淇℃伅 add by wuxw 2018-07-03 -->
+ <insert id="saveMachineRecords" parameterType="Map">
+ insert into machine_record(
+ file_time,machine_code,open_type_cd,id_card,machine_record_id,machine_id,`name`,tel,community_id,b_id,file_id,record_type_cd,similar
+ ) values
+ <foreach collection="machineRecords" item="item" separator=",">
+ (
+ #{item.fileTime},#{item.machineCode},#{item.openTypeCd},#{item.idCard},#{item.machineRecordId},#{item.machineId},#{item.name},#{item.tel},#{item.communityId},'-1',#{item.fileId}
+ ,#{item.recordTypeCd},#{item.similar}
+ )
+ </foreach>
+ </insert>
+
</mapper>
--
Gitblit v1.8.0