小程序数据统计-年检管理

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/controller/AnnualInspectionDataStatisticsController.java

@@ -34,7 +34,7 @@ public class AnnualInspectionDataStatisticsController {
     /**
      * @param
      * @return
-     * @description 年检进度前五的项目
+     * @description 年检项目
      * @date 2020/2/5 4:10 下午
      */
     @RequestMapping("/annualProgress")
@@ -43,13 +43,14 @@ public class AnnualInspectionDataStatisticsController {
     }
 
     /**
-     * @param
+     * @param annualInspectionDataRequest
      * @return
-     * @description 获取所有项目的年检进度
-     * @date 2020/2/5 4:14 下午
+     * @description 获取项目下年检电梯的信息
+     * @date 2020/5/23 10:10 上午
      */
-    @RequestMapping("/allProjectAnnualProgress")
-    public RestResponse allProjectAnnualProgress(@RequestBody AnnualInspectionDataRequest annualInspectionDataRequest) {
-        return annualInspectionDataService.annualProgress(annualInspectionDataRequest);
+    @RequestMapping("/liftAnnualInfo")
+    public RestResponse liftAnnualInfo(@RequestBody AnnualInspectionDataRequest annualInspectionDataRequest) {
+        return annualInspectionDataService.liftAnnualInfo(annualInspectionDataRequest);
     }
+
 }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/AnnualInspectionDataModel.java

@@ -63,7 +63,7 @@ public class AnnualInspectionDataModel extends BaseDataModel {
     /**
      * 项目电梯台量
      */
-    private Long unitNum;
+    private Long unitNum = 0L;
 
     /**
      * @param

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/request/AnnualInspectionDataRequest.java

@@ -18,4 +18,5 @@ public class AnnualInspectionDataRequest extends CommonRequest {
      * 项目id
      */
     private String projectId;
+
 }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/AnnualInspectionDataService.java

@@ -88,11 +88,22 @@ public class AnnualInspectionDataService {
                 AnnualInspectionDataModel::getProjectId, Collectors.counting()));
         //封装台量
         projectAnnualList.forEach(annualInspectionDataModel -> {
-            if(projectIdToLiftNum != null && projectIdToLiftNum.size() > 0) {
+            if (projectIdToLiftNum != null && projectIdToLiftNum.size() > 0) {
                 annualInspectionDataModel.setUnitNum(projectIdToLiftNum.get(annualInspectionDataModel.getProjectId()));
             }
         });
         return RestResponse.success(projectAnnualList, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
+    /**
+     * @param annualInspectionDataRequest 年检数据
+     * @return
+     * @description
+     * @date 2020/5/23 10:02 上午
+     */
+    public RestResponse liftAnnualInfo(AnnualInspectionDataRequest annualInspectionDataRequest) {
+        List<AnnualInspectionDataModel> liftAnnualList = annualInspectionDataMapper
+                .getProjectLiftAnnualInfo(annualInspectionDataRequest);
+        return RestResponse.success(liftAnnualList);
+    }
 }