巡查任务巡查责任人完成任务逻辑修改

guoshilong

2023-05-18 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java

@@ -23,6 +23,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

@@ -224,7 +225,7 @@
         // 查询所有下级区域code
         list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
      }
      List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list);
      List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list,null);
      return page.setRecords(resultListPage);
   }

@@ -236,16 +237,54 @@
   @Override
   public Object getCallTaskResultList(CallTaskResultVO callTaskResult) {
      List<String> list = new ArrayList<>();
      List<String> idsList = new ArrayList<>();
      if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
         // 查询所有下级区域code
         list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
      }
      List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list);
      if (null!= callTaskResult.getIds() && !callTaskResult.getIds().equals("")){
         // 查询所有下级区域code
         idsList = Arrays.asList(callTaskResult.getIds().split(","));
      }
      List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list,idsList);
      // 返回
      return resultListPage;
   }

   /**
    * 查询智能外呼统计数据-按日期-行政区统计
    * @param callTaskStatistic
    * @return
    */
   @Override
   public Object getOutgoingStatisticList(IPage<CallTaskStatistic> page,CallTaskStatistic callTaskStatistic) {
      List<String> list = new ArrayList<>();
      if (null!= callTaskStatistic.getAdName() && !callTaskStatistic.getAdName().equals("")){
         // 查询所有下级区域code
         list = getAllChildrenAreaByAreaCode(callTaskStatistic.getAdName());
      }
      // 勾选导出行政区 id 组装
      if (null!= callTaskStatistic.getIds() && !callTaskStatistic.getIds().equals("")){
         list = Arrays.asList(callTaskStatistic.getIds().split(","));
      }
      // 判断是否分页
      if (null!= callTaskStatistic.getIsPage()){
         return callTaskMapper.getOutgoingStatisticList(null,callTaskStatistic,list);
      }
      return page.setRecords(callTaskMapper.getOutgoingStatisticList(page,callTaskStatistic,list));
   }

   /**
    * 查询智能外呼统计数据-行政区统计
    * @param callTaskStatistic
    * @return
    */
   @Override
   public Object getOutgoingStatisticByArea(CallTaskStatistic callTaskStatistic) {
      return callTaskMapper.getOutgoingStatisticByArea(callTaskStatistic);
   }

   /**
    * 查询所有下级区域
    * @param areaCode
    * @return