Merge remote-tracking branch 'origin/dev' into dev

王彪总
2 parents a9253b35 8d6288da
Showing 3 changed files with 4 additions and 4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/homepage/AppHomepageSummaryController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
@@ -49,7 +49,7 @@ public class AppHomepageSummaryController {
     @PostMapping("/iWorkOrderSummary")
     @Operation(summary = "工单情况统计")
-    public CommonResult<List<AppWorkOrderSummaryRspVo>> iWorkOrderSummary(@Valid @RequestBody AppWorkOrderSummaryReqVo req) {
+    public CommonResult<AppWorkOrderSummaryRspVo> iWorkOrderSummary(@Valid @RequestBody AppWorkOrderSummaryReqVo req) {
         return success(homepageSummaryService.iWorkOrderSummary(req));
     }
 }
@@ -45,7 +45,7 @@ public interface HomepageSummaryService {
      * @Param req
      * @Return java.util.List<WorkOrderStatisticsRspVo>
      */
-    List<AppWorkOrderSummaryRspVo> iWorkOrderSummary(AppWorkOrderSummaryReqVo req);
+    AppWorkOrderSummaryRspVo iWorkOrderSummary(AppWorkOrderSummaryReqVo req);
 }
@@ -285,7 +285,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
     }
     @Override
-    public List<AppWorkOrderSummaryRspVo> iWorkOrderSummary(AppWorkOrderSummaryReqVo req) {
+    public AppWorkOrderSummaryRspVo iWorkOrderSummary(AppWorkOrderSummaryReqVo req) {
         // 1. 创建返回对象
         AppWorkOrderSummaryRspVo respVo = new AppWorkOrderSummaryRspVo();
@@ -330,7 +330,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         respVo.setTotalNum(String.valueOf(totalNum)); // 转字符串
         respVo.setPercents(percents); //占比
         // 7. 包装成 List 返回（因为方法声明返回 List）
-        return List.of(respVo);
+        return respVo;
     }
     /**