管控清单接口修改

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

@@ -1576,6 +1576,11 @@ public class PointController extends AbstractBaseController {
 //			Map<String, Object> map = (Map<String, Object>) result;
 			point.setChargePersonId(user.getUserId());
 			point.setChargePersonName(user.getRealName());
+			boolean shotNumberFlag = StringUtil.isNotEmpty(point.getShotMaxNumber()) && StringUtil.isNotEmpty(point.getShotMinNumber())
+					&& point.getShotMaxNumber() < point.getShotMinNumber();
+			if (shotNumberFlag){
+				return CommonResponseUtil.failure("最多拍照数量小于最少拍照数量，请检查");
+			}
 
 			iPointService.addPointNew(point);
 			return CommonResponseUtil.success();

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

@@ -881,12 +881,13 @@ public class RouteController extends AbstractBaseController {
 	@GetMapping(value = "/selectRoutePointList", produces = "application/json;charset=UTF-8")
 	public CommonResponse selectRoutePointList(@RequestParam("size") Long size,
 											   @RequestParam("number") Long number,
+											   @RequestParam("routeId") String routeId,
 											   @RequestParam(value = "name", required = false) String name,
 											   @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.setRecords(pointMapper.selectRoutePointList(number, size, name, pointNo));
+		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

@@ -156,7 +156,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);
+	List<Point>  selectRoutePointList(Long number, Long size, String name, String pointNo,String routeId);
 	Integer  countRoutePointList(String name, String pointNo);
 	List<RoutePoint> getRoutePoint(@Param("ids") List<Long> ids);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/RoutePageParam.java

@@ -13,6 +13,17 @@ public class RoutePageParam extends CommonPageable{
 	 * 路线名称
 	 */
 	private String name;
+
+
+	/**
+	 *企业类型
+	 */
+	private String enterpriseType;
+
+	/**
+	 * 设备类型
+	 */
+	private String equipType;
 	
 	/**
 	 * 负责人
@@ -165,4 +176,20 @@ public class RoutePageParam extends CommonPageable{
 	public void setDeptId(Long deptId) {
 		this.deptId = deptId;
 	}
+
+	public String getEnterpriseType() {
+		return enterpriseType;
+	}
+
+	public void setEnterpriseType(String enterpriseType) {
+		this.enterpriseType = enterpriseType;
+	}
+
+	public String getEquipType() {
+		return equipType;
+	}
+
+	public void setEquipType(String equipType) {
+		this.equipType = equipType;
+	}
 }

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

@@ -1449,6 +1449,13 @@
 		<if test="pointNo != null and pointNo != ''">
 			AND point_no like concat('%', #{pointNo}, '%')
 		</if>
+		<if test="routeId != null and routeId != ''">
+			AND id not in (
+			select point_id
+			from p_route_point
+			where route_id = #{routeId}
+			)
+		</if>
 		ORDER BY create_date desc
 		LIMIT #{number}, #{size}
 	</select>

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

@@ -117,9 +117,12 @@
 		            p_route r
 		        WHERE
 		            r.is_delete = 0
+					<if test="id!=null">AND r.id LIKE CONCAT('%', #{id}, '%')</if>
 		            <if test="name!=null">AND r.name LIKE CONCAT('%', #{name}, '%')</if>
 			        <if test="remark!=null">AND r.remark LIKE CONCAT('%', #{remark}, '%')</if>
 			        <if test="orgCode!=null">AND r.org_Code = #{orgCode}</if>
+			        <if test="enterpriseType!=null">AND r.enterprise_type = #{enterpriseType}</if>
+			        <if test="equipType!=null">AND r.equip_type = #{equipType}</if>
 		            <if test="bizOrgCode!=null">AND r.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%') </if>
 			        <choose>
 			         <when	test="deptId > 0 " > AND r.dept_id = #{deptId}</when>