zcloud_gbs
/
zcloud_gbs_key_project
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加安全环保检查导出功能

main
zhangyue 2026-04-13 11:33:33 +08:00
parent ab7b7e0aad
commit 125c3a626c
16 changed files with 186 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java
View File

@ -5,6 +5,7 @@ import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse;
import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.key.project.api.inspection.SafetyEnvironmentalInspectionServiceI;
import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO;
import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAddCmd;
@ -17,6 +18,7 @@ import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
/**
@ -70,7 +72,11 @@ public class SafetyEnvironmentalInspectionController {
public PageResponse<SafetyEnvironmentalInspectionCO> page(@RequestBody SafetyEnvironmentalInspectionPageQry qry) {
return safetyEnvironmentalInspectionService.listPage(qry);
}
@ApiOperation("导出")
@GetMapping("/export")
public void export(@RequestParam(value = "ids") Long[] ids, HttpServletResponse httpServletResponse) {
safetyEnvironmentalInspectionService.export(ids, httpServletResponse);
}
@ApiOperation("所有数据")
@GetMapping("/listAll")
public MultiResponse<SafetyEnvironmentalInspectionCO> listAll() {

3
web-app/src/main/java/com/zcloud/key/project/command/convertor/inspection/SafetyEnvironmentalInspectionCoConvertor.java
View File

@ -1,5 +1,6 @@
package com.zcloud.key.project.command.convertor.inspection;
import com.zcloud.gbscommon.excelEntity.SafetyEnvironmentalInspectionExportEntity;
import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO;
import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO;
import org.mapstruct.Mapper;
@ -22,5 +23,7 @@ public interface SafetyEnvironmentalInspectionCoConvertor {
List<SafetyEnvironmentalInspectionCO> converDOsToCOs(List<SafetyEnvironmentalInspectionDO> safetyEnvironmentalInspectionDOs);
SafetyEnvironmentalInspectionCO converDOToCO(SafetyEnvironmentalInspectionDO safetyEnvironmentalInspectionDO);
List<SafetyEnvironmentalInspectionExportEntity> converDOsToExcelEntitys(List<SafetyEnvironmentalInspectionDO> safetyEnvironmentalInspectionDOs);
}

2
web-app/src/main/java/com/zcloud/key/project/command/query/ai/AiAlarmQueryExe.java
View File

@ -33,7 +33,7 @@ public class AiAlarmQueryExe {
* @return
*/
public AiAlarmCO queryById(Long id) {
return aiAlarmCoConvertor.converDOToCO(aiAlarmRepository.getById(id));
return aiAlarmCoConvertor.converDOToCO(aiAlarmRepository.findById(id));
}
/**

27
web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java
View File

@ -1,6 +1,10 @@
package com.zcloud.key.project.command.query.inspection;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.exception.BizException;
import com.zcloud.gbscommon.excelEntity.SafetyEnvironmentalInspectionExportEntity;
import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
import com.zcloud.gbscommon.utils.ExcelUtils;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.key.project.command.convertor.hidden.HiddenCoConvertor;
import com.zcloud.key.project.command.convertor.hidden.HiddenFindUserCoConvertor;
@ -18,6 +22,7 @@ import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO;
import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO;
import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO;
import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO;
import com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionMapper;
import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository;
import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository;
import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionContentRepository;
@ -27,10 +32,9 @@ import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@ -126,5 +130,20 @@ public class SafetyEnvironmentalInspectionQueryExe {
List<SafetyEnvironmentalInspectionCO> examCenterCOS = safetyEnvironmentalInspectionCoConvertor.converDOsToCOs(pageResponse.getData());
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
public void export(Long[] ids, HttpServletResponse httpServletResponse) {
if (ids == null || ids.length == 0){
throw new BizException("请勾选要导出的数据");
}
Map<String, Object> params = new HashMap<>();
params.put("ids", ids);
List<SafetyEnvironmentalInspectionDO> safetyEnvironmentalInspectionDOs = safetyEnvironmentalInspectionRepository.listAll(params);
List<SafetyEnvironmentalInspectionExportEntity> safetyEnvironmentalInspectionExportEntities = safetyEnvironmentalInspectionCoConvertor.converDOsToExcelEntitys(safetyEnvironmentalInspectionDOs);
try {
ExcelUtils.exportExcel(httpServletResponse, SafetyEnvironmentalInspectionExportEntity.class, "安全环保检查信息", safetyEnvironmentalInspectionExportEntities);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}

7
web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java
View File

@ -15,6 +15,8 @@ import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUpdate
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
/**
* web-app
*
@ -70,5 +72,10 @@ public class SafetyEnvironmentalInspectionServiceImpl implements SafetyEnvironme
public void removeBatch(Long[] ids) {
safetyEnvironmentalInspectionRemoveExe.execute(ids);
}
@Override
public void export(Long[] ids, HttpServletResponse httpServletResponse) {
safetyEnvironmentalInspectionQueryExe.export(ids, httpServletResponse);
}
}

4
web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java
View File

@ -8,6 +8,8 @@ import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAuditD
import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionPageQry;
import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUpdateCmd;
import javax.servlet.http.HttpServletResponse;
/**
* web-client
*
@ -30,5 +32,7 @@ public interface SafetyEnvironmentalInspectionServiceI {
void remove(Long id);
void removeBatch(Long[] ids);
void export(Long[] ids, HttpServletResponse httpServletResponse);
}

8
web-client/src/main/java/com/zcloud/key/project/dto/clientobject/ai/AiAlarmCO.java
View File

@ -50,6 +50,14 @@ public class AiAlarmCO extends ClientObject {
private LocalDateTime alarmTime;
@ApiModelProperty(value = "相关方单位负责人id")
private String xgfMasterUserId;
@ApiModelProperty(value = "相关方单位负责人名称")
private String xgfMasterUserName;
@ApiModelProperty(value = "相关方单位负责人部门id")
private String xgfMasterDepartmentId;
@ApiModelProperty(value = "相关方单位负责人部门名称")
private String xgfMasterDepartmentName;
//处置状态 0-待处理 1-已处理
@ApiModelProperty(value = "处置状态 0-待处理 1-已处理")
private Integer state;

19
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/ai/AiAlarmDO.java
View File

@ -62,6 +62,25 @@ public class AiAlarmDO extends BaseDO {
@ApiModelProperty(value = "处置人")
private Long disposeUserId;
// kp.xgf_master_user_id,
// xgfu.name as xgf_master_user_name,
// xgfu.department_id as xgf_master_department_id,
// xgfd.name as xgf_master_department_name
@ApiModelProperty(value = "相关方单位负责人id")
@TableField(exist = false)
private String xgfMasterUserId;
@ApiModelProperty(value = "相关方单位负责人名称")
@TableField(exist = false)
private String xgfMasterUserName;
@ApiModelProperty(value = "相关方单位负责人部门id")
@TableField(exist = false)
private String xgfMasterDepartmentId;
@ApiModelProperty(value = "相关方单位负责人部门名称")
@TableField(exist = false)
private String xgfMasterDepartmentName;
public AiAlarmDO(String aiAlarmId) {
this.aiAlarmId = aiAlarmId;
}

2
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java
View File

@ -16,5 +16,7 @@ import java.util.Map;
@Mapper
public interface AiAlarmMapper extends BaseMapper<AiAlarmDO> {
IPage<AiAlarmDO> selectListPage(IPage<AiAlarmDO> iPage, Map<String, Object> params, String menuPerms);
AiAlarmDO findById(Long id);
}

3
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java
View File

@ -8,6 +8,7 @@ import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
@ -24,5 +25,7 @@ public interface SafetyEnvironmentalInspectionMapper extends BaseMapper<SafetyEn
SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId);
SafetyEnvironmentalInspectionDO getInfoById(Long id);
List<SafetyEnvironmentalInspectionDO> listAll(@Param("params") Map<String, Object> params);
}

2
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/ai/AiAlarmRepository.java
View File

@ -14,5 +14,7 @@ import java.util.Map;
*/
public interface AiAlarmRepository extends BaseRepository<AiAlarmDO> {
PageResponse<AiAlarmDO> listPage(Map<String, Object> params);
AiAlarmDO findById(Long id);
}

5
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/ai/AiAlarmRepositoryImpl.java
View File

@ -32,5 +32,10 @@ public class AiAlarmRepositoryImpl extends BaseRepositoryImpl<AiAlarmMapper, AiA
IPage<AiAlarmDO> result = aiAlarmMapper.selectListPage(iPage, params, null);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public AiAlarmDO findById(Long id) {
return aiAlarmMapper.findById(id);
}
}

6
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java
View File

@ -14,6 +14,7 @@ import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmen
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
@ -61,5 +62,10 @@ public class SafetyEnvironmentalInspectionRepositoryImpl extends BaseRepositoryI
public SafetyEnvironmentalInspectionDO getInfoById(Long id) {
return safetyEnvironmentalInspectionMapper.getInfoById(id);
}
@Override
public List<SafetyEnvironmentalInspectionDO> listAll(Map<String, Object> params) {
return safetyEnvironmentalInspectionMapper.listAll(params);
}
}

3
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java
View File

@ -5,6 +5,7 @@ import com.jjb.saas.framework.repository.repo.BaseRepository;
import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO;
import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO;
import java.util.List;
import java.util.Map;
/**
@ -22,5 +23,7 @@ public interface SafetyEnvironmentalInspectionRepository extends BaseRepository<
SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId);
SafetyEnvironmentalInspectionDO getInfoById(Long id);
List<SafetyEnvironmentalInspectionDO> listAll(Map<String, Object> params);
}

16
web-infrastructure/src/main/resources/mapper/ai/AiAlarmMapper.xml
View File

@ -23,5 +23,21 @@
</if>
</where>
</select>
<select id="findById" resultType="com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO">
select
aa.*,
kp.project_name,
kp.xgf_master_user_id,
xgfu.name as xgf_master_user_name,
xgfu.department_id as xgf_master_department_id,
xgfd.name as xgf_master_department_name
from
ai_alarm aa
left join key_project kp on kp.key_project_id = aa.key_project_id
left join user xgfu on xgfu.id = kp.xgf_master_user_id
left join department xgfd on xgfd.id = xgfu.department_id
where aa.id = #{id}
</select>
</mapper>

77
web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
View File

@ -142,5 +142,82 @@
left join department ad on ad.id = i.department_id
where i.id = #{id}
</select>
<select id="listAll" resultType="com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO">
select
i.*,
kp.project_name,
GROUP_CONCAT(DISTINCT iuu.name) inspection_user_name,
indc.corp_name inspected_corpinfo_name,
xmu.name xgf_master_user_name
FROM
safety_environmental_inspection i
left join key_project kp on kp.key_project_id = i.key_project_id
left join user creu on creu.id = i.create_id
left join (
SELECT
inspection_id,
department_id,
user_id,
type,
RANK() OVER (
PARTITION BY inspection_id
ORDER BY type DESC
) AS rn
FROM safety_environmental_inspection_user
WHERE delete_enum = 'FALSE'
AND type IN (2, 5)
) iu on iu.inspection_id = i.inspection_id AND iu.rn = 1
left join user iuu on iuu.id = iu.user_id
left join corp_info indc on indc.id = i.inspected_corpinfo_id
left join user xmu on xmu.id = i.xgf_master_user_id
where i.delete_enum = 'FALSE'
<if test="params.place != null and params.place != ''">
and i.place LIKE CONCAT('%', #{params.place}, '%')
</if>
<if test="params.createName != null and params.createName != ''">
and creu.name LIKE CONCAT('%', #{params.createName}, '%')
</if>
<if test="params.inspectionDepartmentId != null and params.inspectionDepartmentId != ''">
and iu.department_id = #{params.inspectionDepartmentId}
</if>
<if test="params.timeStart != null and params.timeStart != ''">
and i.time_end >= #{params.timeStart}
</if>
<if test="params.timeEnd != null and params.timeEnd != ''">
and i.time_start &lt;= #{params.timeEnd}
</if>
<if test="params.year != null and params.year != ''">
and YEAR(STR_TO_DATE(i.create_time, '%Y-%m-%d %H:%i:%s')) = #{params.year}
</if>
<if test="params.inspectedCorpinfoName != null and params.inspectedCorpinfoName != ''">
and indc.corp_name LIKE CONCAT('%', #{params.inspectedCorpinfoName}, '%')
</if>
<if test="params.projectName != null and params.projectName != ''">
and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%')
</if>
<if test="params.statusList != null and params.statusList.size() > 0">
and i.status in
<foreach item="status" collection="params.statusList" separator="," open="(" close=")" index="">
#{status}
</foreach>
</if>
<if test="params.ids != null and params.ids.size() > 0">
and i.id in
<foreach item="id" collection="params.ids" separator="," open="(" close=")" index="">
#{id}
</foreach>
</if>
GROUP BY i.id
<if test="params.inspectionUserName != null and params.inspectionUserName != ''">
HAVING inspection_user_name LIKE CONCAT('%', #{params.inspectionUserName}, '%')
</if>
ORDER BY
CASE WHEN i.status = 6 THEN 0 ELSE 1 END,
i.create_time desc
</select>
</mapper>