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

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import liquibase.pro.packaged.S;
 import org.apache.commons.lang3.StringUtils;
+import org.aspectj.weaver.ast.Var;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -886,7 +887,7 @@ public class RouteController extends AbstractBaseController {
 											   @RequestParam(value = "pointNo", required = false) String pointNo){
 		com.baomidou.mybatisplus.extension.plugins.pagination.Page<Point> pointPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>();
 		number = (number -1) * size;
-		pointPage.setTotal(pointMapper.countRoutePointList(name, pointNo));
+		pointPage.setTotal(pointMapper.countRoutePointList(name, pointNo,routeId));
 		pointPage.setRecords(pointMapper.selectRoutePointList(number, size, name, pointNo,routeId));
 		return CommonResponseUtil.success(pointPage);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PointMapper.java

@@ -157,7 +157,7 @@ public interface PointMapper extends BaseMapper {
 	List<Map<String, Object>> getPointRefItem(List<Long> list);
 
 	List<Point>  selectRoutePointList(Long number, Long size, String name, String pointNo,String routeId);
-	Integer  countRoutePointList(String name, String pointNo);
+	Integer  countRoutePointList(String name, String pointNo,String routeId);
 	List<RoutePoint> getRoutePoint(@Param("ids") List<Long> ids);
 
 	List<Point> findByName(@Param(value = "pointName") String pointName, @Param(value = "pointId") String pointId);

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -1462,6 +1462,13 @@
 	<select id="countRoutePointList" resultType="java.lang.Integer">
 		SELECT count(1) from p_point
 		WHERE route_id is null and  is_delete = 0
+		<if test="routeId != null and routeId != ''">
+			AND id not in (
+			select point_id
+			from p_route_point
+			where route_id = #{routeId}
+			)
+		</if>
 		<if test="name != null and name != ''">
 			AND name like concat('%', #{name}, '%')
 		</if>