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/store/ResourceStoreServiceDaoImplMapper.xml | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
index 5105186..5a18bab 100755
--- a/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
@@ -210,14 +210,12 @@
averagePrice,rss.spec_name rssName,t.mini_unit_code,t.mini_unit_code miniUnitCode,t.mini_stock,t.mini_stock
miniStock,t.mini_unit_stock,t.mini_unit_stock miniUnitStock,td.name unitCodeName,td1.name
miniUnitCodeName,t.parent_rst_id parentRstId,t.rst_id rstId,rst1.name parentRstName,rst.name
- rstName,rstm.times_id timesId,
- t.is_fixed,t.is_fixed isFixed,td2.name isFixedName,t.community_id communityId
+ rstName,t.is_fixed,t.is_fixed isFixed,td2.name isFixedName,t.community_id communityId
from resource_store t
left join resource_store_type rst on t.rst_id = rst.rst_id and rst.status_cd = '0'
left join resource_store_type rst1 on t.parent_rst_id = rst1.rst_id and rst1.status_cd = '0'
left join resource_store_specification rss on t.rss_id = rss.rss_id and rss.status_cd = '0'
left join storehouse sh on t.sh_id = sh.sh_id and t.store_id = sh.store_id and sh.status_cd = '0'
- left join resource_store_times rstm on t.res_code = rstm.res_code and rstm.status_cd = '0'
left join t_dict td on t.unit_code = td.status_cd and td.table_name = 'resource_store' and td.table_columns =
'unit_code'
left join t_dict td1 on t.mini_unit_code = td1.status_cd and td1.table_name = 'resource_store' and
@@ -321,7 +319,7 @@
<if test="resOrderType == '20000'">
and t.stock > 0
</if>
- order by t.res_code
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -414,7 +412,6 @@
left join resource_store_type rst1 on t.parent_rst_id = rst1.rst_id and rst1.status_cd = '0'
left join resource_store_specification rss on t.rss_id = rss.rss_id and rss.status_cd = '0'
left join storehouse sh on t.sh_id = sh.sh_id and t.store_id = sh.store_id and sh.status_cd = '0'
- left join resource_store_times rstm on t.res_code = rstm.res_code and rstm.status_cd = '0'
left join t_dict td on t.unit_code = td.status_cd and td.table_name = 'resource_store' and td.table_columns =
'unit_code'
left join t_dict td1 on t.mini_unit_code = td1.status_cd and td1.table_name = 'resource_store' and
--
Gitblit v1.8.0