修改

“djh”

3 天以前 d7471cff04678b91271bdc566bcbddf2f4ab04b7

修改

 multi-system/src/main/resources/mapper/system/CatalogueMapper.xml

@@ -98,7 +98,16 @@
          <if test="type!=null">
              and type = #{type}
          </if>
        ORDER BY create_time ASC
        ORDER BY
        CAST(SUBSTRING_INDEX(number, '.', 1) AS UNSIGNED) ASC,
        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(number, '.', 2), '.', -1) AS UNSIGNED) ASC,  -- 第二级
        CAST(
        CASE
        WHEN LENGTH(number) - LENGTH(REPLACE(number, '.', '')) >= 2
        THEN SUBSTRING_INDEX(number, '.', -1)
        ELSE '0'
        END AS UNSIGNED
        ) ASC
    </select>
    <select id="selectCatalogueDataList" resultType="com.gkhy.exam.system.domain.vo.CatalogueDataVo">
        SELECT

 multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml

@@ -9,7 +9,7 @@
            sc.`name` as company_name,
            q.year,
            q.type,
            q.depart_name,
            sd.dept_name as depart_name,
            qa.`quality_id`,
            qa.`serial`,
            qa.`frequency`,
@@ -28,6 +28,7 @@
            quality_accomplish qa
                LEFT JOIN quality q ON qa.quality_id = q.id
        left join sys_company sc on q.company_id = sc.id
        left join sys_dept sd on q.depart_id = sd.dept_id
        WHERE
            qa.del_flag = 1
        <if test="companyId!=null and companyId!=''">

 multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml

@@ -19,7 +19,7 @@
            sc.`name` as company_name,
            q.`year`,
            q.type,
            q.depart_name,
            sd.dept_name as depart_name,
            qd.`quality_id`,
            qd.`number`,
            qd.`serial`,
@@ -38,8 +38,9 @@
            qd.`update_by`,
            qd.`update_time`
        FROM quality_decompose qd
                 LEFT JOIN quality q on qd.quality_id = q.id
                left join sys_company sc on q.company_id = sc.id
            LEFT JOIN quality q on qd.quality_id = q.id
            left join sys_company sc on q.company_id = sc.id
            left join sys_dept sd on q.depart_id = sd.dept_id
        WHERE qd.del_flag = 1
            <if test="companyId !=null and companyId!=''">
                and q.company_id =#{companyId}

 multi-system/src/main/resources/mapper/system/QualityMapper.xml

@@ -96,7 +96,7 @@
            q.`num`,
            q.`type`,
            q.`depart_id`,
            q.`depart_name`,
            sd.`dept_name` as depart_name,
            q.`method`,
            q.`compilation_id`,
            q.`compilation_name`,
@@ -108,7 +108,8 @@
            q.`lead_name`,
            q.`lead_time`
        FROM quality q
        left join  sys_company sc on q.company_id = sc.id
            left join  sys_company sc on q.company_id = sc.id
            left join sys_dept sd on q.depart_id = sd.dept_id
        WHERE
            q.del_flag=1
        <if test="companyId!=null and companyId!=''">
@@ -132,7 +133,7 @@
            q.`num`,
            q.`type`,
            q.`depart_id`,
            q.`depart_name`,
            sd.`dept_name` as depart_name,
            q.`method`,
            q.`compilation_id`,
            q.`compilation_name`,
@@ -144,7 +145,8 @@
            q.`lead_name`,
            q.`lead_time`
        FROM quality q
        left join sys_company sc on q.company_id = sc.id
            left join sys_company sc on q.company_id = sc.id
            left join sys_dept sd on q.depart_id = sd.dept_id
        WHERE
            q.del_flag=1 and q.`type` = #{type} and q.`year` = #{year}
        <if test="type == 1">