新增功能

“djh”

19 小时以前 22308ccdd532d105598663f90a39285697f723e8

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

@@ -96,19 +96,23 @@
            q.`num`,
            q.`type`,
            q.`depart_id`,
            q.`depart_name`,
            sd.`dept_name` as depart_name,
            q.`method`,
            q.`compilation_id`,
            q.`compilation_name`,
            su1.`name` as compilation_name,
            q.`compilation_time`,
            q.`quality_id`,
            q.`quality_name`,
            su2.`name` as quality_name,
            q.`quality_time`,
            q.`lead_id`,
            q.`lead_name`,
            su3.`name` as 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
            left join sys_user su1 on q.compilation_id = su1.id
            left join sys_user su2 on q.quality_id = su2.id
            left join sys_user su3 on q.lead_id = su3.id
        WHERE
            q.del_flag=1
        <if test="companyId!=null and companyId!=''">
@@ -119,6 +123,9 @@
        </if>
        <if test="type!=null and type!=''">
            and q.`type` = #{type}
        </if>
        <if test="departId!=null">
            and q.depart_id = #{departId}
        </if>
        ORDER BY
            q.create_time DESC
@@ -132,7 +139,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 +151,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">