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/PrinterRuleMachineV1ServiceDaoImplMapper.xml | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/PrinterRuleMachineV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/PrinterRuleMachineV1ServiceDaoImplMapper.xml
index 2b5cfb0..d0ada19 100644
--- a/java110-db/src/main/resources/mapper/common/PrinterRuleMachineV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/PrinterRuleMachineV1ServiceDaoImplMapper.xml
@@ -1,29 +1,26 @@
<?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="printerRuleMachineV1ServiceDaoImpl">
-
<!-- 淇濆瓨浜戞墦鍗拌鍒欒澶囦俊鎭� add by wuxw 2018-07-03 -->
<insert id="savePrinterRuleMachineInfo" parameterType="Map">
- insert into printer_rule_machine(
- machine_id,quantity,prm_id,rule_id,community_id
- ) values (
- #{machineId},#{quantity},#{prmId},#{ruleId},#{communityId}
- )
+ insert into printer_rule_machine(machine_id, quantity, prm_id, rule_id, community_id)
+ values (#{machineId}, #{quantity}, #{prmId}, #{ruleId}, #{communityId})
</insert>
-
<!-- 鏌ヨ浜戞墦鍗拌鍒欒澶囦俊鎭� add by wuxw 2018-07-03 -->
<select id="getPrinterRuleMachineInfo" parameterType="Map" resultType="Map">
select t.machine_id,t.machine_id machineId,t.quantity,t.prm_id,t.prm_id prmId,t.status_cd,t.status_cd
statusCd,t.rule_id,t.rule_id ruleId,t.community_id,t.community_id communityId,mp.machine_name machineName
from printer_rule_machine t
- left join machine_printer mp on t.machine_id = mp.machine_id and mp.status_cd = '0'
- where 1 =1
+ left join machine_printer mp on t.machine_id = mp.machine_id and mp.status_cd = '0'
+ where 1 = 1
<if test="machineId !=null and machineId != ''">
and t.machine_id= #{machineId}
+ </if>
+ <if test="machineName !=null and machineName != ''">
+ and mp.machine_name like '%${machineName}%'
</if>
<if test="quantity !=null and quantity != ''">
and t.quantity= #{quantity}
@@ -44,9 +41,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼浜戞墦鍗拌鍒欒澶囦俊鎭� add by wuxw 2018-07-03 -->
<update id="updatePrinterRuleMachineInfo" parameterType="Map">
@@ -70,16 +65,19 @@
<if test="prmId !=null and prmId != ''">
and t.prm_id= #{prmId}
</if>
-
</update>
<!-- 鏌ヨ浜戞墦鍗拌鍒欒澶囨暟閲� add by wuxw 2018-07-03 -->
<select id="queryPrinterRuleMachinesCount" parameterType="Map" resultType="Map">
select count(1) count
from printer_rule_machine t
- where 1 =1
+ left join machine_printer mp on t.machine_id = mp.machine_id and mp.status_cd = '0'
+ where 1 = 1
<if test="machineId !=null and machineId != ''">
and t.machine_id= #{machineId}
+ </if>
+ <if test="machineName !=null and machineName != ''">
+ and mp.machine_name like '%${machineName}%'
</if>
<if test="quantity !=null and quantity != ''">
and t.quantity= #{quantity}
@@ -96,8 +94,5 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0