From 23651fb3c76d60a596992013bb0061e5bf5c9ecc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 01 Feb 2024 08:49:33 +0800
Subject: [PATCH] 巡查记录按行政区筛选
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
index ba685c4..0173b9e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
@@ -10,13 +10,16 @@
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import cn.gistack.sm.patrol.vo.RecordBatchVO;
+import cn.gistack.sm.patrol.vo.RecordVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,7 +33,12 @@
IPatrolGroupItemService patrolGroupItemService;
@Override
- public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord) {
+ public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecordVO patrolRecord) {
+
+ if (StringUtil.isBlank(patrolRecord.getAdCode())){
+ patrolRecord.setAdCode(AuthUtil.getDeptId());
+ }
+
return page.setRecords(baseMapper.selectPatrolRecord(page,patrolRecord));
}
@@ -78,8 +86,8 @@
}
@Override
- public List<PatrolRecord> getByTaskIdAndGroupId(String groupId, String taskId) {
- return baseMapper.getByTaskIdAndGroupId(groupId,taskId);
+ public List<PatrolRecord> getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO) {
+ return baseMapper.getByTaskIdAndGroupId(patrolRecordVO);
}
@Override
@@ -97,4 +105,9 @@
public List<PatrolGroupDTO> getHistoryRecord(PatrolRecordVO patrolRecordVO) {
return baseMapper.getHistoryRecord(patrolRecordVO);
}
+
+ @Override
+ public RecordVO getRecordVO(RecordVO recordVO) {
+ return baseMapper.getRecordVO(recordVO);
+ }
}
--
Gitblit v1.9.3