From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/api/ext/CategoryExtController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/CategoryExtController.java b/server/src/main/java/doumeemes/api/ext/CategoryExtController.java
index 48cbff8..5d896d9 100644
--- a/server/src/main/java/doumeemes/api/ext/CategoryExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/CategoryExtController.java
@@ -3,14 +3,17 @@
import doumeemes.api.BaseController;
import doumeemes.core.annotation.excel.ExcelExporter;
import doumeemes.core.annotation.pr.PreventRepeat;
+import doumeemes.core.annotation.trace.Trace;
import doumeemes.core.model.ApiResponse;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.Constants;
import doumeemes.dao.business.model.Category;
+import doumeemes.dao.business.model.CategoryUnion;
import doumeemes.dao.ext.dto.QueryCategoryExtDTO;
import doumeemes.dao.ext.vo.CategoryExtListVO;
import doumeemes.service.business.CategoryService;
+import doumeemes.service.business.CategoryUnionService;
import doumeemes.service.ext.CategoryExtService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -36,6 +39,7 @@
*/
@RestController
@RequestMapping("/ext/categoryExt")
+@Trace(withRequestResult = false,withRequestParameters = false)
@Api(tags = "璁剧疆绫诲垎绫讳俊鎭〃鎺ュ彛")
public class CategoryExtController extends BaseController {
@@ -44,6 +48,9 @@
@Autowired
private CategoryService categoryService;
+
+ @Autowired
+ private CategoryUnionService categoryUnionService;
@PreventRepeat
@@ -58,12 +65,14 @@
Category query = new Category();
query.setDeleted(Constants.ZERO);
+ query.setCateType(category.getCateType());
query.setRootDepartId(getLoginUser().getRootDepartment().getId());
query.setCode(category.getCode());
List<Category> list = categoryService.findList(query);
Category query1 = new Category();
query1.setDeleted(Constants.ZERO);
+ query1.setCateType(category.getCateType());
query1.setRootDepartId(getLoginUser().getRootDepartment().getId());
query1.setName(category.getName());
List<Category> list1 = categoryService.findList(query1);
@@ -74,7 +83,17 @@
category.setCreateTime(new Date());
category.setCreateUser(getLoginUser().getId());
category.setRootDepartId(getLoginUser().getRootDepartment().getId());
- int r = categoryService.create(category);
+ int r = categoryService.create(category);
+ CategoryUnion categoryUnion = new CategoryUnion();
+ categoryUnion.setDeleted(Constants.ZERO);
+ categoryUnion.setCreateUser(getLoginUser().getId());
+ categoryUnion.setCreateTime(new Date());
+ categoryUnion.setUpdateUser(getLoginUser().getId());
+ categoryUnion.setUpdateTime(new Date());
+ categoryUnion.setRemark("");
+ categoryUnion.setRootDepartId(getLoginUser().getRootDepartment().getId());
+ categoryUnion.setCateBigId(category.getId());
+ categoryUnionService.create(categoryUnion);
categoryExtService.loadCom(getLoginUser().getCompany());
return ApiResponse.success(r );
}
@@ -84,9 +103,8 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("ext:categoryext:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
- Category category = categoryService.findById(Integer.valueOf(id));
- category.setDeleted(Constants.ONE);
- categoryService.updateById(category);
+
+ categoryService.deleteCategory(id);
return ApiResponse.success(null);
}
@@ -154,6 +172,15 @@
return ApiResponse.success(categoryExtService.findPage(pageWrap));
}
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/list")
+ @RequiresPermissions("ext:categoryext:query")
+ public ApiResponse<List<CategoryExtListVO>> list(@RequestBody QueryCategoryExtDTO queryCategoryExtDTO) {
+ queryCategoryExtDTO.setDeleted(Constants.ZERO);
+ queryCategoryExtDTO.setRootDepartId(getLoginUser().getRootDepartment().getId());
+ return ApiResponse.success(categoryExtService.findList(queryCategoryExtDTO));
+ }
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("ext:categoryext:exportExcel")
--
Gitblit v1.9.3