From 6904034ec8cfeeed418a35d98d3046cde2b99446 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 22 Jul 2021 14:10:37 +0800
Subject: [PATCH] 1.派遣记录接口修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 3bcb510..cfa1422 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -16,23 +16,24 @@
*/
package org.springblade.modules.dispatcher.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.dispatcher.entity.Dispatcher;
-import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.dispatcher.service.IDispatcherService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Arrays;
/**
* 控制器
@@ -54,8 +55,8 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入dispatcher")
- public R<Dispatcher> detail(Dispatcher dispatcher) {
- Dispatcher detail = dispatcherService.getOne(Condition.getQueryWrapper(dispatcher));
+ public R<DispatcherVO> detail(Dispatcher dispatcher) {
+ DispatcherVO detail = dispatcherService.getDispatcherInfo(dispatcher);
return R.data(detail);
}
@@ -108,6 +109,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));
}
--
Gitblit v1.9.3