双规小程序接口

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/AppPointCheckRespone.java

@@ -15,6 +15,26 @@ public class AppPointCheckRespone {
 
     private String pointNo;
 
+    private int shortMinNumber;
+
+    private int shortMaxNumber;
+
+    public int getShortMinNumber() {
+        return shortMinNumber;
+    }
+
+    public void setShortMinNumber(int shortMinNumber) {
+        this.shortMinNumber = shortMinNumber;
+    }
+
+    public int getShortMaxNumber() {
+        return shortMaxNumber;
+    }
+
+    public void setShortMaxNumber(int shortMaxNumber) {
+        this.shortMaxNumber = shortMaxNumber;
+    }
+
     public String getTaskStatus() {
         return taskStatus;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/PointCheckDetailBo.java

@@ -15,6 +15,26 @@ public class PointCheckDetailBo {
 	private String taskStatus;
 	
 	private String planName;
+
+	private int shortMinNumber;
+
+	private int shortMaxNumber;
+
+	public int getShortMinNumber() {
+		return shortMinNumber;
+	}
+
+	public void setShortMinNumber(int shortMinNumber) {
+		this.shortMinNumber = shortMinNumber;
+	}
+
+	public int getShortMaxNumber() {
+		return shortMaxNumber;
+	}
+
+	public void setShortMaxNumber(int shortMaxNumber) {
+		this.shortMaxNumber = shortMaxNumber;
+	}
 	
 	private long routeId;
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1482,6 +1482,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             pointCheckRespone.setBeginTime(planPointInfo.getBeginTime());
             pointCheckRespone.setEndTime(planPointInfo.getEndTime());
             pointCheckRespone.setPlanName(planPointInfo.getPlanName());
+            pointCheckRespone.setShortMaxNumber(planPointInfo.getShortMaxNumber());
+            pointCheckRespone.setShortMinNumber(planPointInfo.getShortMinNumber());
             List<PointCheckDetailBo> pointInputs = planTaskMapper.getPointInputByRouteIdAndPointId(planPointInfo.getRouteId(), planPointInfo.getPointId());
             JSONObject appResponeMap = new JSONObject();
             List<AppCheckInputRespone> appCheckInputResponeList = new ArrayList<AppCheckInputRespone>();

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

@@ -679,7 +679,9 @@
 			ppt.user_id userId,
 		    ppt.user_name userName,
 			pptd.status pointStatus,
-			ppt.finish_status taskStatus
+			ppt.finish_status taskStatus,
+			pp.shot_min_number shortMinNumber,
+			pp.shot_max_number shortMaxNumber
 		FROM
 			p_plan_task_detail pptd
 		LEFT JOIN p_plan_task ppt ON pptd.task_no = ppt.id