From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml |  100 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 100 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml
new file mode 100644
index 0000000..b2322e1
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml
@@ -0,0 +1,100 @@
+<?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="org.jeecg.modules.dncFlow.mapper.AssignFileStreamMapper">
+    <select id="getAssignFileStreamDetail" resultType="org.jeecg.modules.dncFlow.ext.AssignFileStreamExt" parameterType="String">
+        select a.stream_id
+        , a.product_id
+        , a.component_id
+        , a.parts_id
+        , a.process_id
+        , a.doc_id
+        , a.file_id
+        , a.device_id
+        , a.apply_user_id
+        , a.apply_reason
+        , a.apply_time
+        , a.approve_user_id
+        , a.approve_content
+        , a.approve_time
+        , a.status
+        , u1.realname as applyUser
+        , u2.realname as approveUser
+        , p.product_name as productName
+        , c.component_name as componentName
+        , pt.parts_name as partsName
+        , ps.process_name as processName
+        , wt.step_name as stepName
+        , dem.device_management_name as deviceManagementName
+        , dem.device_management_code as deviceManagementCode
+        , dc.doc_name as docName
+        , dc.publish_version as version
+        , dc.doc_suffix as docSuffix
+        , de.equipment_name as deviceName
+        from (select * from nc_assign_file_stream where stream_id=#{streamId}) a
+        left join sys_user u1
+        on a.apply_user_id=u1.id
+        left join sys_user u2
+        on a.approve_user_id=u2.id
+        left join nc_product_info p
+        on a.product_id=p.product_id
+        left join nc_component_info c
+        on a.component_id=c.component_id
+        left join nc_parts_info pt
+        on a.parts_id=pt.parts_id
+        left join NC_PROCESS_STREAM ps
+        on a.process_id=ps.PROCESS_ID
+        left join nc_work_step wt
+        on a.step_id=wt.id
+        left join nc_doc_info dc
+        on a.doc_id=dc.doc_id
+        left join mdc_equipment de
+        on a.device_id=de.id
+        left join nc_device_type type
+        on a.device_type_id=type.id
+        left join nc_device_management dem
+        on type.device_management_id=dem.id
+    </select>
+
+    <select id="findByPage" resultType="org.jeecg.modules.dncFlow.ext.AssignFileStreamExt" parameterType="String">
+        select a.stream_id
+        , a.product_id
+        , a.component_id
+        , a.parts_id
+        , a.process_id
+        , a.doc_id
+        , a.file_id
+        , a.device_id
+        , a.apply_user_id
+        , a.apply_reason
+        , a.apply_time
+        , a.approve_user_id
+        , a.approve_content
+        , a.approve_time
+        , a.status
+        , u1.realname as applyUser
+        , u2.realname as approveUser
+        , p.product_name as productName
+        , c.component_name as componentName
+        , pt.parts_name as partsName
+        , dc.doc_name as docName
+        , dc.publish_version as version
+        , dc.doc_suffix as docSuffix
+        , de.device_name as deviceName
+        from (select * from nc_assign_file_stream where delete_flag=0 and approve_time is not null) a
+        left join sys_user u1
+        on a.apply_user_id=u1.id
+        left join sys_user u2
+        on a.approve_user_id=u2.id
+        left join nc_product_info p
+        on a.product_id=p.product_id
+        left join nc_component_info c
+        on a.component_id=c.component_id
+        left join nc_parts_info pt
+        on a.parts_id=pt.parts_id
+        left join nc_doc_info dc
+        on a.doc_id=dc.doc_id
+        left join nc_device_info de
+        on a.device_id=de.device_id
+        ${ew.customSqlSegment}
+    </select>
+</mapper>

--
Gitblit v1.9.3