From 33a072160eda4fa7cb22d330c2bfa9048ad6c0e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 22 Jul 2021 14:11:50 +0800
Subject: [PATCH] 派遣记录接口修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 6 ++++++
src/main/java/org/springblade/modules/exam/entity/ExamScore.java | 5 +++++
src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java | 11 +++++++++++
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 3 +++
4 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
index 9032235..6176fff 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -34,6 +34,8 @@
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.util.Arrays;
+
/**
* 控制器
*
@@ -108,6 +110,10 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入dispatcher")
public R submit(@Valid @RequestBody Dispatcher dispatcher) {
+ if (null!=dispatcher.getUserIds() && dispatcher.getUserIds()!=""){
+ //计算派遣人数
+ dispatcher.setNum(Arrays.asList(dispatcher.getUserIds().split(",")).size());
+ }
return R.status(dispatcherService.saveOrUpdate(dispatcher));
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
index f03ef19..fa6e5f0 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
@@ -105,4 +105,15 @@
@TableField("dept_id")
private Long deptId;
+ /**
+ * 辖区
+ */
+ private String jurisdiction;
+
+
+ /**
+ * 派遣人数
+ */
+ private Integer num;
+
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index ec2cdaa..8160c0c 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -29,6 +29,9 @@
<if test="dispatcher.deptId!=null">
and sd.dept_id = #{dispatcher.deptId}
</if>
+ <if test="dispatcher.userIds!=null and dispatcher.userIds!=''">
+ and sd.user_ids like concat('%', #{dispatcher.userIds},'%')
+ </if>
<if test="dispatcher.name!=null and dispatcher.name!=''">
and sd.name like concat('%', #{dispatcher.name},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
index d3ca4cd..989f442 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
@@ -108,4 +108,9 @@
private Integer qualified;
+ /**
+ * 用户id
+ */
+ @TableField("user_id")
+ private String userId;
}
--
Gitblit v1.9.3