Merge remote-tracking branch 'origin/master'

@@ -26,7 +26,8 @@
             d.depart_name AS depart_name,
             d.depart_name AS depart_name,
             r.report_date AS danger_date,
             r.report_date AS danger_date,
             r.danger_name AS danger_location,
             r.danger_name AS danger_location,
-            1 AS is_fault
+            1 AS is_fault,
+            r.status
         FROM
         FROM
             sys_depart d
             sys_depart d
             LEFT JOIN danger_inspection_record r ON d.id = r.depart_id
             LEFT JOIN danger_inspection_record r ON d.id = r.depart_id

@@ -25,6 +25,9 @@ public class DangerDatabaseResult {
 	/**是否异常*/
 	/**是否异常*/
     @ApiModelProperty(value = "是否异常")
     @ApiModelProperty(value = "是否异常")
 	private String isFault;
 	private String isFault;
+	/**状态*/
+	@ApiModelProperty(value = "状态")
+	private String status;
 
 
 	/**巡查人员*/
 	/**巡查人员*/
 	@ApiModelProperty(value = "巡查人员")
 	@ApiModelProperty(value = "巡查人员")

@@ -63,7 +63,7 @@ public class APPDangerInspectionRecordController {
             queryWrapper.eq("danger_id", dangerInspectionRecord.getDangerId());
             queryWrapper.eq("danger_id", dangerInspectionRecord.getDangerId());
         }
         }
         if(StringUtils.isNotBlank(dangerInspectionRecord.getDepartId())){
         if(StringUtils.isNotBlank(dangerInspectionRecord.getDepartId())){
-            queryWrapper.ge("depart_id", dangerInspectionRecord.getDepartId() ) ;
+            queryWrapper.eq("depart_id", dangerInspectionRecord.getDepartId() ) ;
         }
         }
         if(StringUtils.isNotBlank(dangerInspectionRecord.getStartTime())){
         if(StringUtils.isNotBlank(dangerInspectionRecord.getStartTime())){
             queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;
             queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;