From 609139392859453f95d147d246fc02fb00edcec6 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 22 Sep 2022 15:21:56 +0800
Subject: [PATCH] 巡检计划巡检人员
---
src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.xml | 10 ++++++++--
src/main/java/org/springblade/modules/taskinfo/service/impl/TaskplanUserServiceImpl.java | 8 ++++++++
src/main/java/org/springblade/modules/taskinfo/vo/TaskplanUserVO.java | 1 +
src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.java | 3 ++-
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.java b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.java
index 5a2c34a..ca7a8b3 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.java
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.taskinfo.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.taskinfo.entity.TaskplanUserEntity;
import org.springblade.modules.taskinfo.vo.TaskplanUserVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,7 @@
* @param taskplanUser
* @return
*/
- List<TaskplanUserVO> selectTaskplanUserPage(IPage page, TaskplanUserVO taskplanUser);
+ List<TaskplanUserVO> selectTaskplanUserPage(IPage page, @Param("taskplanUser") TaskplanUserVO taskplanUser);
}
diff --git a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.xml b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.xml
index 5d8fcdd..587fe02 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.xml
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskplanUserMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.taskinfo.mapper.TaskplanUserMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="taskplanUserResultMap" type="org.springblade.modules.taskinfo.entity.TaskplanUserEntity">
+ <resultMap id="taskplanUserResultMap" type="org.springblade.modules.taskinfo.vo.TaskplanUserVO">
<result column="id" property="id"/>
<result column="plan_id" property="planId"/>
<result column="user_id" property="userId"/>
@@ -14,7 +14,13 @@
<select id="selectTaskplanUserPage" resultMap="taskplanUserResultMap">
- select * from ins_taskplan_user where is_deleted = 0
+ select itu.*,bu.name
+ from ins_taskplan_user itu
+ LEFT JOIN blade_user bu ON itu.user_id = bu.id
+ where itu.is_deleted = 0
+ <if test="taskplanUser.planId != null and taskplanUser.planId !=''">
+ AND itu.plan_id = #{taskplanUser.planId}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/taskinfo/service/impl/TaskplanUserServiceImpl.java b/src/main/java/org/springblade/modules/taskinfo/service/impl/TaskplanUserServiceImpl.java
index ec1aa8c..acebcfe 100644
--- a/src/main/java/org/springblade/modules/taskinfo/service/impl/TaskplanUserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskinfo/service/impl/TaskplanUserServiceImpl.java
@@ -25,6 +25,9 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
/**
* 设置巡检人员表 服务实现类
*
@@ -43,4 +46,9 @@
public boolean save(TaskplanUserEntity entity) {
return SqlHelper.retBool(baseMapper.insert(entity));
}
+
+ @Override
+ public boolean deleteLogic(@NotEmpty List<Long> ids) {
+ return SqlHelper.retBool(baseMapper.deleteBatchIds(ids));
+ }
}
diff --git a/src/main/java/org/springblade/modules/taskinfo/vo/TaskplanUserVO.java b/src/main/java/org/springblade/modules/taskinfo/vo/TaskplanUserVO.java
index be3859f..3aef612 100644
--- a/src/main/java/org/springblade/modules/taskinfo/vo/TaskplanUserVO.java
+++ b/src/main/java/org/springblade/modules/taskinfo/vo/TaskplanUserVO.java
@@ -32,4 +32,5 @@
public class TaskplanUserVO extends TaskplanUserEntity {
private static final long serialVersionUID = 1L;
+ private String name;
}
--
Gitblit v1.9.3