admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-08-06 09:59:04 +08:00
commit 1e78e9b993
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DownloadController.java
View File

@ -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<String, Object> 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<String, Object> 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);
}

3
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
View File

@ -491,6 +491,9 @@
WHERE t.project_sn = #{param.projectSn}
<include refid="whereCondition">
</include>
<if test="param.enterpriseId != null and param.enterpriseId != ''">
and t.enterprise_id = #{param.enterpriseId}
</if>
order by t.create_time desc
</select>

3
src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
View File

@ -519,6 +519,9 @@
WHERE t.project_sn = #{param.projectSn}
<include refid="whereCondition">
</include>
<if test="param.enterpriseId != null and param.enterpriseId != ''">
and t.enterprise_id = #{param.enterpriseId}
</if>
order by t.create_time desc
</select>