电梯首页

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/mapper/AnnualInspectionDataMapper.java

@@ -30,6 +30,14 @@ public interface AnnualInspectionDataMapper {
      */
     List<AnnualInspectionDataModel> getProjectAnnual(AnnualInspectionDataRequest annualInspectionDataRequest);
 
+    /**
+     * @param
+     * @return
+     * @description 获取条数
+     * @date 2020/5/28 10:15 上午
+     */
+    Long getProjectAnnualCount(AnnualInspectionDataRequest annualInspectionDataRequest);
+
     /**
      * @param
      * @return

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -82,6 +83,10 @@ public class AnnualInspectionDataService {
      */
     public RestResponse annualProgress(AnnualInspectionDataRequest annualInspectionDataRequest) {
         DataStatisticsUtil.initCommonRequest(annualInspectionDataRequest);
+        if (StringUtils.isNotBlank(annualInspectionDataRequest.getProjectName())) {
+            annualInspectionDataRequest.setProjectName("%" + annualInspectionDataRequest.getProjectName() + "%");
+        }
+        long count = annualInspectionDataMapper.getProjectAnnualCount(annualInspectionDataRequest);
         List<AnnualInspectionDataModel> projectAnnualList = annualInspectionDataMapper.getProjectAnnual(annualInspectionDataRequest);
         List<AnnualInspectionDataModel> projectLiftNum = annualInspectionDataMapper.projectLiftNum(annualInspectionDataRequest);
         Map<Long, Long> projectIdToLiftNum = projectLiftNum.stream().collect(Collectors.groupingBy(
@@ -93,7 +98,10 @@ public class AnnualInspectionDataService {
                         projectIdToLiftNum.get(annualInspectionDataModel.getProjectId())));
             }
         });
-        return RestResponse.success(projectAnnualList, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
+        Map<String, Object> keyToAnnual = new HashMap<>();
+        keyToAnnual.put("count", DataStatisticsUtil.getLongValue(count));
+        keyToAnnual.put("list", projectAnnualList);
+        return RestResponse.success(keyToAnnual, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
     /**
@@ -108,4 +116,5 @@ public class AnnualInspectionDataService {
                 .getProjectLiftAnnualInfo(annualInspectionDataRequest);
         return RestResponse.success(liftAnnualList);
     }
+
 }

lift-batch-service/src/main/resources/mapper/AnnualInspectionDataMapper.xml

@@ -29,12 +29,7 @@
             ai.plan_date <![CDATA[ <= ]]> #{endTimeDateStr}
     </select>
 
-    <!-- 获取年检项目数据 -->
-    <select id="getProjectAnnual" parameterType="cn.com.ty.lift.batch.applet.dao.model.request.AnnualInspectionDataRequest"
-            resultType="cn.com.ty.lift.batch.applet.dao.model.AnnualInspectionDataModel">
-        select
-            p.id as projectId,
-            p.project_name as projectName
+    <sql id = "findAnnualProjectSql">
         from
             project p
         left join
@@ -53,6 +48,26 @@
             ai.plan_date <![CDATA[ >= ]]> #{startTimeDateStr}
         and
             ai.plan_date <![CDATA[ <= ]]> #{endTimeDateStr}
+        <if test="projectName != null and projectName != ''">
+            and p.project_name like #{projectName}
+        </if>
+    </sql>
+
+    <!-- 获取年检项目数据 -->
+    <select id="getProjectAnnualCount" parameterType="cn.com.ty.lift.batch.applet.dao.model.request.AnnualInspectionDataRequest"
+            resultType="java.lang.Long">
+        select
+            count(1)
+        <include refid="findAnnualProjectSql"/>
+    </select>
+
+    <!-- 获取年检项目数据 -->
+    <select id="getProjectAnnual" parameterType="cn.com.ty.lift.batch.applet.dao.model.request.AnnualInspectionDataRequest"
+            resultType="cn.com.ty.lift.batch.applet.dao.model.AnnualInspectionDataModel">
+        select
+            distinct (p.id) as projectId,
+            p.project_name as projectName
+        <include refid="findAnnualProjectSql"/>
         limit #{pageNum}, #{pageSize}
     </select>
 

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/LiftDataService.java

@@ -128,7 +128,7 @@ public class LiftDataService {
             liftMapDataModelList = liftMapDataModelList.stream()
                     .filter(liftMapDataModel -> {
                         if (StringUtils.isNotBlank(liftMapDataModel.getLiftCompanyStatus())) {
-                            return CommonEnum.LiftStatus.STOP_INSURANCE.getCode().equals(
+                            return !CommonEnum.LiftStatus.STOP_INSURANCE.getCode().equals(
                                     liftMapDataModel.getLiftCompanyStatus());
                         }
                         return false;