From adca98ba944374e7e619beeebe97607f3f33572b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 26 Jul 2021 16:43:14 +0800
Subject: [PATCH] 1.用户添加派遣字段，派遣记录
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index e49d963..a4c809b 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -16,23 +16,34 @@
*/
package org.springblade.modules.information.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.common.cache.DictCache;
+import org.springblade.common.enums.DictEnum;
+import org.springblade.common.utils.arg;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.cache.utils.CacheUtil;
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.core.tool.support.Kv;
import org.springblade.modules.information.entity.Information;
-import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.information.service.IInformationService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.modules.information.vo.InformationVO;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
/**
* 控制器
@@ -47,6 +58,8 @@
public class InformationController extends BladeController {
private final IInformationService informationService;
+ private final IDeptService iDeptService;
+
/**
* 详情
@@ -87,7 +100,24 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入information")
- public R save(@Valid @RequestBody Information information) {
+ public R save(@Valid @RequestBody Information information) throws Exception {
+ Dept dept= new Dept();
+ Long i = 1413470343230877697L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1413470343230877697");
+ dept.setDeptCategory(1);
+ if (iDeptService.submit(dept)) {
+ CacheUtil.clear(SYS_CACHE);
+ // 返回懒加载树更新节点所需字段
+ Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
+ .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
+ String id = kv.get("id").toString();
+ information.setDepartmentid(id);
+ }
+ arg arg = new arg();
+ arg.test01(arg.url+"/information/save",information);
return R.status(informationService.save(information));
}
@@ -118,8 +148,11 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(informationService.removeByIds(Func.toLongList(ids)));
+ public R remove(String creditcode) {
+ informationService.deleteIn(creditcode);
+ informationService.deleteSh(creditcode);
+ informationService.deleteMe(creditcode);
+ return R.success("删除成功");
}
--
Gitblit v1.9.3