diff --git a/admin/src/main/java/io/modules/security/oauth2/Oauth2Filter.java b/admin/src/main/java/io/modules/security/oauth2/Oauth2Filter.java index 6ad31d8..b09bff5 100644 --- a/admin/src/main/java/io/modules/security/oauth2/Oauth2Filter.java +++ b/admin/src/main/java/io/modules/security/oauth2/Oauth2Filter.java @@ -52,7 +52,7 @@ public class Oauth2Filter extends AuthenticatingFilter { httpResponse.setContentType("application/json;charset=utf-8"); httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); - String json = JsonUtils.toJsonString(new Result().error("未授权访问!")); + String json = JsonUtils.toJsonString(new Result().error("待审核访问!")); httpResponse.getWriter().print(json); return false; } diff --git a/common/src/main/java/io/modules/item/dto/OrderDTO.java b/common/src/main/java/io/modules/item/dto/OrderDTO.java index a902a84..18c5461 100644 --- a/common/src/main/java/io/modules/item/dto/OrderDTO.java +++ b/common/src/main/java/io/modules/item/dto/OrderDTO.java @@ -1,6 +1,7 @@ package io.modules.item.dto; import io.modules.item.dao.FrontUserDao; +import io.modules.item.entity.AuditEntity; import io.modules.item.entity.FrontUserEntity; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.SchemaProperty; @@ -65,4 +66,5 @@ public class OrderDTO implements Serializable { private String remark; private DoctorsDTO doctors; private FrontUserEntity userDTO; + private AuditEntity audit; } diff --git a/db/block_hospital.sql b/db/block_hospital.sql index 8f112ef..5af2540 100644 --- a/db/block_hospital.sql +++ b/db/block_hospital.sql @@ -111,7 +111,7 @@ CREATE TABLE `tb_audit` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单编号', `item_id` bigint(20) NULL DEFAULT NULL COMMENT '申请医生', - `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '未授权' COMMENT '申请状态', + `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '待审核' COMMENT '申请状态', `purpose` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '申请目的', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户编号', @@ -123,8 +123,8 @@ CREATE TABLE `tb_audit` ( -- Records of tb_audit -- ---------------------------- INSERT INTO `tb_audit` VALUES (1922275723347402754, 1909838189195964418, 1, '同意授权', '12121', '2025-05-13 13:00:21', 1893836584118173697, '0x00000'); -INSERT INTO `tb_audit` VALUES (1922288200642674690, 1909838189195964418, 1, '未授权', '病情需要', '2025-05-13 13:49:56', 1893836584118173697, NULL); -INSERT INTO `tb_audit` VALUES (1922288229205884929, 1922287840624590849, 1, '未授权', '病情需要', '2025-05-13 13:50:02', 1893836584118173697, NULL); +INSERT INTO `tb_audit` VALUES (1922288200642674690, 1909838189195964418, 1, '待审核', '病情需要', '2025-05-13 13:49:56', 1893836584118173697, NULL); +INSERT INTO `tb_audit` VALUES (1922288229205884929, 1922287840624590849, 1, '待审核', '病情需要', '2025-05-13 13:50:02', 1893836584118173697, NULL); -- ---------------------------- -- Table structure for tb_case diff --git a/front/src/main/java/io/controller/AuditController.java b/front/src/main/java/io/controller/AuditController.java index 3f6049c..12e2fad 100644 --- a/front/src/main/java/io/controller/AuditController.java +++ b/front/src/main/java/io/controller/AuditController.java @@ -123,7 +123,7 @@ public class AuditController { LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); lwq.eq(AuditEntity::getItemId, dto.getItemId()); lwq.eq(AuditEntity::getOrderId, dto.getOrderId()); - lwq.eq(AuditEntity::getStatus, "未授权"); + lwq.eq(AuditEntity::getStatus, "待审核"); if (auditDao.exists(lwq)) { return new Result().error("您已经申请,不能重复申请"); } diff --git a/front/src/main/java/io/controller/OrderController.java b/front/src/main/java/io/controller/OrderController.java index d2987a2..84920a0 100644 --- a/front/src/main/java/io/controller/OrderController.java +++ b/front/src/main/java/io/controller/OrderController.java @@ -11,12 +11,14 @@ import io.common.validator.ValidatorUtils; import io.common.validator.group.AddGroup; import io.common.validator.group.DefaultGroup; import io.common.validator.group.UpdateGroup; +import io.modules.item.dao.AuditDao; import io.modules.item.dao.DoctorsDao; import io.modules.item.dao.FrontUserDao; import io.modules.item.dao.OrderDao; import io.modules.item.dto.DoctorsDTO; import io.modules.item.dto.OrderDTO; import io.modules.item.dto.UserDTO; +import io.modules.item.entity.AuditEntity; import io.modules.item.entity.DoctorsEntity; import io.modules.item.entity.FrontUserEntity; import io.modules.item.entity.OrderEntity; @@ -28,6 +30,7 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.util.NumberUtils; import org.springframework.web.bind.annotation.*; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -49,8 +52,7 @@ public class OrderController { private OrderService orderService; @Autowired - private OrderDao orderDao; - + private AuditDao auditDao; @Autowired private DoctorsService doctorsService; @@ -89,13 +91,13 @@ public class OrderController { return new Result>().ok(page); } - @GetMapping("list") public Result> page(@Parameter(hidden = true) @RequestParam Map params) { + Long itemId = NumberUtils.parseNumber(params.get("itemId").toString(), Long.class); + System.out.println(itemId); //分页 List page = orderService.list(params); - List collect = page.stream().map(e -> { Long userId = e.getUserId(); UserDTO dto = userService.get(userId); @@ -103,9 +105,13 @@ public class OrderController { e.setUser(dto); } //查看授权状态 - - - + LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); + lwq.eq(AuditEntity::getOrderId,e.getId()); + lwq.eq(AuditEntity::getItemId,itemId); + AuditEntity auditEntity = auditDao.selectOne(lwq); + if (auditEntity !=null){ + e.setAudit(auditEntity); + } return e; }).collect(Collectors.toList()); return new Result>().ok(collect); diff --git a/ui/src/pages/audit.vue b/ui/src/pages/audit.vue index 32f3ba5..0ed4b80 100644 --- a/ui/src/pages/audit.vue +++ b/ui/src/pages/audit.vue @@ -1,74 +1,203 @@ + - + { "meta": { -"layout": "front" +"layout": "front", +"title": "申请审核管理" } } diff --git a/ui/src/pages/doctor/case.vue b/ui/src/pages/doctor/case.vue index d2bed03..25e1597 100644 --- a/ui/src/pages/doctor/case.vue +++ b/ui/src/pages/doctor/case.vue @@ -1,24 +1,15 @@ - -