zhongrj
2023-04-28 d2f2faf246d45c7bbb0daccbbe005fab4597eb86
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
@@ -213,27 +213,31 @@
   public IPage<CallTaskResultVO> getCallTaskResultListPage(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
      List<String> list = new ArrayList<>();
      if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
         // 查询水库名称
         // 查询所有下级区域code
         list = getWaterNameByAreaCode(callTaskResult.getAreaName());
      }
      List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list);
      //遍历
      if (resultListPage.size()>0) {
         for (CallTaskResultVO resultVO : resultListPage) {
            // 取出 jsonData 数据
            String callTaskCalleeContent = resultVO.getCallTaskCalleeContent();
            JSONObject jsonObject = JSONObject.parseObject(callTaskCalleeContent);
            String userName = jsonObject.getString("$用户名$");
            String adName = jsonObject.getString("$水库名称$");
            resultVO.setAdName(adName);
            resultVO.setAreaName(getAreaNameByAdCode(jsonObject.getString("$水库编码$")));
            resultVO.setUserName(userName);
         }
      }
      return page.setRecords(resultListPage);
   }
   /**
    * 导出呼叫详情列表信息
    * @param callTaskResult
    * @return
    */
   @Override
   public Object getCallTaskResultList(CallTaskResultVO callTaskResult) {
      List<String> list = new ArrayList<>();
      if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
         // 查询所有下级区域code
         list = getWaterNameByAreaCode(callTaskResult.getAreaName());
      }
      List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list);
      // 返回
      return resultListPage;
   }
   /**
    * 通过水库编码获取行政区名称
    * @param adCode
    * @return