综合服务

pjcloud-integrated/pjcloud-integrated-biz/MEETING_BOOKING_FLOW_EXAMPLE.md

@@ -226,3 +226,4 @@ NodeUser approver = NodeUser.builder()
 2. **时间限制**: 根据预约时间长度确定审批人
 3. **部门规则**: 根据部门特殊规则确定审批人
 4. **用户角色**: 根据用户角色确定审批人
+

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): 初始版本，提供基本的摆放形式选择功能
 
+

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<List<FeedbackTypeVO>> getFeedbackType() {
+        R<List<SysDictItem>> dictResult = remoteDictService.getDictByType("feedback_type");
+        if (!dictResult.isOk() || dictResult.getData() == null) {
+            return R.failed("获取反馈类型失败");
+        }
+        
+        List<FeedbackTypeVO> 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);
     }
 
     /**

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<List<MaintenanceTypeVO>> getFeedbackType() {
+        R<List<SysDictItem>> dictResult = remoteDictService.getDictByType("maintenance_type");
+        if (!dictResult.isOk() || dictResult.getData() == null) {
+            return R.failed("获取维修类型失败");
+        }
+        
+        List<MaintenanceTypeVO> 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);
+    }
 }

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;
 }
 
+

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不能为空");