bugfixed

CeDo

2021-06-05 70741d8d60a8fd99f5fa10f5a6f83fd50f02257d

bugfixed

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java

@@ -63,4 +63,6 @@
    private Integer operateType;
    @ApiModelProperty(value = "(当前操作)用户社区ID", hidden = true, example = "1")
    private Long communityId;
    @ApiModelProperty(value = "(当前操作)用户社区名称", hidden = true, example = "学园社区")
    private String communityName;
}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java

@@ -127,6 +127,8 @@
        commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventDealDTO.setUserName(loginUserInfoVO.getName());
        commonEventDealDTO.setOperateType(0);
        commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName());
        return gridService.dealEvent(commonEventDealDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/SpecialPopulationEventApi.java

@@ -107,6 +107,8 @@
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventDealDTO.setUserName(loginUserInfoVO.getName());
        commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName());
        return gridService.dealEvent(commonEventDealDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java

@@ -165,6 +165,7 @@
        commonEventDealDTO.setUserName(loginUserInfoVO.getName());
        commonEventDealDTO.setOperateType(1);
        commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName());
        return gridService.dealEvent(commonEventDealDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -487,7 +487,8 @@
        if(updated!=1){
            throw new ServiceException("更新突发事件状态更新失败");
        }
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult(),2);
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult(),
                commonEventReportDTO.getUserId(), commonEventReportDTO.getUserName(), 2);
        return R.ok();

    }
@@ -558,7 +559,7 @@
            processType = 1;
        }
        EventTransferRecordDO transferRecordDO =
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成", processType);
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成",  commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(), processType);
        if(transferRecordDO!=null && transferRecordDO.getId()!=null){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
@@ -659,7 +660,8 @@
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件", 8);
        addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,
                "重新发布已撤销事件", commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 8);
        return R.ok();
    }

@@ -1284,7 +1286,8 @@
        eventDO.setInvalid(true);
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功", 9 );
            addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功",
                    commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 9 );
            return R.ok();
        }
        return R.fail();
@@ -1320,7 +1323,8 @@
            return R.fail("更新事件状态失败");
        }
        EventTransferRecordDO transferRecordDO =
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成", 3);
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1,
                        "社区处理完成", commonEventDealDTO.getCommunityId(), commonEventDealDTO.getCommunityName(), 3);
        if(transferRecordDO!=null && transferRecordDO.getId()!=null){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
@@ -1506,9 +1510,9 @@
     * @param msg 流转消息
     * @return
     */
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg,Integer processType){
   /* private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg,Integer processType){
        return addTransferRecord(eventId, toId, toName, toType, msg, null, null, processType);
    }
    }*/

    /**
     * 根据子状态 查询用户事件处理状态