bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

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

@@ -25,13 +25,11 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.task.entity.TaskEntity;
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.vo.TaskVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -57,7 +55,14 @@
   @Override
   public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
      task.setUserId(AuthUtil.getUserId());
      return page.setRecords(baseMapper.selectTaskPage(page, task));
      // 民警角色
      if (AuthUtil.getUserRole().contains("mj")) {
         task.setUserId(AuthUtil.getUserId());
         return page.setRecords(baseMapper.selectTaskPageBy(page, task));
      } else {
         // 非民警角色
         return page.setRecords(baseMapper.selectTaskPage(page, task));
      }
   }

   /**
@@ -71,7 +76,7 @@
    * @return
    */
   @Override
   public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode) {
   public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode,Integer reportType) {
      TaskEntity taskEntity = new TaskEntity();
      taskEntity.setType(type);
      taskEntity.setName(name);
@@ -80,6 +85,7 @@
      taskEntity.setCreateTime(new Date());
      taskEntity.setCreateUser(createUser);
      taskEntity.setHouseCode(houseCode);
      taskEntity.setReportType(reportType);
      return baseMapper.insert(taskEntity) > 0 ? taskEntity.getId() : 0;
   }

@@ -102,10 +108,14 @@
   public Object countNumber(String houseCode, Integer status) {
      Map<String, Object> objectObjectHashMap = new HashMap<>();
      // 总数
      Long all = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getCreateUser, AuthUtil.getUserId() ));
      Long all = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery()
         .eq(TaskEntity::getCreateUser, AuthUtil.getUserId())
         .in(TaskEntity::getReportType,2,3,4,5,6));
      // 已处理
      Long processed = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getCreateUser, AuthUtil.getUserId())
         .eq(TaskEntity::getStatus, 2));
      Long processed = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery()
         .eq(TaskEntity::getCreateUser, AuthUtil.getUserId())
         .eq(TaskEntity::getStatus, 2)
         .in(TaskEntity::getReportType,2,3,4,5,6));
      objectObjectHashMap.put("all", all);
      objectObjectHashMap.put("processed", processed);
      return objectObjectHashMap;