fix：调整

龚焕茏

2024-08-23 5ab636a4f38353a278ea1b99afdbec9d4f3eeac9

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -14,9 +14,20 @@
        <result column="yw_condition" property="ywCondition"/>
        <result column="yw_check_result" property="ywCheckResult"/>
        <result column="overtime" property="overtime"/>
        <result column="deduct" property="deduct"/>
        <collection property="errorTypeList" select="getErrorType" ofType="string" column="work_order_no">
        </collection>
    </resultMap>

    <select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
    <select id="getErrorType" resultType="string">
        SELECT DISTINCT da.dict_label
        FROM
            t_work_order_error_type et
                 LEFT JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
        WHERE et.work_order_no = #{work_order_no}
    </select>

    <select id="page" resultMap="BaseResultMap">
        SELECT
            wo.*,
            u.unit_name,
@@ -166,7 +177,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>
@@ -181,4 +192,11 @@
                 INNER JOIN t_device_info di ON wo.serial_number = di.device_id
    </select>

    <insert id="addMany">
        INSERT INTO t_work_order (work_order_no, status, serial_number, unit_id, create_time, update_time, deleted)
        VALUES <foreach collection="workOrderList" item="workOrder" separator=",">
        (#{workOrder.workOrderNo}, #{workOrder.status}, #{workOrder.serialNumber}, #{workOrder.unitId}, #{workOrder.createTime}, #{workOrder.updateTime}, 0)
    </foreach>
    </insert>

</mapper>