From 45f64d8b130c57ff2b8e8442d65ab7a490e915e3 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 26 十一月 2024 14:21:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 4cb78f9..ffa719f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -160,8 +160,7 @@
from pp.optimize_project as p
left join pp.optimize_admin as a on p.creater = a.Id
where (`p`.`state` > -(1))
- and `p`.`create_time` > #{startSelectTime}
- and `p`.`create_time` < #{endSelectTime}
+ and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
<if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
and p.project_no regexp #{optimizeProjectMange.projectNumber}
</if>
@@ -177,4 +176,40 @@
where p.project_no = #{projectNumber}
</update>
+ <!--鍒犻櫎宸ョ▼-->
+ <delete id="deleteProjectMp">
+ delete from pp.optimize_project
+ where project_no = #{projectNumber}
+ </delete>
+
+ <select id="getProjectListMp">
+ SELECT
+ p.id,
+ p.project_no,
+ p.project_name,
+ p.glass_type,
+ p.glass_thickness,
+ p.type,
+ p.state,
+ p.glass_total,
+ p.glass_total_area,
+ p.process_qty,
+ p.process_cards,
+ p.remark,
+ a.name,
+ p.create_time,
+ p.update_time
+ FROM
+ (
+ pp.optimize_project p
+ LEFT JOIN pp.optimize_admin a ON ((
+ p.creater = a.Id
+ )))
+ WHERE
+ ( p.state = 1 )
+ ORDER BY
+ p.create_time DESC,
+ p.project_no
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0