From b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 十一月 2025 08:53:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml
new file mode 100644
index 0000000..223b6c4
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml
@@ -0,0 +1,48 @@
+<?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.mes.damage.mapper.DamageMapper">
+
+ <select id="queryUnTempByFlowCardId" resultType="com.mes.damage.entity.Damage">
+ SELECT glass_id,
+ order_number,
+ technology_number,
+ working_procedure
+ FROM (
+ SELECT glass_id,
+ order_number,
+ technology_number,
+ working_procedure,
+ ROW_NUMBER() OVER (
+ PARTITION BY glass_id
+ ORDER BY damage_time DESC
+ ) AS rn
+ FROM damage
+ WHERE process_id = #{flowCardId}
+ AND glass_id NOT IN (
+ SELECT DISTINCT glass_id
+ FROM damage
+ WHERE process_id = #{flowCardId}
+ AND working_procedure = "閽㈠寲"
+ )
+ ) t
+ WHERE rn = 1;
+ </select>
+ <select id="selectDamageList" resultType="com.mes.damage.entity.dto.DamageDTO">
+ SELECT
+ t.*,t1.width,t1.height
+ FROM
+ damage t left join glass_info t1 on t.glass_id=t1.glass_id
+ <where>
+ damage_time BETWEEN #{startTime} AND #{endTime}
+ <if test="type != null and type != 0">
+ AND t.type = #{type}
+ </if>
+ <if test="status != null and status != 0">
+ AND t.status = #{status}
+ </if>
+ <if test="workingProcedure != null">
+ AND t.working_procedure = #{workingProcedure}
+ </if>
+ </where>
+ </select>
+</mapper>
--
Gitblit v1.8.0