From 39c20925e7a063873e71f528ceda5414a8cd205e Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 30 九月 2022 16:32:06 +0800
Subject: [PATCH] 1.添加部门应用模块 2.修改BuG
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index 80534dd..a5b5346 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -1,8 +1,13 @@
package com.dg.core.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -11,6 +16,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
@Api(tags = {"组织架构接口"})
@@ -25,7 +33,7 @@
/**
* 查询机构列表
*/
- @ApiOperation("查询机构列表")
+ @ApiOperation(value = "查询机构列表",response = OrganizationChartEntity.class)
@GetMapping("/getList")
public TableDataInfo selectConfigList()
{
@@ -35,7 +43,7 @@
/**
* 新增机构
*/
- @ApiOperation("新增机构")
+ @ApiOperation(value = "新增机构",response = OrganizationChartEntity.class)
@PostMapping("/add")
@Authorization
public ResultData insertConfig(@RequestBody OrganizationChartEntity entity)
@@ -62,11 +70,13 @@
/**
* 更新机构
*/
- @ApiOperation("更新机构")
+ @ApiOperation(value = "更新机构",response = OrganizationChartEntity.class)
@PostMapping("/update")
@Authorization
- public ResultData updateConfig(@RequestBody OrganizationChartEntity entity)
+ public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser)
{
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setUpdateUserId(Integer.parseInt(String.valueOf(sysUser.getUserId())));
return toAjax(iOrganizationChartService.updateConfig(entity));
}
@@ -100,4 +110,21 @@
return ResultData.success(iOrganizationChartService.selectConfigById(id));
}
+
+ /**
+ * 查询机构列表(分页)
+ */
+ @ApiOperation(value = "查询机构列表(分页)(部门应用)",response = OrganizationChartEntity.class)
+ @GetMapping("/queryList")
+ @Authorization
+ public TableDataInfo queryList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "organizationName",required = false)String organizationName){
+ Assert.notNull(pageNum, "pageNum can not be empty");
+ Assert.notNull(pageSize, "pageSize can not be empty");
+ Page<OrganizationChartEntity> pageParam = new Page<>(pageNum,pageSize);
+ return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName),iOrganizationChartService.countList(organizationName));
+ }
+
+
}
--
Gitblit v1.7.1