From 8546b3d285af4235a0ef615a0c6e89486ae2c806 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 17 十月 2024 21:01:37 +0800
Subject: [PATCH] 达梦不支持value改为values
---
src/main/java/com/ycl/jxkg/controller/admin/SubjectController.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/SubjectController.java b/src/main/java/com/ycl/jxkg/controller/admin/SubjectController.java
index 345f1fe..878c038 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/SubjectController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/SubjectController.java
@@ -1,15 +1,14 @@
package com.ycl.jxkg.controller.admin;
+import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.entity.Subject;
-import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.utils.PageInfoHelper;
import com.ycl.jxkg.domain.vo.admin.education.SubjectEditRequestVO;
import com.ycl.jxkg.domain.vo.admin.education.SubjectPageRequestVO;
import com.ycl.jxkg.domain.vo.admin.education.SubjectResponseVO;
-import com.github.pagehelper.PageInfo;
+import com.ycl.jxkg.service.SubjectService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
@@ -32,25 +31,19 @@
@RequestMapping(value = "/page", method = RequestMethod.POST)
public Result<PageInfo<SubjectResponseVO>> pageList(@RequestBody SubjectPageRequestVO model) {
- PageInfo<Subject> pageInfo = subjectService.page(model);
- PageInfo<SubjectResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
- SubjectResponseVO vo = new SubjectResponseVO();
- BeanUtils.copyProperties(e, vo);
- return vo;
- });
- return Result.ok(page);
+ return Result.ok(subjectService.page(model));
}
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public Result edit(@RequestBody @Valid SubjectEditRequestVO model) {
+ public Result<String> edit(@RequestBody @Valid SubjectEditRequestVO model) {
Subject subject = new Subject();
BeanUtils.copyProperties(model, subject);
if (model.getId() == null) {
- subjectService.save(subject);
+ subjectService.save(subject.setCreateUser(getCurrentUser().getId()));
} else {
subjectService.updateById(subject);
}
- return Result.ok();
+ return Result.ok("鎿嶄綔鎴愬姛");
}
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
@@ -62,9 +55,19 @@
}
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
- public Result delete(@PathVariable Integer id) {
- Subject subject = subjectService.getById(id);
- subjectService.updateById(subject);
- return Result.ok();
+ public Result<Boolean> delete(@PathVariable Integer id) {
+ return Result.ok(subjectService.removeById(id));
}
+
+ @GetMapping(value = "/getItemOrder")
+ public Result<Integer> getItemOrder() {
+ return Result.ok(subjectService.getItemOrder());
+ }
+
+ @PostMapping(value = "/status")
+ public Result<String> status(@RequestBody Subject subject) {
+ subjectService.updateStatus(subject);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.8.0