From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderService.java | 2 ++
src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.xml | 27 +++++++++++++++++++++++++++
src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderServiceImpl.java | 11 +++++++++++
src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.java | 3 +++
src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java | 4 ++--
5 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java b/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
index 3fbd9b8..4695c76 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
@@ -269,8 +269,8 @@
try {
if(allOpeOrder != null && allOpeOrder.size() > 0)
{
- int count = allOpeOrder.size();
- this.setRowCount(count);
+// int count = allOpeOrder.size();
+ this.setRowCount(supplierOpeOrderService.SupplierOpeOrderTotal(orderCode,applyCode,status,orderTime,orderEndTime));
list = supplierOpeOrderService.getSupplierOpeOrderList(orderCode,applyCode,status,orderTime,orderEndTime,first,pageSize);
for (int i=0;i<list.size();i++) {
diff --git a/src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.java b/src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.java
index 199d510..5990b81 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.java
@@ -15,4 +15,7 @@
public int updateDestoryFlagById(SupplierOrder supplierOrder);
SupplierOrder selectById(String id);
+
+ int getSupplierListTotal(Map<String, Object> params);
+
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.xml b/src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.xml
index 701803b..2a48f44 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SupplierOpeOrderDao.xml
@@ -94,6 +94,33 @@
where 1 = 1
and oo.id = #{id}
</select>
+ <select id="getSupplierListTotal" resultType="java.lang.Integer">
+ select (count(0))
+ from (
+ select count(0)
+ from ope_order oo
+ LEFT JOIN ope_apply_order oao on oo.id = oao.ope_order_id
+ left join ope_apply as oa on oao.ope_apply_id = oa.id
+ where 1 = 1
+ <if test="code != null and code != ''">
+ and oo.order_code like concat('%',#{code},'%')
+ </if>
+ <if test="status != null">
+ and oo.status = #{status}
+ </if>
+ <if test="orderTime != null">
+ and oo.create_time >= #{orderTime}
+ </if>
+ <if test="orderEndTime != null">
+ and #{orderEndTime} >= oo.create_time
+ </if>
+ <if test="applyCode != null and applyCode != ''">
+ and oa.apply_code like concat('%',#{applyCode},'%')
+ </if>
+ GROUP BY oo.id
+ ) as a
+
+ </select>
<update id="updateDestoryFlagById" parameterType="com.nanometer.smartlab.entity.SupplierOrder">
update ope_order set destory_flag=1 where id=#{id}
diff --git a/src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderService.java b/src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderService.java
index c7f292f..8da2ce3 100644
--- a/src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderService.java
@@ -16,4 +16,6 @@
public void updateDestoryFlagById(SupplierOrder supplierOrder);
SupplierOrder selectById(String id);
+
+ int SupplierOpeOrderTotal(String orderCode, String applyCode, Integer status, Timestamp orderTime, Timestamp orderEndTime);
}
diff --git a/src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderServiceImpl.java
index 2998f32..6d1a85f 100644
--- a/src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SupplierOpeOrderServiceImpl.java
@@ -80,4 +80,15 @@
public SupplierOrder selectById(String id) {
return supplierOpeOrderDao.selectById(id);
}
+
+ @Override
+ public int SupplierOpeOrderTotal(String orderCode, String applyCode, Integer status, Timestamp orderTime, Timestamp orderEndTime) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("code", orderCode);
+ params.put("applyCode", applyCode);
+ params.put("orderTime",orderTime);
+ params.put("orderEndTime",orderEndTime);
+ params.put("status", status);
+ return this.supplierOpeOrderDao.getSupplierListTotal(params);
+ }
}
--
Gitblit v1.9.2