Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d

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

@@ -16,8 +16,9 @@
 */
package org.springblade.modules.task.service.impl;

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;
import org.springblade.core.secure.utils.AuthUtil;
@@ -81,7 +82,7 @@
    * @return
    */
   @Override
   public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode,Integer reportType) {
   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);
@@ -113,14 +114,17 @@
   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())
         .in(TaskEntity::getReportType,2,3,4,5,6));
      LambdaQueryWrapper<TaskEntity> objectQueryWrapper = new LambdaQueryWrapper<>();
      objectQueryWrapper.eq(TaskEntity::getCreateUser, AuthUtil.getUserId());
      objectQueryWrapper.isNotNull(TaskEntity::getHouseCode);
      objectQueryWrapper.in(TaskEntity::getReportType, 2, 3, 4, 5, 6);
      if (StringUtils.isNotBlank(houseCode)) {
         objectQueryWrapper.eq(TaskEntity::getHouseCode, houseCode);
      }
      Long all = baseMapper.selectCount(objectQueryWrapper);
      objectQueryWrapper.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));
      Long processed = baseMapper.selectCount(objectQueryWrapper);
      objectObjectHashMap.put("all", all);
      objectObjectHashMap.put("processed", processed);
      return objectObjectHashMap;
@@ -168,7 +172,7 @@
      taskVO.setStatus(1);
      Integer disposable = baseMapper.selectTaskCount(taskVO);
      taskVO.setFrequency(2);
      Integer periodicity =  baseMapper.selectTaskCount(taskVO);
      Integer periodicity = baseMapper.selectTaskCount(taskVO);
      objectObjectHashMap.put("disposable", disposable);
      objectObjectHashMap.put("periodicity", periodicity);
      return objectObjectHashMap;