zgyw.git - Gitblit

			@@ -17,6 +17,7 @@
			<result column="errorType" property="errorType"/>
			<result column="status" property="status"/>
			<result column="source" property="source"/>
			<result column="imgListStr" property="imgListStr"/>
			<!-- <collection property="errorTypeList" select="getErrorType" column="{workOrderNo=work_order_no,errList=errList}" ofType="string"/>-->
			</resultMap>

			@@ -35,11 +36,13 @@
			u.unit_name,
			p.yw_person_name,
			tm.name as source,
			GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
			GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType,
			GROUP_CONCAT(DISTINCT ci.img_url ORDER BY ci.create_time DESC SEPARATOR ',') AS imgListStr
			FROM
			t_work_order wo
			INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
			INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
			INNER JOIN t_work_order_check_img ci ON ci.work_order_no = wo.work_order_no
			INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
			collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
			LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
			@@ -222,7 +225,8 @@
			FROM
			t_work_order wo
			WHERE
			deleted = 0
			wo.create_time BETWEEN #{start} AND #{end}
			AND deleted = 0
			</select>

			<insert id="addMany">