Merge remote-tracking branch 'origin/sqd' into sqd

maven

6 天以前 259e978c64b36f57aa1959c6d760416b86b26c34

Merge remote-tracking branch 'origin/sqd' into sqd

 src/main/java/com/ruoyi/home/controller/HomeController.java

@@ -23,6 +23,7 @@

import java.text.ParseException;
import java.util.List;
import java.util.Map;

/**
 * @author :yys
@@ -77,5 +78,19 @@
        return AjaxResult.success(statisticsReceivablePayable);
    }

    @GetMapping("/approveAndDeviceTodos")
    @ApiOperation("审批协同，设备报修待办事项")
    public AjaxResult approveAndDeviceTodos(){
        Map<String, Object> map = homeService.approveAndDeviceTodos();
        return AjaxResult.success(map);
    }

    @GetMapping("/noticesCount")
    @ApiOperation("未过期的公告数量")
    public AjaxResult noticesCount(){
        Long count = homeService.noticesCount();
        return AjaxResult.success(count);
    }


}

 src/main/java/com/ruoyi/home/service/HomeService.java

@@ -8,6 +8,7 @@

import java.text.ParseException;
import java.util.List;
import java.util.Map;

/**
 * @author :yys
@@ -26,4 +27,8 @@
    List<ApproveProcess> todos() throws ParseException;

    StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type);

    Map<String, Object> approveAndDeviceTodos();

    Long noticesCount();
}

 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -3,7 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
import com.ruoyi.collaborativeApproval.pojo.Notice;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.dto.MapDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.home.dto.*;
@@ -426,4 +430,36 @@

        return statisticsReceivablePayableDto;
    }

    @Autowired
    private DeviceRepairMapper deviceRepairMapper;


    @Autowired
    private NoticeMapper noticeMapper;

    @Override
    public Map<String, Object> approveAndDeviceTodos() {
        // 审批协同待办
        Long aLong = approveProcessMapper.selectCount(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveUserCurrentId, SecurityUtils.getUserId())
                .eq(ApproveProcess::getApproveDelete, 0)
                .in(ApproveProcess::getApproveStatus, 0, 1, 3));
        // 设备报修待办
        Long aLong1 = deviceRepairMapper.selectCount(new LambdaQueryWrapper<DeviceRepair>()
                .eq(DeviceRepair::getStatus, 0)
                .eq(DeviceRepair::getRepairName, SecurityUtils.getLoginUser().getNickName()));
        return new HashMap<String, Object>() {{
            put("approveTodo", aLong);
            put("deviceRepairTodo", aLong1);
        }};
    }

    @Override
    public Long noticesCount() {
        // 查询未过期的通知数量：状态为发布且过期时间大于等于当前日期
        return noticeMapper.selectCount(new LambdaQueryWrapper<Notice>()
                .eq(Notice::getStatus, 1) // 1表示发布状态
                .ge(Notice::getExpirationDate, new Date())); // 过期时间大于等于当前日期
    }
}