优化 巡检查询 出巡检项目功能

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

@@ -64,6 +64,7 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     private String nowTime;
 
     private String statusCd = "0";
+    private String itemId;
 
     public String getInspectionId() {
         return inspectionId;
@@ -352,4 +353,12 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     public void setInspectionEndTime(String inspectionEndTime) {
         this.inspectionEndTime = inspectionEndTime;
     }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
 }

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

@@ -55,6 +55,7 @@ public class ApiInspectionTaskDetailDataVo implements Serializable {
     //签到状态
     private String inspectionState;
     private String inspectionStateName;
+    private String itemId;
 
     public String getInspectionId() {
         return inspectionId;
@@ -327,4 +328,12 @@ public class ApiInspectionTaskDetailDataVo implements Serializable {
     public void setSortNumber(String sortNumber) {
         this.sortNumber = sortNumber;
     }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
 }

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

@@ -121,8 +121,9 @@
         inspectionStateName,
         ipl.inspection_plan_name,ipl.inspection_plan_name inspectionPlanName,ir.route_name,ir.route_name routeName,
         it.plan_user_name,it.plan_user_name planUserName,it.act_user_name,it.act_user_name actUserName,td4.name,td4.name
-        signTypeName,td5.name taskStateName
+        signTypeName,td5.name taskStateName,ip.item_id itemId
         from inspection_task_detail t
+        LEFT JOIN inspection_point ip on t.inspection_id = ip.inspection_id and ip.status_cd = '0'
         left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'inspection_task_detail' and
         td1.table_columns = 'state'
         left join t_dict td2 on t.patrol_type = td2.status_cd and td2.table_name = 'inspection_task_detail' and