事故管理 事故快报修改 bugfix

SZH

2023-02-24 24fa7cc98e04dd04d0a3ca1af6f40a2c05025279

事故管理 事故快报修改 bugfix

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

@@ -182,7 +182,7 @@
        }
    }

    private void updateAccidentExpressFile(Long uid, Long accidentExpressId, Date nowDate, List<AccidentExpressFileReqDTO> AccidentExpressFileReqDTOList) {
    private void updateAccidentExpressFile(Long uid, Long accidentExpressId, Date nowDate, List<AccidentExpressFileReqDTO> accidentExpressFileReqDTOList) {

        List<AccidentExpressFileInfoDO> accidentExpressFileInfoDOList = accidentExpressFileInfoService.selectByAccidentExpressId(accidentExpressId);
        List<Long> oldIdsList = accidentExpressFileInfoDOList.stream().map(AccidentExpressFileInfoDO::getId).collect(Collectors.toList());
@@ -192,20 +192,22 @@
        List<AccidentExpressFileInfo> addList = new ArrayList<>();
        //删除的附件集合(id)
        List<Long> deleteList = new ArrayList<>();
        for (AccidentExpressFileReqDTO AccidentExpressFileReqDTO : AccidentExpressFileReqDTOList) {
            //如果不存在id则表示页面新增的附件
            if (AccidentExpressFileReqDTO.getId() == null) {
                AccidentExpressFileInfo AccidentExpressFileInfo = new AccidentExpressFileInfo();
                BeanUtils.copyProperties(AccidentExpressFileReqDTO, AccidentExpressFileInfo);
                AccidentExpressFileInfo.setDelFlag(false);
                AccidentExpressFileInfo.setGmtCreate(nowDate);
                AccidentExpressFileInfo.setCreateUid(uid);
                AccidentExpressFileInfo.setAccidentExpressId(accidentExpressId);
                addList.add(AccidentExpressFileInfo);
            }
            //如果存在id则判断页面是否删除
            else {
                newIdsList.add(AccidentExpressFileReqDTO.getId());
        if(accidentExpressFileReqDTOList != null && !accidentExpressFileInfoDOList.isEmpty()){
            for (AccidentExpressFileReqDTO accidentExpressFileReqDTO : accidentExpressFileReqDTOList) {
                //如果不存在id则表示页面新增的附件
                if (accidentExpressFileReqDTO.getId() == null) {
                    AccidentExpressFileInfo accidentExpressFileInfo = new AccidentExpressFileInfo();
                    BeanUtils.copyProperties(accidentExpressFileReqDTO, accidentExpressFileInfo);
                    accidentExpressFileInfo.setDelFlag(false);
                    accidentExpressFileInfo.setGmtCreate(nowDate);
                    accidentExpressFileInfo.setCreateUid(uid);
                    accidentExpressFileInfo.setAccidentExpressId(accidentExpressId);
                    addList.add(accidentExpressFileInfo);
                }
                //如果存在id则判断页面是否删除
                else {
                    newIdsList.add(accidentExpressFileReqDTO.getId());
                }
            }
        }
        for (Long oldId : oldIdsList) {