c442d9ab 康伟

Merge remote-tracking branch 'origin/master'

2 个父辈 cd72eacb 494045af
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
26 d.depart_name AS depart_name, 26 d.depart_name AS depart_name,
27 r.report_date AS danger_date, 27 r.report_date AS danger_date,
28 r.danger_name AS danger_location, 28 r.danger_name AS danger_location,
29 1 AS is_fault 29 1 AS is_fault,
30 r.status
30 FROM 31 FROM
31 sys_depart d 32 sys_depart d
32 LEFT JOIN danger_inspection_record r ON d.id = r.depart_id 33 LEFT JOIN danger_inspection_record r ON d.id = r.depart_id
......
...@@ -25,6 +25,9 @@ public class DangerDatabaseResult { ...@@ -25,6 +25,9 @@ public class DangerDatabaseResult {
25 /**是否异常*/ 25 /**是否异常*/
26 @ApiModelProperty(value = "是否异常") 26 @ApiModelProperty(value = "是否异常")
27 private String isFault; 27 private String isFault;
28 /**状态*/
29 @ApiModelProperty(value = "状态")
30 private String status;
28 31
29 /**巡查人员*/ 32 /**巡查人员*/
30 @ApiModelProperty(value = "巡查人员") 33 @ApiModelProperty(value = "巡查人员")
......
...@@ -63,7 +63,7 @@ public class APPDangerInspectionRecordController { ...@@ -63,7 +63,7 @@ public class APPDangerInspectionRecordController {
63 queryWrapper.eq("danger_id", dangerInspectionRecord.getDangerId()); 63 queryWrapper.eq("danger_id", dangerInspectionRecord.getDangerId());
64 } 64 }
65 if(StringUtils.isNotBlank(dangerInspectionRecord.getDepartId())){ 65 if(StringUtils.isNotBlank(dangerInspectionRecord.getDepartId())){
66 queryWrapper.ge("depart_id", dangerInspectionRecord.getDepartId() ) ; 66 queryWrapper.eq("depart_id", dangerInspectionRecord.getDepartId() ) ;
67 } 67 }
68 if(StringUtils.isNotBlank(dangerInspectionRecord.getStartTime())){ 68 if(StringUtils.isNotBlank(dangerInspectionRecord.getStartTime())){
69 queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ; 69 queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!