From b291d46184e69b11cd9fa045e6d06be084d4203b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 18 十二月 2025 20:38:36 +0800
Subject: [PATCH] 大屏标语配置，及大屏推送
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
index b4463ec..3981b31 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
@@ -1,15 +1,18 @@
package com.fzzy.igds.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Patrol;
import com.fzzy.igds.mapper.PatrolMapper;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
@Slf4j
@@ -38,6 +41,14 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
}
+
+ if (StringUtils.isNotBlank(param.getUserName())) {
+ queryWrapper.like("user_name", param.getUserName());
+ }
+ if (StringUtils.isNotBlank(param.getConfName())) {
+ queryWrapper.like("conf_name", param.getConfName());
+ }
+
queryWrapper.orderByDesc("create_time");
return queryWrapper;
@@ -93,4 +104,46 @@
}
}
+ /**
+ * 鏌ヨ7澶╁唴鐨勬墍鏈夊贰鏇磋褰曚俊鎭�
+ *
+ * @return
+ */
+ public List<Patrol> getWeekList() {
+
+ Date end = new Date();
+ Date start = DateUtil.getNewByDay(end, -6);
+
+ QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
+
+ queryWrapper.ge("create_time", DateUtil.getCurZero(start));
+
+ queryWrapper.le("create_time", DateUtil.getNextZero(end));
+
+ return patrolMapper.selectList(queryWrapper);
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏁版嵁
+ * @param page
+ * @param param
+ */
+ public void pagePatrolData(Page<Patrol> page, IgdsBaseParam param) {
+ QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(param.getDeptId())){
+ queryWrapper.like("dept_id", param.getDeptId());
+ }else {
+ if(StringUtils.isNotBlank(param.getCompanyId())){
+ queryWrapper.likeRight("dept_id", param.getCompanyId());
+ }
+ }
+ if(null != param.getStart()){
+ queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
+ }
+ if(null != param.getEnd()){
+ queryWrapper.le("create_time", DateUtil.getCurZero(param.getEnd()));
+ }
+
+ patrolMapper.selectPage(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3