Merge remote-tracking branch 'origin/develop_tzs_patrol' into develop_tzs_patrol

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -12,18 +12,19 @@
 		FROM
 			p_point_inputitem pi
 		LEFT JOIN p_input_item ii ON ii.id = pi.input_item_id
-		LEFT JOIN p_point_classify pc ON pi.classify_ids REGEXP CONCAT(
-			'^',
-			pc.id,
-			',|,',
-			pc.id,
-			',|,',
-			pc.id,
-			'$',
-			'|^',
-			pc.id,
-			'$'
-			)
+		LEFT JOIN p_point_classify pc ON  find_in_set(pc.id, pi.classify_ids)
+-- 		    pi.classify_ids REGEXP CONCAT(
+-- 			'^',
+-- 			pc.id,
+-- 			',|,',
+-- 			pc.id,
+-- 			',|,',
+-- 			pc.id,
+-- 			'$',
+-- 			'|^',
+-- 			pc.id,
+-- 			'$'
+-- 			)
 		<where>
 		<if test="pointId!=null">AND pi.point_id = #{pointId}</if>
 		<if test="classifyId!=null"> AND pc.id =  #{classifyId}  </if>
@@ -1210,57 +1211,33 @@
 <!--	</select>-->
 	<select id="queryEquipPointInputItem" resultType="java.util.Map">
 		SELECT
-		ppc.id,
-		ppc.point_id pointId,
-		ppc.name,
-		ppc.code,
-		ppc.creator_id creatorId,
-		ppc.create_date createDate,
-		ppc.order_no orderNo,
-		ppc.original_id originalId,
-		ppc.equipment_id equipmentId,
-		ppc.inspection_spec_name inspectionSpecName,
-		ppc.category_name categoryName,
-		ppc.address,
-		ppc.data_source_code dataSourceCode,
-		ppc.data_source_name dataSourceName,
-		ppc.building_id buildingId,
-		ppc.building_name buildingName,
-		ppc.category_code categoryCode,
-		ppc.check_style checkStryle,
-		ppi.order_no pOrderNo,
-		ppi.id pointItemId,
-		pii.input_classify inputClassify,
-		pii.name,
-		pii.risk_desc riskDesc,
-		pii.order_no orderNo,
-		pii.item_type itemType,
-		pii.is_must isMust,
-		pii.is_score isScore,
-		pii.default_value defaultValue,
-		pii.is_multiline isMultiline,
-		pii.catalog_id originalId,
-		pii.input_json inputJson,
-		pii.data_json dataJson,
-		pii.remark,
-		pii.picture_json pictureJson,
-		pii.create_by createBy,
-		pii.create_date createDate,
-		pii.is_delete isDelete,
-		pii.level,
-		pii.item_no itemNo,
-		pii.original_id originalId,
-		pii.basis_json basisJson,
-		pii.org_code orgCode
+			ppc.id,
+			ppc.point_id pointId,
+			ppc.name,
+			ppc.code,
+			ppc.creator_id creatorId,
+			ppc.create_date createDate,
+			ppc.order_no orderNo,
+			ppc.original_id originalId,
+			ppc.equipment_id equipmentId,
+			ppc.inspection_spec_name inspectionSpecName,
+			ppc.category_name categoryName,
+			ppc.address,
+			ppc.data_source_code dataSourceCode,
+			ppc.data_source_name dataSourceName,
+			ppc.building_id buildingId,
+			ppc.building_name buildingName,
+			ppc.category_code categoryCode,
+			ppc.check_style checkStryle,
+			'' inputClassify,
+			ppc.data_source_name equipIputDetailDataNum,
+		    '是' isScore,
+		    '选择' itemType
 		FROM
-		p_point_inputitem ppi
-		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
-		LEFT JOIN p_point_classify ppc ON FIND_IN_SET(ppc.id, ppi.classify_ids) > 0
+			p_point_classify ppc
 		WHERE
 			ppc.is_delete = 0
-			<if test = "pointId!=''" > AND ppi.point_id = #{pointId} </if>
-		ORDER BY
-		ppi.order_no
+		<if test = "pointId!=''" > AND ppc.point_id = #{pointId} </if>
 	</select>
 
 	<select id="queryPointCount4Route" parameterType="long" resultType="int">