1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询

lyh

2025-05-28 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml

@@ -2,33 +2,48 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.jeecg.modules.dnc.mapper.DocInfoMapper">
    <select id="findDocExtList" parameterType="String" resultType="org.jeecg.modules.dnc.entity.DocInfo">
        select
        u.doc_id
        ,r.classification_id
        , CONCAT(u.doc_name, '.', u.doc_suffix) as doc_name
        ,u.doc_alias
        ,u.doc_code
        ,u.doc_suffix
        ,r.attribution_type
        ,r.attribution_id
        ,u.doc_status
        ,u.doc_dispatch_status
        ,u.publish_file_id
        ,u.publish_version
        ,u.description
        ,u.CREATE_TIME
        ,u.create_by
        ,u.UPDATE_TIME
        ,u.update_by
        ,(case when o.doc_id is null then 1 else 2 end) as pullStatus
        ,o.create_by as pullUser
        from (select classification_id, doc_id,attribution_type,attribution_id from nc_doc_relative where delete_flag=0) r
        inner join
        (select * from nc_doc_info where delete_flag=0) u
        on r.doc_id = u.doc_id
        left join (select doc_id, create_by from nc_file_operate where delete_flag=0) o
        on u.doc_id=o.doc_id
        ${ew.customSqlSegment}
        SELECT
            u.doc_id,
            r.classification_id,
            CONVERT(VARCHAR(500),
                    CONCAT(
                            u.doc_name COLLATE Chinese_PRC_CI_AS,
                            '.' COLLATE Chinese_PRC_CI_AS,
                            u.doc_suffix COLLATE Chinese_PRC_CI_AS
                    )
            ) AS doc_name,  -- 统一排序规则并显式转换类型
            u.doc_alias,
            u.doc_code,
            u.doc_suffix,
            r.attribution_type,
            r.attribution_id,
            u.doc_status,
            u.doc_dispatch_status,
            u.publish_file_id,
            u.publish_version,
            u.description,
            u.CREATE_TIME,
            u.create_by,
            u.UPDATE_TIME,
            u.update_by,
            (CASE WHEN o.doc_id IS NULL THEN 1 ELSE 2 END) AS pullStatus,
            o.create_by AS pullUser
        FROM (
                 SELECT classification_id, doc_id, attribution_type, attribution_id
                 FROM nc_doc_relative
                 WHERE delete_flag = 0
             ) r
                 INNER JOIN (
            SELECT *
            FROM nc_doc_info
            WHERE delete_flag = 0
        ) u ON r.doc_id = u.doc_id
                 LEFT JOIN (
            SELECT doc_id, create_by
            FROM nc_file_operate
            WHERE delete_flag = 0
        ) o ON u.doc_id = o.doc_id
            ${ew.customSqlSegment}
    </select>


@@ -36,7 +51,13 @@
        select
        u.doc_id
        ,r.classification_id
        , CONCAT(u.doc_name, '.', u.doc_suffix) as doc_name
        ,             CONVERT(VARCHAR(500),
                CONCAT(
                        u.doc_name COLLATE Chinese_PRC_CI_AS,
                        '.' COLLATE Chinese_PRC_CI_AS,
                        u.doc_suffix COLLATE Chinese_PRC_CI_AS
                )
                      ) AS doc_name  -- 统一排序规则并显式转换类型
        ,u.doc_alias
        ,u.doc_code
        ,u.doc_suffix