短信指定楼栋发送

linwe

2024-08-09 8b7258c9427882bb1798f1502eaa35184c6e374e

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

@@ -18,7 +18,6 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.common.cache.SysCache;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
@@ -73,7 +72,10 @@
   public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class, taskReportForRepairs);
      taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      String userRole = AuthUtil.getUserRole();
      if (RoleUtil.isProperty(userRole) || RoleUtil.isWgy(userRole)){
         taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      }
      if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
         if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
            taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
@@ -82,7 +84,6 @@
            taskReportForRepairs.setRoleType("inhabitant");
         }
      }
      String userRole = AuthUtil.getUserRole();
      List<String> aoiCodeList = new ArrayList<>();
      if (RoleUtil.isProperty(userRole)) {
         taskReportForRepairs.setRoleType("wy");
@@ -91,7 +92,10 @@
         List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
         // 通过用户机构查询用户的物业公司
         IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
         PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
         PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
            .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId())
            .eq(PropertyCompanyEntity::getIsDeleted, 0)
            .last("limit 1"));
         if (companyEntity != null) {
            IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
            // 通过物业公司，查询小区
@@ -110,8 +114,9 @@
         aoiCodeList = districtEntityList.stream().map(i -> i.getAoiCode()).collect(Collectors.toList());
      }

      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,
         commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), aoiCodeList, commonParamSet.getGridCodeList()));
      List list = baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator(), aoiCodeList, commonParamSet.getGridCodeList(),commonParamSet.getCommunityCode());
      return page.setRecords(list);
   }

   /**
@@ -121,9 +126,10 @@
    */
   @Override
   public TaskReportStatistics getStatisticsCount(String houseCode) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, regionChildCodesList, isAdministrator);
      TaskReportForRepairsVO reportForRepairsVO = new TaskReportForRepairsVO();
      reportForRepairsVO.setHouseCode(houseCode);
      CommonParamSet invoke = new CommonParamSet<>().invoke(TaskReportForRepairsVO.class, reportForRepairsVO);
      return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, invoke.getRegionChildCodesList(), invoke.getIsAdministrator());
   }

   /**
@@ -211,9 +217,11 @@
   }

   @Override
   public Integer getStatistics(Long userId, String neiCode) {
   public Integer getStatistics(Long userId, String neiCode, List<String> regionChildCodesList,
                        Integer isAdministrator,
                         List<String> gridCodeList) {
      String roleName = SpringUtils.getRequestParam("roleName");
      return baseMapper.getStatistics(userId, neiCode,roleName);
      return baseMapper.getStatistics(userId, neiCode,roleName, regionChildCodesList,isAdministrator, gridCodeList);
   }

   /**