巡检计划导出修改

AmosBankPatrolStart/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -36,9 +36,9 @@
                 LEFT JOIN `p_plan` `e` ON `a`.`plan_id` = `e`.`id`
             </if>
             <if test="pointName!=null or pointNo!=null or isFixed!=null or catalogId!=null or pointId!=null or pointId!=''">
-                LEFT JOIN `p_point` `b` ON `a`.`point_id` = `b`.`id` 
+                LEFT JOIN `p_point` `b` ON `a`.`point_id` = `b`.`id`
             </if>
-           
+
        <!--  </choose> -->
         <trim prefix="WHERE" prefixOverrides="AND ">
             <if test="beginDate!=null and endDate!=null">and a.check_time BETWEEN #{beginDate} and #{endDate}</if>
@@ -578,7 +578,7 @@
 		AND ii.id = ci.input_id
 		AND c.id = #{checkId}
 		ORDER BY
-			ci.order_no	
+			ci.order_no
 	</select>
 
     <select id="queryCheckImgs" resultType="Map">
@@ -737,9 +737,9 @@
         ) AS `Finish_Status`,
         CASE
         WHEN a.is_ok = '1' THEN
-        '合格'
+        '正常'
         WHEN a.is_ok = '2' THEN
-        '不合格'
+        '异常'
         ELSE
         '漏检'
         END AS isOk,
@@ -1650,12 +1650,12 @@
         END finish
         FROM
         p_check c
-        LEFT JOIN p_plan p ON c.plan_id = p.id 
+        LEFT JOIN p_plan p ON c.plan_id = p.id
         LEFT JOIN p_plan_task pnt ON c.plan_task_id = pnt.id
         LEFT JOIN p_route r ON c.route_id = r.id
         LEFT JOIN p_point pt ON c.point_id = pt.id
         LEFT JOIN s_department d ON d.id = u.department_id
-        WHERE 1=1 
+        WHERE 1=1
         <choose>
             <when test=" statisticsTyle == 1 ">
                 and r.id is not NULL
@@ -2145,9 +2145,9 @@
 			pc.user_id as userId,
 			pc.id checkId
 		FROM
-		p_check pc 
+		p_check pc
 		LEFT JOIN p_point pp ON pp.id = pc.point_id
-		WHERE pc.id = #{checkId} 
+		WHERE pc.id = #{checkId}
 	</select>
 
     <resultMap id="CheckInputBuMap" type="com.yeejoin.amos.patrol.common.core.response.CheckInputBusinessResponse">
@@ -2155,7 +2155,7 @@
         <result property="pointInputitemName" column="pointInputitemName"/>
         <result property="pointInputitemId" column="pointInputitemId"/>
         <result property="checkInputitemId" column="checkInputitemId"/>
-        <result property="pointClassifyId" column="pointClassifyId"/>       
+        <result property="pointClassifyId" column="pointClassifyId"/>
     </resultMap>
     <select id="queryPointInputBu" resultMap="CheckInputBuMap">
 		SELECT
@@ -2172,7 +2172,7 @@
 		WHERE
 			pci.check_id = #{checkId}
 	</select>
-	
+
 	<select id="getCheckPhotosByCheckAndInputIdAndClassifyId" resultType="String">
         SELECT
         cs.photo_data