Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -28,14 +28,12 @@
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.sse.server.SSEServer;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
@@ -43,7 +41,6 @@
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskReportStatistics;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -64,11 +61,6 @@
   @Autowired
   private ITaskService taskService;

   @Autowired
   private IGridService gridService;

   @Autowired
   private IDeptService deptService;

   /**
    * 自定义分页
@@ -80,11 +72,10 @@
   @Override
   public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class,taskReportForRepairs);
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class, taskReportForRepairs);
      taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      List<String> addressCodeList = new ArrayList<>();
      if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
          if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
         if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
            taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
            taskReportForRepairs.setConfirmUserId(null);
            //
@@ -119,8 +110,8 @@
         aoiCodeList = districtEntityList.stream().map(i -> i.getAoiCode()).collect(Collectors.toList());
      }

      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, addressCodeList,
         commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), aoiCodeList,commonParamSet.getGridCodeList()));
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,
         commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), aoiCodeList, commonParamSet.getGridCodeList()));
   }

   /**
@@ -156,6 +147,18 @@
      // 新增
      boolean save = taskService.save(taskEntity);
      if (save) {
         // 设置网格编码
//         if (taskReportForRepairs.getHouseFlag().equals(CommonConstant.NUMBER_TWO)) {
//            IPlaceService bean = SpringUtils.getBean(IPlaceService.class);
//            PlaceEntity placeEntity = bean.getOne(Wrappers.<PlaceEntity>lambdaQuery()
//               .eq(PlaceEntity::getHouseCode, taskReportForRepairs.getAddressCode()).last("limit 1"));
//            taskReportForRepairs.setGridCode(placeEntity.getGridCode());
//         } else {
//            IHouseService bean = SpringUtils.getBean(IHouseService.class);
//            HouseEntity houseEntity = bean.getOne(Wrappers.<HouseEntity>lambdaQuery()
//               .eq(HouseEntity::getHouseCode, taskReportForRepairs.getAddressCode()));
//            taskReportForRepairs.setGridCode(houseEntity.getGridCode());
//         }
         taskReportForRepairs.setTaskId(taskEntity.getId());
         taskReportForRepairs.setConfirmFlag(1);
         flag = save(taskReportForRepairs);
@@ -209,7 +212,8 @@

   @Override
   public Integer getStatistics(Long userId, String neiCode) {
      return baseMapper.getStatistics(userId, neiCode);
      String roleName = SpringUtils.getRequestParam("roleName");
      return baseMapper.getStatistics(userId, neiCode,roleName);
   }

   /**