bug修复

linwei

2024-01-03 c9520071522dbd2929f4f8e28ce8b70712a2e5e8

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -26,10 +27,11 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.*;
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.service.*;
import org.springblade.modules.task.vo.TaskVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -57,9 +59,16 @@
   @Autowired
   private IHouseRentalService iHouseRentalService;


   @Autowired
   private IDeptService deptService;

   @Override
   public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
      task.setUserId(AuthUtil.getUserId());
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null != dept) {
         task.setCommunityCode(dept.getRegionCode());
      }
      // 民警角色
      if (AuthUtil.getUserRole().equals("mj")) {
         task.setUserId(AuthUtil.getUserId());
@@ -68,6 +77,9 @@
         if (AuthUtil.getUserAccount().equals("18879306957")) {
            task.setCommunityCode("361102003027");
            task.setUserId(null);
         }
         if (AuthUtil.getUserRole().equals("wgy")) {
            task.setUserId(AuthUtil.getUserId());
         }
         // 非民警角色
         List<TaskVO> taskVOS = baseMapper.selectTaskPage(page, task);
@@ -121,6 +133,7 @@
      LambdaQueryWrapper<TaskEntity> objectQueryWrapper = new LambdaQueryWrapper<>();
      objectQueryWrapper.eq(TaskEntity::getCreateUser, AuthUtil.getUserId());
      objectQueryWrapper.isNotNull(TaskEntity::getHouseCode);
      objectQueryWrapper.eq(TaskEntity::getIsDeleted, 0);
      objectQueryWrapper.in(TaskEntity::getReportType, 2, 3, 4, 5, 6);
      if (StringUtils.isNotBlank(houseCode)) {
         objectQueryWrapper.eq(TaskEntity::getHouseCode, houseCode);
@@ -142,6 +155,7 @@
      taskVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
      taskVO.setNeiCode(neiCode);
      taskVO.setReportType(2);
      taskVO.setIsDeleted(0);
      // 标签事件
      Integer bqsj = baseMapper.selectTaskCount(taskVO);
      taskVO.setReportType(1);
@@ -181,4 +195,53 @@
      objectObjectHashMap.put("periodicity", periodicity);
      return objectObjectHashMap;
   }

   @Override
   public Boolean removeTask(TaskEntity task) {

      boolean update1 = update(Wrappers.<TaskEntity>lambdaUpdate()
         .set(TaskEntity::getIsDeleted, 1)
         .eq(TaskEntity::getId, task.getId()));
      if (update1) {
         if (task.getReportType().equals(1)) {
            ITaskBailReportingEventService bean = SpringUtils.getBean(ITaskBailReportingEventService.class);
            boolean update = bean.update(Wrappers.<TaskBailReportingEventEntity>lambdaUpdate()
               .set(TaskBailReportingEventEntity::getIsDeleted, 1)
               .eq(TaskBailReportingEventEntity::getTaskId, task.getId()));
            return update;
         } else if (task.getReportType().equals(2)) {
            ITaskHotelReportingService bean = SpringUtils.getBean(ITaskHotelReportingService.class);
            boolean update = bean.update(Wrappers.<TaskHotelReportingEntity>lambdaUpdate()
               .set(TaskHotelReportingEntity::getIsDeleted, 1)
               .eq(TaskHotelReportingEntity::getTaskId, task.getId()));
            return update;
         } else if (task.getReportType().equals(3)) {
            ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
            boolean update = bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
               .set(TaskLabelReportingEventEntity::getIsDeleted, 1)
               .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
            return update;
         } else if (task.getReportType().equals(4)) {
            ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
            boolean update = bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
               .set(TaskLabelReportingEventEntity::getIsDeleted, 1)
               .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
            return update;
         } else if (task.getReportType().equals(5)) {
            ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
            boolean update = bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
               .set(TaskLabelReportingEventEntity::getIsDeleted, 1)
               .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
            return update;
         } else if (task.getReportType().equals(6)) {
            ITaskCampusReportingEventService bean = SpringUtils.getBean(ITaskCampusReportingEventService.class);
            boolean update = bean.update(Wrappers.<TaskCampusReportingEventEntity>lambdaUpdate()
               .set(TaskCampusReportingEventEntity::getIsDeleted, 1)
               .eq(TaskCampusReportingEventEntity::getTaskId, task.getId()));
            return update;
         }
      }

      return update1;
   }
}