From 62f2b98b64f6726ca7cb90cbfa996deaac4ffba9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 02 十一月 2023 14:09:04 +0800
Subject: [PATCH] 1、优化查询，便于模糊查询条件2、界面查询条件调整
---
java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml
index e6d9dc0..d08e1d1 100644
--- a/java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ContractChangePlanServiceDaoImplMapper.xml
@@ -1,19 +1,13 @@
<?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="contractChangePlanServiceDaoImpl">
-
<!-- 淇濆瓨鍚堝悓鍙樻洿璁″垝淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveContractChangePlanInfo" parameterType="Map">
- insert into contract_change_plan(
- plan_type,contract_id,plan_id,remark,change_person,state,store_id
- ) values (
- #{planType},#{contractId},#{planId},#{remark},#{changePerson},#{state},#{storeId}
- )
+ insert into contract_change_plan(plan_type, contract_id, plan_id, remark, change_person, state, store_id)
+ values (#{planType}, #{contractId}, #{planId}, #{remark}, #{changePerson}, #{state}, #{storeId})
</insert>
-
<!-- 鏌ヨ鍚堝悓鍙樻洿璁″垝淇℃伅 add by wuxw 2018-07-03 -->
<select id="getContractChangePlanInfo" parameterType="Map" resultType="Map">
@@ -26,13 +20,19 @@
partyB,c.contract_id,c.contract_id contractId,c.obj_id,c.obj_id objId,c.contract_name,c.contract_name
contractName,c.start_time,c.start_time startTime,c.end_time,c.end_time
endTime,c.contract_code,c.contract_code contractCode,c.obj_type,c.obj_type
- objType,c.operator_link,c.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName,td1.name planTypeName,
+ objType,c.operator_link,c.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName,td1.name
+ planTypeName,u.name changePersonName,
t.create_time createTime
from contract_change_plan t
- inner join contract_change_plan_detail c on t.contract_id = c.contract_id and t.plan_id = c.plan_id and c.store_id = t.store_id and c.operate = 'ADD'
- inner JOIN contract_type ct on c.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id = c.store_id
- left JOIN t_dict td on td.status_cd = t.state and td.table_name = 'contract_change_plan' and td.table_columns = 'state'
- left JOIN t_dict td1 on td1.status_cd = t.plan_type and td1.table_name = 'contract_change_plan' and td1.table_columns = 'plan_type'
+ left join contract_change_plan_detail c on t.contract_id = c.contract_id and t.plan_id = c.plan_id and
+ c.store_id = t.store_id and c.operate = 'ADD'
+ left JOIN contract_type ct on c.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id =
+ c.store_id
+ left join u_user u on t.change_person = u.user_id and u.status_cd = '0'
+ left JOIN t_dict td on td.status_cd = t.state and td.table_name = 'contract_change_plan' and td.table_columns =
+ 'state'
+ left JOIN t_dict td1 on td1.status_cd = t.plan_type and td1.table_name = 'contract_change_plan' and
+ td1.table_columns = 'plan_type'
where 1 =1
<if test="planType !=null and planType != ''">
and t.plan_type= #{planType}
@@ -41,7 +41,7 @@
and t.contract_id= #{contractId}
</if>
<if test="contractName !=null and contractName != ''">
- and c.contract_name= #{contractName}
+ and c.contract_name like '%${contractName}%'
</if>
<if test="contractCode !=null and contractCode != ''">
and c.contract_code= #{contractCode}
@@ -73,17 +73,21 @@
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
</if>
- <if test="startTime != null and startTime != ''">
+ <!--<if test="startTime != null and startTime != ''">
and t.create_time > #{startTime}
and t.create_time < #{endTime}
+ </if>-->
+ <if test="logStartTime != null and logStartTime != ''">
+ and t.create_time >= #{logStartTime}
+ </if>
+ <if test="logEndTime != null and logEndTime != ''">
+ and t.create_time <= #{logEndTime}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼鍚堝悓鍙樻洿璁″垝淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateContractChangePlanInfo" parameterType="Map">
@@ -113,16 +117,21 @@
<if test="planId !=null and planId != ''">
and t.plan_id= #{planId}
</if>
-
</update>
<!-- 鏌ヨ鍚堝悓鍙樻洿璁″垝鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryContractChangePlansCount" parameterType="Map" resultType="Map">
select count(1) count
from contract_change_plan t
- inner join contract c on t.contract_id = c.contract_id and c.status_cd = '0' and c.store_id = t.store_id
- inner JOIN contract_type ct on c.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id = c.store_id
- left JOIN t_dict td on td.status_cd = t.state and td.table_name = 'contract_change_plan' and td.table_columns = 'state'
+ left join contract_change_plan_detail c on t.contract_id = c.contract_id and t.plan_id = c.plan_id and
+ c.store_id = t.store_id and c.operate = 'ADD'
+ left JOIN contract_type ct on c.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id =
+ c.store_id
+ left join u_user u on t.change_person = u.user_id and u.status_cd = '0'
+ left JOIN t_dict td on td.status_cd = t.state and td.table_name = 'contract_change_plan' and td.table_columns =
+ 'state'
+ left JOIN t_dict td1 on td1.status_cd = t.plan_type and td1.table_name = 'contract_change_plan' and
+ td1.table_columns = 'plan_type'
where 1 =1
<if test="planType !=null and planType != ''">
and t.plan_type= #{planType}
@@ -131,7 +140,7 @@
and t.contract_id= #{contractId}
</if>
<if test="contractName !=null and contractName != ''">
- and c.contract_name= #{contractName}
+ and c.contract_name like '%${contractName}%'
</if>
<if test="contractCode !=null and contractCode != ''">
and c.contract_code= #{contractCode}
@@ -157,8 +166,11 @@
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
</if>
-
-
+ <if test="logStartTime != null and logStartTime != ''">
+ and t.create_time >= #{logStartTime}
+ </if>
+ <if test="logEndTime != null and logEndTime != ''">
+ and t.create_time <= #{logEndTime}
+ </if>
</select>
-
</mapper>
--
Gitblit v1.8.0