From 200f9e99bab7dcab9360f34fa25f6fa97c33c167 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 05 Mar 2024 14:59:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 f94b70b..ee3c7d2 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
@@ -1,5 +1,6 @@
package cn.gistack.sm.patrol.service.impl;
+import cn.gistack.sm.patrol.dto.PatrolGroupDTO;
import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
@@ -8,15 +9,20 @@
import cn.gistack.sm.patrol.service.IPatrolRecordService;
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;
import java.util.ArrayList;
import java.util.List;
@@ -27,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));
}
@@ -73,4 +84,35 @@
return itemList;
}
}
+
+ @Override
+ public List<PatrolRecord> getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO) {
+ return baseMapper.getByTaskIdAndGroupId(patrolRecordVO);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateThenSaveBatch(RecordBatchVO recordBatchVO) {
+
+
+ boolean b = updateBatchById(recordBatchVO.getUpdateList());
+ boolean b1 = saveBatch(recordBatchVO.getAddList());
+
+ return b&&b1;
+ }
+
+ @Override
+ public List<PatrolGroupDTO> getHistoryRecord(PatrolRecordVO patrolRecordVO) {
+ return baseMapper.getHistoryRecord(patrolRecordVO);
+ }
+
+ @Override
+ public RecordVO getRecordVO(RecordVO recordVO) {
+ return baseMapper.getRecordVO(recordVO);
+ }
+
+ @Override
+ public PatrolRecordVO getHandleRecord(PatrolRecord patrolRecord) {
+ return baseMapper.getHandleRecord(patrolRecord);
+ }
}
--
Gitblit v1.9.3