Merge branch 'test_future_wangge' into test

CeDo

2021-06-05 bab357624591b54d08cfc4237dacb6415c654cc2

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

@@ -53,7 +53,6 @@
    @Resource
    private EventGridDataMapper eventGridDataMapper;


    /**
     * 分页查找事件
     * @param pageEventDTO
@@ -252,6 +251,10 @@
        }else{
            eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        }
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(commonEventAddDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        eventDO.setEventCategory(1l);//办件事件
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setProcessType(1);//网格员处理
@@ -316,6 +319,10 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveDraft(CommonEventEditDTO commonEventEditDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(commonEventEditDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        if(commonEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
@@ -492,11 +499,10 @@
        }
        boolean canRevoke = eventDO.getEventStatus()==2; //发布状态
        if(!canRevoke){
            return R.fail("当前事件不允许撤销");
            return R.fail("当前事件不允许·");
        }
        if(eventDO.getEventCategory()!=null && eventDO.getEventCategory().intValue()==2){//宣传教育事件
            //不做验证
        }else if(eventDO.getEventProcessStatus()==2 ||eventDO.getEventProcessStatus()==3) {   //已解决 或者 待验证 不允许撤销
        Integer eventProcessStatus = eventDO.getEventProcessStatus()!=null?eventDO.getEventProcessStatus():-1;
         if(eventProcessStatus==2 ||eventProcessStatus==3) {   //已解决 或者 待验证 不允许撤销
            return R.fail("当前事件不允许撤销");
        }
        eventDO.setEventStatus(4);
@@ -505,7 +511,8 @@
        eventDO.setCommunityProcess(0);//非 社区处理
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"撤销成功");
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
                    1,"撤销成功", eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName());
            return R.ok();
        }
        return R.fail();
@@ -687,6 +694,10 @@

    @Override
    public R saveSpecialDraft(SpecialEventEditDTO specialEventEditDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(specialEventEditDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        R rtVal = R.fail();
        if(specialEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
@@ -820,6 +831,10 @@

    @Override
    public R addSpecial(SpecialEventAddDTO specialEventAddDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(specialEventAddDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        R rtVal = R.fail();
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(specialEventAddDTO, eventDO);
@@ -900,6 +915,10 @@

    @Override
    public R addPublicity(PublicityEventAddDTO publicityEventAddDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(publicityEventAddDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
        eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
@@ -964,6 +983,10 @@

    @Override
    public R savePublicityDraft(PublicityEventEditDTO publicityEventEditDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(publicityEventEditDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        if(publicityEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
            BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
@@ -1226,13 +1249,14 @@
            return R.fail("事件所属错误");
        }
        eventDO.setInvalid(false);
        //标为无效后， 交给网格员处理
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
        eventDO.setEventStatus(4);//4、撤销
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"撤销成功");
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"标为无效", eventRevokeDTO.getCommunityId(), eventRevokeDTO.getCommunityName());
            return R.ok();
        }
        return R.fail();
@@ -1421,6 +1445,7 @@
        return eventTransferRecordDO;
    }


    /**
     * 查询最后的流转记录，并添加事件流转记录
     * @param eventId 事件ID
@@ -1430,7 +1455,7 @@
     * @param msg 流转消息
     * @return
     */
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg){
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg, Long processBy, String processByName){
        List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
                .eq(EventTransferRecordDO::getEventId, eventId)
                .orderByDesc(EventTransferRecordDO::getCreateAt)
@@ -1449,6 +1474,8 @@
        eventTransferRecordDO.setToName(toName);
        eventTransferRecordDO.setEventId(eventId);
        eventTransferRecordDO.setProcessResult(msg);
        eventTransferRecordDO.setProcessBy(processBy);
        eventTransferRecordDO.setProcessByName(processByName);
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted==1) {
            this.updateEventDealStatus(eventId);
@@ -1458,6 +1485,20 @@
        }
    }


    /**
     * 查询最后的流转记录，并添加事件流转记录
     * @param eventId 事件ID
     * @param toId 流转到 ID
     * @param toName 流转到 名称
     * @param toType 发送类型
     * @param msg 流转消息
     * @return
     */
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg){
        return addTransferRecord(eventId, toId, toName, toType, msg, null, null);
    }

    /**
     * 根据子状态 查询用户事件处理状态
     * @param eventId 事件ID