diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/SafetyInspectionStandardBigScreenController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/SafetyInspectionStandardBigScreenController.java index bd5e179ad..4706cc905 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/SafetyInspectionStandardBigScreenController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/SafetyInspectionStandardBigScreenController.java @@ -114,7 +114,8 @@ public class SafetyInspectionStandardBigScreenController { List allTopTypes = xzSecurityDangerTypeRecordService.getTopTypes(topCodes); List allTypeRecords = xzSecurityDangerTypeRecordService.list(); List allItemRecords = xzSecurityDangerItemRecordService.list(); - List inspectionRecords = xzSecurityQualityInspectionRecordService.selectQualityInspectionRecordPage(new MapBuilder().put("endMonth", month).put("status", 60).put("projectSn", projectSn).put("pageSize", -1).build()).getPage().getRecords(); + List inspectionRecords = xzSecurityQualityInspectionRecordService.selectQualityInspectionRecordPage(new MapBuilder().put("endMonth", month).put("projectSn", projectSn).put("pageSize", -1).build()).getPage().getRecords(); + inspectionRecords = inspectionRecords.stream().filter(i -> i.getRecordType() == null || i.getRecordType() != 3 || (i.getRecordType() == 3 && !DateUtil.format(i.getRectifyTime(), "yyyy-MM").equals(month))).collect(Collectors.toList()); Map> tenTopTypes = allTopTypes.stream().collect(Collectors.groupingBy(XzSecurityDangerTypeRecord::getTenType)); for (Map.Entry> tenEntry : tenTopTypes.entrySet()) { Integer tenType = tenEntry.getKey(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordVo.java index 7e638fb97..3939ae710 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordVo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; @Data public class XzSecurityQualityInspectionRecordVo extends XzSecurityQualityInspectionRecord { @@ -39,4 +40,10 @@ public class XzSecurityQualityInspectionRecordVo extends XzSecurityQualityInspec @ApiModelProperty(value = "总企业名称") private String mainEnterpriseName; + @ApiModelProperty(value = "整改时间") + private Date rectifyTime; + + @ApiModelProperty(value = "整改类型") + private Integer rectifyType; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml index ee85671dd..346b09d5f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml @@ -250,6 +250,8 @@