From 06ea0fe23faf2238d9d1141826ecb404367aecec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 18 十月 2024 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java | 68 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
index 66c00cb..36138e4 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
@@ -14,7 +14,7 @@
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author 无关风月
@@ -23,41 +23,37 @@
@RestController
@RequestMapping("/t-company")
public class TCompanyController {
- @Resource
- private TCompanyService companyService;
+ @Resource
+ private TCompanyService companyService;
+
+ //单位分页
+ @PostMapping(value = "/unit/page")
+ public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
+ Page<TCompany> page = companyService.lambdaQuery()
+ .orderByDesc(TCompany::getCreateTime)
+ .like(unitListQueryDto.getCompanyName() != null && unitListQueryDto.getCompanyName()!="", TCompany::getName, unitListQueryDto.getCompanyName())
+ .page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
+ return R.ok(page);
+ }
+
+ //单位添加
+ @PostMapping(value = "/unit/addOrUpdate")
+ public R add(@RequestBody TCompany tCompany) {
+ if (tCompany.getId() == null) {
+ tCompany.setCreateTime(LocalDateTime.now());
+ }
+ companyService.saveOrUpdate(tCompany);
+ return R.ok();
+ }
+
+ @PostMapping(value = "/unit/delete")
+ public R delete(@RequestParam("id") Integer id) {
+ return R.ok(companyService.removeById(id));
+ }
- //单位分页
- @PostMapping(value = "/unit/page")
- public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
- Page<TCompany> page = companyService.lambdaQuery()
- .orderByDesc(TCompany::getCreateTime)
- .like(unitListQueryDto.getCompanyName()!=null&& unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
- .page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
- return R.ok(page);
-
- }
- //单位添加
- @PostMapping(value = "/unit/addOrUpdate")
- public R add(@RequestBody TCompany tCompany) {
- if (tCompany.getId()==null){
- tCompany.setCreateTime(LocalDateTime.now());
- }
- companyService.saveOrUpdate(tCompany);
- return R.ok();
- }
-
- @PostMapping(value = "/unit/delete")
- public R add(@RequestParam Integer id) {
- companyService.removeById(id);
-
- return R.ok();
- }
-
- @PostMapping(value = "/unit/delete")
- public R<TCompany> delete(@RequestParam Integer id) {
-
-
- return R.ok( companyService.getById(id));
- }
+ @PostMapping(value = "/unit/detail")
+ public R detail(@RequestParam("id") Integer id) {
+ return R.ok(companyService.getById(id));
+ }
}
--
Gitblit v1.7.1