Merge remote-tracking branch 'origin/jtdev' into jtdev

zhongrj

2023-06-19 a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java

@@ -9,6 +9,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
@@ -54,18 +55,35 @@
    */
   @Override
   public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
      List<String> list = new ArrayList<>();

      Object adCode = params.get("adCode");
      Object isExport = params.get("isExport");
      if (null != adCode && !adCode.equals("")) {
         list = callTaskMapper.getAllChildrenAreaByAreaCode(adCode.toString());
      Object adGrad = params.get("adGrad");
      String ad_code = "";
      String p_ad_code = "";
      String code = adCode.toString();
      if (adGrad.toString().equals("1")) {
         p_ad_code = code.substring(0,2);
      } else if (adGrad.toString().equals("2")) {
         p_ad_code = code.substring(0,4);
      } else if (adGrad.toString().equals("3")) {
         p_ad_code = code.substring(0,7);
      } else {
         ad_code = code;
      }

      Object isExport = params.get("isExport");
      // 判断是否导出，导出不分页
      if (null != isExport && !isExport.equals("")) {
         return baseMapper.getAttResBaseUserPage(null,list,params);
         return baseMapper.getAttResBaseUserPage(null,ad_code,p_ad_code,params);
      }
      List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,list,params);
      List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,ad_code,p_ad_code,params);
      // 返回数据
      return page.setRecords(attResBaseUserDTOList);
   }

   @Override
   public Boolean updateResBaseByGuid(AttResBase attResBase) {
      attResBase.setUpdateTime(DateUtil.now());
      return baseMapper.updateResBaseByGuid(attResBase);
   }
}