From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
index 11453f4..f177f28 100644
--- a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
+++ b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
@@ -12,6 +12,7 @@
import org.springblade.modules.directive.entity.DirectiveFile;
import org.springblade.modules.directive.service.DirectiveService;
import org.springblade.modules.directive.vo.DirectiveVo;
+import org.springblade.modules.workreport.vo.WorkReportVo;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
@@ -41,6 +42,22 @@
}
/**
+ * 自定义分页--接收到的指令
+ * @param query page,size
+ * @param directive 指令对象
+ */
+ @GetMapping("/pageReply")
+ public R<IPage<DirectiveVo>> pageReply(DirectiveVo directive, Query query) {
+ IPage<DirectiveVo> pages = directiveService.selectDirectiveReplyPage(Condition.getPage(query), directive);
+// List<WorkReportVo> records = pages.getRecords();
+// for (WorkReportVo record : records) {
+// record.setReplyRealName(getReplyRealName(record));
+// record.setReplyDeptName(getReplyDeptName(record));
+// }
+ return R.data(pages);
+ }
+
+ /**
* 新增
* @param directive 指令信息对象
*/
@@ -58,9 +75,9 @@
@PostMapping("/saveDirectiveAndFile")
public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) {
//新增指令信息
- boolean save = directiveService.save(directive);
boolean status = false;
- if (save){
+ status = directiveService.save(directive);
+ if (status){
//新增图片
if (null!=directive.getUrl() && directive.getUrl()!=""){
String[] directiveUrl = directive.getUrl().split(",");
@@ -71,7 +88,7 @@
directiveFile.setUrl(url);
status = directiveService.saveDirectiveFile(directiveFile);
if (!status){
- R.status(false);
+ return R.status(false);
}
}
}
--
Gitblit v1.9.3