优化巡检详情显示功能

java110-bean/src/main/java/com/java110/dto/inspectionTaskDetail/InspectionTaskDetailDto.java

@@ -23,6 +23,7 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     private String taskId;
     private String taskDetailId;
     private String patrolType;
+    private String patrolTypeName;
     private String description;
 
 
@@ -119,4 +120,12 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public String getPatrolTypeName() {
+        return patrolTypeName;
+    }
+
+    public void setPatrolTypeName(String patrolTypeName) {
+        this.patrolTypeName = patrolTypeName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/inspectionTaskDetail/ApiInspectionTaskDetailDataVo.java

@@ -22,6 +22,8 @@ public class ApiInspectionTaskDetailDataVo implements Serializable {
     private List<PhotoVo> photos;
 
     private String patrolType;
+    private String patrolTypeName;
+
     private String description;
 
     public String getInspectionId() {
@@ -128,4 +130,12 @@ public class ApiInspectionTaskDetailDataVo implements Serializable {
     public void setPhotos(List<PhotoVo> photos) {
         this.photos = photos;
     }
+
+    public String getPatrolTypeName() {
+        return patrolTypeName;
+    }
+
+    public void setPatrolTypeName(String patrolTypeName) {
+        this.patrolTypeName = patrolTypeName;
+    }
 }

java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml

@@ -87,12 +87,15 @@
         select t.inspection_id,t.inspection_id inspectionId,t.status_cd,t.status_cd
         statusCd,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id
         communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId,
-        td1.name stateName,t.patrol_type,t.description,t.patrol_type patrolType
-        from inspection_task_detail t,t_dict td1
+        td1.name stateName,t.patrol_type,t.description,t.patrol_type patrolType,td2.name patrolTypeName
+        from inspection_task_detail t,t_dict td1,t_dict td2
         where 1 =1
         and t.state = td1.status_cd
         and td1.table_name = 'inspection_task_detail'
         and td1.table_columns = 'state'
+        and t.state = td2.status_cd
+        and td2.table_name = 'inspection_task_detail'
+        and td2.table_columns = 'patrol_type'
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
         </if>
@@ -168,11 +171,14 @@
     <!-- 查询巡检任务明细数量 add by wuxw 2018-07-03 -->
     <select id="queryInspectionTaskDetailsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from inspection_task_detail t,t_dict td1
+        from inspection_task_detail t,t_dict td1,t_dict td2
         where 1 =1
         and t.state = td1.status_cd
         and td1.table_name = 'inspection_task_detail'
         and td1.table_columns = 'state'
+        and t.state = td2.status_cd
+        and td2.table_name = 'inspection_task_detail'
+        and td2.table_columns = 'patrol_type'
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
         </if>