diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java index 1b2724403..1294b3d6d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java @@ -382,11 +382,12 @@ public class DownloadController { @ApiImplicitParam(name = "inspectManId", value = "检查人", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "inspectStartTime", value = "检查开始时间", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "inspectEndTime", value = "检查结束时间", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "enterpriseId", value = "合作单位id", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/exporExcelQualityInspectionRecord") public void exporExcelQualityInspectionRecord(HttpServletResponse response, String projectSn, String regionId, Integer status, Integer recordStatus, Integer urgentLevel, Integer level, String changeId, String creatorId, String reviewId, String verifyManId, String inspectManId, - String inspectStartTime, String inspectEndTime) { + String inspectStartTime, String inspectEndTime,String enterpriseId) { Map map = new HashMap<>(16); map.put("projectSn", projectSn); map.put("regionId", regionId); @@ -401,6 +402,7 @@ public class DownloadController { map.put("status", status); map.put("inspectStartTime", inspectStartTime); map.put("inspectEndTime", inspectEndTime); + map.put("enterpriseId", enterpriseId); qualityInspectionRecordService.exporExcelQualityInspectionRecord(response, map); } @@ -419,11 +421,12 @@ public class DownloadController { @ApiImplicitParam(name = "inspectManId", value = "检查人", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "inspectStartTime", value = "检查开始时间", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "inspectEndTime", value = "检查结束时间", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "enterpriseId", value = "合作单位id", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/exportExcelXzSecurityQualityInspectionRecord") public void exportExcelXzSecurityQualityInspectionRecord(HttpServletResponse response, String projectSn, String regionId, Integer status, Integer recordStatus, Integer urgentLevel, Integer level, String changeId, String creatorId, String reviewId, String verifyManId, String inspectManId, - String inspectStartTime, String inspectEndTime) { + String inspectStartTime, String inspectEndTime,String enterpriseId) { Map map = new HashMap<>(16); map.put("projectSn", projectSn); map.put("regionId", regionId); @@ -438,6 +441,7 @@ public class DownloadController { map.put("status", status); map.put("inspectStartTime", inspectStartTime); map.put("inspectEndTime", inspectEndTime); + map.put("enterpriseId", enterpriseId); qualityInspectionRecordService.exportExcelXzSecurityQualityInspectionRecord(response, map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml index ca7b2fdb0..7cd67b7a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml @@ -491,6 +491,9 @@ WHERE t.project_sn = #{param.projectSn} + + and t.enterprise_id = #{param.enterpriseId} + order by t.create_time desc 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 9f3c0583a..ca256c361 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 @@ -519,6 +519,9 @@ WHERE t.project_sn = #{param.projectSn} + + and t.enterprise_id = #{param.enterpriseId} + order by t.create_time desc