songhuangfeng123
2022-08-15 f779e4a1c54d4983aad644216ae3e17ae2c09f79
事故快报新增fix
已修改3个文件
11 ■■■■■ 文件已修改
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java
@@ -36,7 +36,7 @@
     * 事故快报新增
     */
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO addAccidentExpress(Authentication authentication, @RequestBody AccidentExpressReqDTO AccidentExpressReqDTO) {
    public ResultVO<AccidentExpressDetailRespDTO> addAccidentExpress(Authentication authentication, @RequestBody AccidentExpressReqDTO AccidentExpressReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accidentExpressService.addAccidentExpress(currentUser, AccidentExpressReqDTO);
    }
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java
@@ -16,7 +16,7 @@
    SearchResultVO<List<AccidentExpressPageRespDTO>> selectAccidentExpressList(PageQuery<AccidentExpressQuery> query);
    ResultVO addAccidentExpress(ContextCacheUser contextCacheUser, AccidentExpressReqDTO AccidentExpressReqDTO);
    ResultVO<AccidentExpressDetailRespDTO> addAccidentExpress(ContextCacheUser contextCacheUser, AccidentExpressReqDTO AccidentExpressReqDTO);
    ResultVO<AccidentExpressDetailRespDTO> getAccidentExpressById(Long id);
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
@@ -95,7 +95,7 @@
    }
    @Override
    public ResultVO addAccidentExpress(ContextCacheUser contextCacheUser, AccidentExpressReqDTO accidentExpressReqDTO) {
    public ResultVO<AccidentExpressDetailRespDTO> addAccidentExpress(ContextCacheUser contextCacheUser, AccidentExpressReqDTO accidentExpressReqDTO) {
        Long uid = contextCacheUser.getUid();
        String uName = contextCacheUser.getRealName();
        //必填项验证
@@ -114,7 +114,10 @@
        if (!CollectionUtils.isEmpty(accidentExpressReqDTO.getFileList())){
            addAccidentExpressFile(accidentExpressInfo.getId(),uid,nowDate,accidentExpressReqDTO.getFileList());
        }
        return new ResultVO(ResultCodes.OK);
        AccidentExpressDetailRespDTO accidentExpressDetailRespDTO = new AccidentExpressDetailRespDTO();
        BeanUtils.copyProperties(accidentExpressInfo,accidentExpressDetailRespDTO);
        return new ResultVO<>(ResultCodes.OK,accidentExpressDetailRespDTO);
    }
    private void  addAccidentExpressFile(Long accidentExpressId ,Long uid , Date nowDate , List<AccidentExpressFileReqDTO> AccidentExpressFileReqDTOList){