事故fix统计

songhuangfeng123

2022-08-17 8702c17288c16ec3d6760326e85cae37bbb10af8

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java

@@ -14,12 +14,11 @@
import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportFileReqDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportReqDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportDetailRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportFileRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportPageRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.*;
import com.gkhy.safePlatform.incidentManage.query.AccidentReportQuery;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportDBQuery;
import com.gkhy.safePlatform.incidentManage.service.AccidentReportService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentExpressFileInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentExpressInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentReportFileInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentReportInfoService;
@@ -46,6 +45,9 @@

    @Autowired
    private AccidentExpressInfoService accidentExpressInfoService;

    @Autowired
    private AccidentExpressFileInfoService accidentExpressFileInfoService;


    @Override
@@ -105,7 +107,6 @@
        accidentReportInfo.setDelFlag(false);
        accidentReportInfo.setCreateUid(uid);
        accidentReportInfo.setGmtCreate(nowDate);
        accidentReportInfo.setStatus(false);
        accidentReportInfoService.addAccidentReport(accidentReportInfo);
        //2.新增事故报告附件
        if (!CollectionUtils.isEmpty(accidentReportReqDTO.getFileList())) {
@@ -136,12 +137,20 @@
            throw new AccidentException(AccidentResultCodes.ACCIDENT_REPORT_NOT_EXIST);
        } else {
            BeanUtils.copyProperties(AccidentReportInfoDetailDO, AccidentReportDetailRespDTO);
            //查找对应的附件
            //查找事故报告对应的附件
            List<AccidentReportFileInfoDO> AccidentReportFileInfoDOList = accidentReportFileInfoService.selectByAccidentReportId(id);
            if (!CollectionUtils.isEmpty(AccidentReportFileInfoDOList)) {
                List<AccidentReportFileRespDTO> accidentReportFileRespDTOList = BeanCopyUtils.copyBeanList(AccidentReportFileInfoDOList, AccidentReportFileRespDTO.class);
                AccidentReportDetailRespDTO.setFileList(accidentReportFileRespDTOList);
            }
            //  查找事故快报对应的附件
            List<AccidentExpressFileInfoDO> AccidentExpressFileInfoDOList = accidentExpressFileInfoService.selectByAccidentExpressId(AccidentReportDetailRespDTO.getAccidentExpressId());
            if (!CollectionUtils.isEmpty(AccidentExpressFileInfoDOList)) {
                List<AccidentExpressFileRespDTO> accidentExpressFileRespDTOList = BeanCopyUtils.copyBeanList(AccidentExpressFileInfoDOList, AccidentExpressFileRespDTO.class);
                AccidentReportDetailRespDTO.setExpressFileList(accidentExpressFileRespDTOList);
            }


            return new ResultVO<>(ResultCodes.OK, AccidentReportDetailRespDTO);
        }
    }
@@ -208,18 +217,19 @@


    @Override
    public ResultVO batchDeleteAccidentReport(String ids) {
        if (StringUtils.isBlank(ids)) {
    public ResultVO batchDeleteAccidentReport(Long[] ids) {
        if (ids == null ||  ids.length==0){
            throw new AccidentException(AccidentResultCodes.ACCIDENT_REPORT_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteAccidentReport(Long.valueOf(id));

            for (Long id : ids){
                deleteAccidentReport(id);
            }
            return new ResultVO(ResultCodes.OK);
        }
    }


    private void deleteAccidentReport(Long id) {
        //查询是否存在
        AccidentReportInfoDetailDO AccidentReportInfoDetailDO = accidentReportInfoService.selectAccidentReportById(id);