From 977e638930fb598212b9bdf96be45e0cb562892c Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 12 Sep 2025 19:01:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MEETING_BOOKING_FLOW_EXAMPLE.md | 1 + .../MEETING_DESK_LAYOUT_API.md | 1 + .../controller/FeedbackController.java | 17 +++++++++++++++-- .../MaintenanceOrderController.java | 19 +++++++++++++++++++ .../integrated/vo/MeetingDeskLayoutAppVO.java | 1 + .../controller/MallAppController.java | 2 +- 6 files changed, 38 insertions(+), 3 deletions(-) diff --git a/pjcloud-integrated/pjcloud-integrated-biz/MEETING_BOOKING_FLOW_EXAMPLE.md b/pjcloud-integrated/pjcloud-integrated-biz/MEETING_BOOKING_FLOW_EXAMPLE.md index 22bf7d6ed..84abcb72b 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/MEETING_BOOKING_FLOW_EXAMPLE.md +++ b/pjcloud-integrated/pjcloud-integrated-biz/MEETING_BOOKING_FLOW_EXAMPLE.md @@ -226,3 +226,4 @@ NodeUser approver = NodeUser.builder() 2. **时间限制**: 根据预约时间长度确定审批人 3. **部门规则**: 根据部门特殊规则确定审批人 4. **用户角色**: 根据用户角色确定审批人 + diff --git a/pjcloud-integrated/pjcloud-integrated-biz/MEETING_DESK_LAYOUT_API.md b/pjcloud-integrated/pjcloud-integrated-biz/MEETING_DESK_LAYOUT_API.md index 004e315cb..e31c9b4d5 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/MEETING_DESK_LAYOUT_API.md +++ b/pjcloud-integrated/pjcloud-integrated-biz/MEETING_DESK_LAYOUT_API.md @@ -133,3 +133,4 @@ curl -X GET "http://your-domain/meetingDeskLayout/app/list" \ - **v1.0.0** (2025-01-27): 初始版本，提供基本的摆放形式选择功能 + diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java index c027a33b0..f22d1bc60 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java @@ -24,6 +24,7 @@ import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import com.bsd.pjcloud.integrated.vo.feedback.FeedbackScreenVo; +import com.bsd.pjcloud.integrated.vo.FeedbackTypeVO; import java.util.stream.Collectors; import java.util.HashMap; @@ -185,8 +186,20 @@ public class FeedbackController { @Operation(summary = "获取反馈类型" , description = "获取反馈类型" ) @GetMapping("/app/getFeedbackType" ) - public R getFeedbackType() { - return R.ok(remoteDictService.getDictByType("feedback_type")); + public R> getFeedbackType() { + R> dictResult = remoteDictService.getDictByType("feedback_type"); + if (!dictResult.isOk() || dictResult.getData() == null) { + return R.failed("获取反馈类型失败"); + } + + List voList = dictResult.getData().stream().map(item -> { + FeedbackTypeVO vo = new FeedbackTypeVO(); + vo.setId(item.getId()); + vo.setLabel(item.getLabel()); + return vo; + }).collect(Collectors.toList()); + + return R.ok(voList); } /** diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java index 812f488ac..26fe6105d 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java @@ -25,6 +25,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import com.bsd.pjcloud.integrated.dto.MaintenanceOrderAppCreateDTO; import com.bsd.pjcloud.integrated.vo.maintenance.MaintenanceOrderScreenVo; +import com.bsd.pjcloud.integrated.vo.MaintenanceTypeVO; import com.bsd.pjcloud.admin.api.entity.SysDictItem; import java.util.Map; @@ -214,4 +215,22 @@ public class MaintenanceOrderController { }).collect(Collectors.toList()); return R.ok(voList); } + + @Operation(summary = "获取维修类型" , description = "获取维修类型" ) + @GetMapping("/app/getFeedbackType" ) + public R> getFeedbackType() { + R> dictResult = remoteDictService.getDictByType("maintenance_type"); + if (!dictResult.isOk() || dictResult.getData() == null) { + return R.failed("获取维修类型失败"); + } + + List voList = dictResult.getData().stream().map(item -> { + MaintenanceTypeVO vo = new MaintenanceTypeVO(); + vo.setId(item.getId()); + vo.setLabel(item.getLabel()); + return vo; + }).collect(Collectors.toList()); + + return R.ok(voList); + } } \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MeetingDeskLayoutAppVO.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MeetingDeskLayoutAppVO.java index 6bae17658..5734340ee 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MeetingDeskLayoutAppVO.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MeetingDeskLayoutAppVO.java @@ -54,3 +54,4 @@ public class MeetingDeskLayoutAppVO implements Serializable { private String description; } + diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java index 677d0527f..3539cf527 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java @@ -567,7 +567,7 @@ public class MallAppController { Long merchantId = validateMerchant(); // 验证分类权限 validateCategoryPermission(category.getId(), merchantId); - + // 验证分类ID if (category.getId() == null) { return R.failed("分类ID不能为空");