Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java

@@ -17,12 +17,20 @@
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.ECallEventEntity;
import org.springblade.modules.task.vo.ECallEventVO;
import org.springblade.modules.task.mapper.EcCallEventMapper;
import org.springblade.modules.task.service.IECallEventService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

/**
 * e呼即办表 服务实现类
@@ -35,8 +43,26 @@

   @Override
   public IPage<ECallEventVO> selectECallEventPage(IPage<ECallEventVO> page, ECallEventVO eCallEvent) {
      return page.setRecords(baseMapper.selectECallEventPage(page, eCallEvent));
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      return page.setRecords(baseMapper.selectECallEventPage(page, eCallEvent,regionChildCodesList,isAdministrator));
   }


   /**
    * e呼即办数据处理
    */
   @Override
   public Object dataHandle() {
      List<ECallEventEntity> list = list();
      // 遍历
      for (ECallEventEntity eCallEventEntity : list) {
         if (!Strings.isBlank(eCallEventEntity.getLocation())){
            String[] split = eCallEventEntity.getLocation().split(",");
            eCallEventEntity.setAddress(split[2]);
            // 更新
            updateById(eCallEventEntity);
         }
      }
      return null;
   }
}