From a2350fcb1e1fc6de463835462b2a2e3f22962305 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 04 Apr 2023 18:50:32 +0800
Subject: [PATCH] 巡检任务详情添加联系方式

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
index afdbc0f..0f1b797 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -6,15 +6,23 @@
 import cn.gistack.sm.patrol.util.EnhancementServicesTool;
 import cn.gistack.sm.patrol.util.IdWorker;
 import cn.gistack.sm.patrol.vo.PatrolTaskVO;
+import cn.gistack.system.user.feign.IUserClient;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 @Service
+@AllArgsConstructor
 public class PatrolTaskServiceImpl extends BaseServiceImpl<PatrolTaskMapper, PatrolTask> implements IPatrolTaskService {
+
+	IUserClient userClient;
 
 	/**
 	 * 自定义分页查询
@@ -24,7 +32,8 @@
 	 */
 	@Override
 	public IPage<PatrolTaskVO> selectPatrolTask(IPage<PatrolTaskVO> page, PatrolTaskVO patrolTask) {
-		return page.setRecords(baseMapper.selectPatrolTask(patrolTask));
+		List<PatrolTaskVO> patrolTaskList = baseMapper.selectPatrolTask(page, patrolTask);
+		return page.setRecords(patrolTaskList);
 	}
 
 	/**
@@ -44,10 +53,10 @@
 	 */
 	@Override
 	public Boolean updatePatrolTask(PatrolTask patrolTask) {
-		Integer update = baseMapper.updatePatrolTask(patrolTask);
 		// 设置基础信息
 		EnhancementServicesTool enhancementServicesTool = new EnhancementServicesTool();
 		enhancementServicesTool.resolveEntity(patrolTask);
+		Integer update = baseMapper.updatePatrolTask(patrolTask);
 		//返回
 		return update>0?true:false;
 	}
@@ -59,10 +68,10 @@
 	 */
 	@Override
 	public Boolean savePatrolTask(PatrolTask patrolTask) {
-		patrolTask.setId(IdWorker.getId());
 		// 设置基础信息
 		EnhancementServicesTool enhancementServicesTool = new EnhancementServicesTool();
 		enhancementServicesTool.resolveEntity(patrolTask);
+		patrolTask.setId(IdWorker.getId());
 		// 新增
 		Integer save = baseMapper.savePatrolTask(patrolTask);
 		//返回

--
Gitblit v1.9.3