From d954dfe6560aa7a572db72e7a6a635ebbfc8e52f Mon Sep 17 00:00:00 2001
From: zhouyuan <1069065057@qq.com>
Date: Mon, 23 May 2022 11:36:29 +0800
Subject: [PATCH] update
---
.../rddb/web/AppointCommentController.java | 27 ++++-
.../modules/rddb/web/AppointController.java | 15 +++
.../rddb/web/ReviewCommentController.java | 31 ++++--
.../modules/rddb/web/ReviewController.java | 25 ++++-
.../rddb/web/ReviewUserController.java | 2 +-
.../views/modules/rddb/appoint/comment.html | 57 ++++++++++
.../views/modules/rddb/appoint/index.html | 10 ++
.../views/modules/rddb/appoint/perform.html | 57 ++++++++++
.../views/modules/rddb/appoint/vote.html | 71 +++++++++++++
.../views/modules/rddb/review/audit.html | 100 ++++++++++++++++++
.../views/modules/rddb/review/check.html | 57 ++++++++++
.../views/modules/rddb/review/comment.html | 57 ++++++++++
.../views/modules/rddb/review/form.html | 17 ++-
.../views/modules/rddb/review/index.html | 22 +++-
14 files changed, 525 insertions(+), 23 deletions(-)
create mode 100644 src/main/resources/views/modules/rddb/appoint/comment.html
create mode 100644 src/main/resources/views/modules/rddb/appoint/perform.html
create mode 100644 src/main/resources/views/modules/rddb/appoint/vote.html
create mode 100644 src/main/resources/views/modules/rddb/review/audit.html
create mode 100644 src/main/resources/views/modules/rddb/review/check.html
create mode 100644 src/main/resources/views/modules/rddb/review/comment.html
diff --git a/src/main/java/com/ydool/boot/modules/rddb/web/AppointCommentController.java b/src/main/java/com/ydool/boot/modules/rddb/web/AppointCommentController.java
index 3da9462..eec3096 100644
--- a/src/main/java/com/ydool/boot/modules/rddb/web/AppointCommentController.java
+++ b/src/main/java/com/ydool/boot/modules/rddb/web/AppointCommentController.java
@@ -1,10 +1,16 @@
package com.ydool.boot.modules.rddb.web;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydool.boot.common.result.Ret;
import com.ydool.boot.core.web.BaseController;
+import com.ydool.boot.modules.rddb.entity.AppointComment;
+import com.ydool.boot.modules.rddb.service.AppointCommentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
/**
*
@@ -15,7 +21,20 @@ import com.ydool.boot.core.web.BaseController;
* @since 2022-05-17
*/
@Controller
-@RequestMapping("/rddb/appointComment")
+@RequestMapping("${ydool.path}/rddb/appoint_comment")
public class AppointCommentController extends BaseController {
+ @Autowired
+ private AppointCommentService appointCommentService;
+
+ @RequestMapping("list")
+ @ResponseBody
+ public void list(String id) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("appoint_id", id);
+ wrapper.orderByDesc("created_at");
+ Page page = appointCommentService.page(new Page(getPageNum(), getPageSize()), wrapper);
+ render(Ret.ok().paged(page));
+ }
+
}
diff --git a/src/main/java/com/ydool/boot/modules/rddb/web/AppointController.java b/src/main/java/com/ydool/boot/modules/rddb/web/AppointController.java
index d91ac8a..eac7629 100644
--- a/src/main/java/com/ydool/boot/modules/rddb/web/AppointController.java
+++ b/src/main/java/com/ydool/boot/modules/rddb/web/AppointController.java
@@ -46,6 +46,21 @@ public class AppointController extends BaseAdminController {
public String index() {
return "modules/rddb/appoint/index.html";
}
+ @GetMapping("vote")
+ public String vote(String id) {
+ request.setAttribute("id",id);
+ return "modules/rddb/appoint/vote.html";
+ }
+ @GetMapping("perform")
+ public String perform(String id) {
+ request.setAttribute("id",id);
+ return "modules/rddb/appoint/perform.html";
+ }
+ @GetMapping("comment")
+ public String comment(String id) {
+ request.setAttribute("id",id);
+ return "modules/rddb/appoint/comment.html";
+ }
@PostMapping("list")
@ResponseBody
diff --git a/src/main/java/com/ydool/boot/modules/rddb/web/ReviewCommentController.java b/src/main/java/com/ydool/boot/modules/rddb/web/ReviewCommentController.java
index b3b37f6..a718897 100644
--- a/src/main/java/com/ydool/boot/modules/rddb/web/ReviewCommentController.java
+++ b/src/main/java/com/ydool/boot/modules/rddb/web/ReviewCommentController.java
@@ -1,21 +1,40 @@
package com.ydool.boot.modules.rddb.web;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydool.boot.common.result.Ret;
import com.ydool.boot.core.web.BaseController;
+import com.ydool.boot.modules.rddb.entity.ReviewComment;
+import com.ydool.boot.modules.rddb.service.ReviewCommentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
/**
*
- * 工作评议评论 前端控制器
+ * 评议评论 前端控制器
*
*
* @author zhouyuan
* @since 2022-05-12
*/
@Controller
-@RequestMapping("/rddb/reviewComment")
+@RequestMapping("${ydool.path}/rddb/review_comment")
public class ReviewCommentController extends BaseController {
-}
+ @Autowired
+ private ReviewCommentService reviewCommentService;
+
+ @RequestMapping("list")
+ @ResponseBody
+ public void list(String id) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("review_id", id);
+ wrapper.orderByDesc("created_at");
+ Page page = reviewCommentService.page(new Page(getPageNum(), getPageSize()), wrapper);
+ render(Ret.ok().paged(page));
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ydool/boot/modules/rddb/web/ReviewController.java b/src/main/java/com/ydool/boot/modules/rddb/web/ReviewController.java
index 969694d..9f50684 100644
--- a/src/main/java/com/ydool/boot/modules/rddb/web/ReviewController.java
+++ b/src/main/java/com/ydool/boot/modules/rddb/web/ReviewController.java
@@ -48,9 +48,25 @@ public class ReviewController extends BaseAdminController {
ReviewAttachmentService reviewAttachmentService;
@GetMapping
- public String index() {
+ public String index(String type) {
+ request.setAttribute("type", type);
return "modules/rddb/review/index.html";
}
+ @GetMapping("audit")
+ public String vote(String id) {
+ request.setAttribute("id",id);
+ return "modules/rddb/review/audit.html";
+ }
+ @GetMapping("comment")
+ public String comment(String id) {
+ request.setAttribute("id",id);
+ return "modules/rddb/review/comment.html";
+ }
+ @GetMapping("check")
+ public String check(String id) {
+ request.setAttribute("id",id);
+ return "modules/rddb/review/check.html";
+ }
@PostMapping("list")
@ResponseBody
@@ -59,8 +75,8 @@ public class ReviewController extends BaseAdminController {
if (StringUtils.isNotBlank(review.getType())) wrapper.eq(Review::getType, review.getType());
if (StringUtils.isNotBlank(review.getReviewSubject()))
wrapper.like(Review::getReviewSubject, review.getReviewSubject());
- if (review.getState()!=null) wrapper.eq(Review::getState, review.getState());
- if (review.getStatus()!=null) wrapper.eq(Review::getStatus, review.getStatus());
+ if (review.getState() != null) wrapper.eq(Review::getState, review.getState());
+ if (review.getStatus() != null) wrapper.eq(Review::getStatus, review.getStatus());
wrapper.orderByDesc(Review::getCreatedAt);
Page page = reviewService.page(new Page(getPageNum(), getPageSize()), wrapper);
render(Ret.ok().paged(page));
@@ -68,7 +84,7 @@ public class ReviewController extends BaseAdminController {
@PreAuth("rddb:review:form")
@GetMapping("form")
- public String form(String id, Model model) throws Exception {
+ public String form(String id, String type, Model model) throws Exception {
Review review = new Review();
if (ObjectUtil.isNotEmpty(id)) {
review = reviewService.getById(id);
@@ -90,6 +106,7 @@ public class ReviewController extends BaseAdminController {
model.addAttribute("resultAttachmentListStr", JsonMapper.getInstance().writeValueAsString(resultAttachmentList));
}
model.addAttribute("review", review);
+ model.addAttribute("type", type);
return "modules/rddb/review/form.html";
}
diff --git a/src/main/java/com/ydool/boot/modules/rddb/web/ReviewUserController.java b/src/main/java/com/ydool/boot/modules/rddb/web/ReviewUserController.java
index 3237d8e..8c4ae35 100644
--- a/src/main/java/com/ydool/boot/modules/rddb/web/ReviewUserController.java
+++ b/src/main/java/com/ydool/boot/modules/rddb/web/ReviewUserController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
/**
*
- * 工作评议人员 前端控制器
+ * 评议人员 前端控制器
*
*
* @author zhouyuan
diff --git a/src/main/resources/views/modules/rddb/appoint/comment.html b/src/main/resources/views/modules/rddb/appoint/comment.html
new file mode 100644
index 0000000..1e11447
--- /dev/null
+++ b/src/main/resources/views/modules/rddb/appoint/comment.html
@@ -0,0 +1,57 @@
+<% layout('/layouts/default.html', {title: '评论管理', libs: ['print','fileupload',"dataGrid",'summernote']}){ %>
+
+<% } %>
+
+
+
+
+
+
diff --git a/src/main/resources/views/modules/rddb/appoint/index.html b/src/main/resources/views/modules/rddb/appoint/index.html
index c492562..55c1587 100644
--- a/src/main/resources/views/modules/rddb/appoint/index.html
+++ b/src/main/resources/views/modules/rddb/appoint/index.html
@@ -70,6 +70,16 @@
actions.push(' ');
<% } %>
+ <% if(hasAuth("rddb:appoint:vote")) { %>
+ actions.push(' ');
+ <% } %>
+ <% if(hasAuth("rddb:appoint:comment")) { %>
+ actions.push(' ');
+ <% } %>
+ <% if(hasAuth("rddb:appoint:perform")) { %>
+ actions.push(' ');
+ <% } %>
+
return actions.join('');
}
}
diff --git a/src/main/resources/views/modules/rddb/appoint/perform.html b/src/main/resources/views/modules/rddb/appoint/perform.html
new file mode 100644
index 0000000..c355bc0
--- /dev/null
+++ b/src/main/resources/views/modules/rddb/appoint/perform.html
@@ -0,0 +1,57 @@
+<% layout('/layouts/default.html', {title: '打分管理', libs: ['print','fileupload',"dataGrid",'summernote']}){ %>
+
+<% } %>
+
+
+
+
+
+
diff --git a/src/main/resources/views/modules/rddb/appoint/vote.html b/src/main/resources/views/modules/rddb/appoint/vote.html
new file mode 100644
index 0000000..76be1d4
--- /dev/null
+++ b/src/main/resources/views/modules/rddb/appoint/vote.html
@@ -0,0 +1,71 @@
+<% layout('/layouts/default.html', {title: '投票管理', libs: ['print','fileupload',"dataGrid",'summernote']}){ %>
+
+<% } %>
+
+
+
+
+
+
diff --git a/src/main/resources/views/modules/rddb/review/audit.html b/src/main/resources/views/modules/rddb/review/audit.html
new file mode 100644
index 0000000..9ed828c
--- /dev/null
+++ b/src/main/resources/views/modules/rddb/review/audit.html
@@ -0,0 +1,100 @@
+<% layout('/layouts/default.html', {title: '审批管理', libs: ['print','fileupload',"dataGrid",'summernote']}){ %>
+
+
+
+
+
+
+
一级审批人员
+
+
+
二级审批人员
+
+
+
+
+
+
+<% } %>
+
+
+
+
+
+
diff --git a/src/main/resources/views/modules/rddb/review/check.html b/src/main/resources/views/modules/rddb/review/check.html
new file mode 100644
index 0000000..56e18d0
--- /dev/null
+++ b/src/main/resources/views/modules/rddb/review/check.html
@@ -0,0 +1,57 @@
+<% layout('/layouts/default.html', {title: '打分管理', libs: ['print','fileupload',"dataGrid",'summernote']}){ %>
+
+<% } %>
+
+
+
+
+
+
diff --git a/src/main/resources/views/modules/rddb/review/comment.html b/src/main/resources/views/modules/rddb/review/comment.html
new file mode 100644
index 0000000..6741938
--- /dev/null
+++ b/src/main/resources/views/modules/rddb/review/comment.html
@@ -0,0 +1,57 @@
+<% layout('/layouts/default.html', {title: '评论管理', libs: ['print','fileupload',"dataGrid",'summernote']}){ %>
+
+<% } %>
+
+
+
+
+
+
diff --git a/src/main/resources/views/modules/rddb/review/form.html b/src/main/resources/views/modules/rddb/review/form.html
index dcce36d..6cc0377 100644
--- a/src/main/resources/views/modules/rddb/review/form.html
+++ b/src/main/resources/views/modules/rddb/review/form.html
@@ -11,13 +11,24 @@
+
评议信息
-
-
-
+
+ <% if(type=="work") { %>
+
+ <% } %>
+ <% if(type=="subject") { %>
+
+
+ <% } %>
+ <% if(type=="officer") { %>
+
+
+ <% } %>
+
查询
刷新
<% if(hasAuth("rddb:review:add")) { %>
- 新增
<% } %>
@@ -27,19 +27,21 @@
-