优化 巡检点查询SQL

Api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java

@@ -12,6 +12,7 @@ import com.java110.dto.hardwareAdapation.MachineDto;
 import com.java110.dto.inspectionPoint.InspectionDto;
 import com.java110.dto.unit.FloorAndUnitDto;
 import com.java110.utils.constant.ServiceCodeInspectionPointConstant;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
@@ -73,6 +74,7 @@ public class ListInspectionPointsListener extends AbstractServiceApiListener {
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
     }
 
     @Override

java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml

@@ -75,10 +75,12 @@
         inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.status_cd,t.status_cd
         statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
         ip.inspection_id inspectionId,ip.machine_id machineId,ip.remark,
-        ip.inspection_name inspectionName
-        from inspection_route_point_rel t,inspection_point ip
+        ip.inspection_name inspectionName,m.location_type_cd locationTypeCd,m.location_obj_id locationObjId
+        from inspection_route_point_rel t,inspection_point ip,machine m
         where 1 =1
         and t.inspection_id = ip.inspection_id
+        and ip.machine_id = m.machine_id
+        and m.status_cd = 0
         and ip.status_cd = '0'
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
@@ -135,10 +137,12 @@
     <!-- 查询巡检路线巡检点关系数量 add by wuxw 2018-07-03 -->
     <select id="queryInspectionRoutePointRelsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from inspection_route_point_rel t,inspection_point ip
+        from inspection_route_point_rel t,inspection_point ip,machine m
         where 1 =1
         and t.inspection_id = ip.inspection_id
-        and ip.status_cd = '0'
+        and ip.machine_id = m.machine_id
+        and m.status_cd = 0
+        and ip.status_cd = '0
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
         </if>