fuliqi
2024-08-22 70f7f9d6f3a431662722f76e4da93cd3b4823857
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -14,6 +14,7 @@
        <result column="yw_condition" property="ywCondition"/>
        <result column="yw_check_result" property="ywCheckResult"/>
        <result column="overtime" property="overtime"/>
        <result column="deduct" property="deduct"/>
    </resultMap>
    <select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
@@ -166,7 +167,7 @@
        LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
        WHERE d.del_flag = 0 AND d.area IS NOT NULL
        <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
        <if test="deptId != null"> AND p.dept_id = #{deptId} </if>
        <if test="deptId != null"> /*AND p.dept_id = #{deptId}*/ </if>
        GROUP BY d.area, d.dept_id
        ORDER BY d.dept_id
    </select>