From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/resources/mapper/SaleMapper.xml | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
index a67167e..b2d9448 100644
--- a/inventory-server/src/main/resources/mapper/SaleMapper.xml
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SaleMapper">
+ <!--鎵归噺鍒犻櫎-->
+ <update id="delAllSale">
+ update mom_ocean.sale
+ set state=0
+ where id in (${ids})
+ </update>
<select id="selectSaleList" resultType="java.util.Map">
select id,
order_number,
@@ -8,7 +14,9 @@
name,
proname,
type,
- DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡'
+ DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
+ note,
+ order_type
from mom_ocean.sale
where state=1
<if test="orderNumber!=null and orderNumber!=''">
@@ -25,7 +33,31 @@
</if>
order by id desc
</select>
-
+ <select id="selectSaleListByExport" resultType="com.yuanchu.mom.utils.easyexcel.template.ExportSaleTemplate">
+ select order_number AS orderNumber,
+ code,
+ name,
+ proname,
+ type,
+ DATE_FORMAT(delTime, '%Y-%m-%d') AS delTime,
+ note,
+ order_type AS orderType
+ from mom_ocean.sale
+ where state=1
+ <if test="orderNumber!=null and orderNumber!=''">
+ and order_number like concat('%',#{orderNumber},'%')
+ </if>
+ <if test="name!=null and name!=''">
+ and name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="type!=null ">
+ and type=#{type}
+ </if>
+ <if test="delTime!=null and delTime!=''">
+ and DATE_FORMAT(delTime, '%Y-%m-%d')=#{delTime}
+ </if>
+ order by id desc
+ </select>
<!--鏌ヨ璁㈠崟BOM鍒楄〃-->
<select id="selectAllOrder" resultType="java.util.Map">
select sm.id,
@@ -36,6 +68,7 @@
specifications,
unit,
number,
+ note,
DATE_FORMAT(s.create_time, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
sm.type
--
Gitblit v1.9.3