双规小程序接口

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

@@ -1461,10 +1461,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             pointCheckRespone.setPointId(pointId);
             pointCheckRespone.setPointName(planPointInfo.getPointName());
             pointCheckRespone.setPointNo(planPointInfo.getPointNo());
+            pointCheckRespone.setBeginTime(planPointInfo.getBeginTime());
+            pointCheckRespone.setEndTime(planPointInfo.getEndTime());
             pointCheckRespone.setPointStatus("0");
             pointCheckRespone.setPlanName(planPointInfo.getPlanName());
             List<PointCheckDetailBo> pointInputs = planTaskMapper.getPointInputByRouteIdAndPointId(planPointInfo.getRouteId(), planPointInfo.getPointId());
             JSONObject appResponeMap = new JSONObject();
+            List<AppCheckInputRespone> appCheckInputResponeList = new ArrayList<AppCheckInputRespone>();
             pointInputs.forEach(action -> {
                 AppCheckInputRespone input = new AppCheckInputRespone();
                 input.setInputName(action.getInputName());
@@ -1483,15 +1486,11 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 input.setPictureJson(action.getPictureJson());
                 input.setClassifyId(action.getClassifyId());
                 input.setClassifyName(action.getClassifyName());
-                String key = ObjectUtils.isEmpty(action.getClassifyName()) ? "其他" : action.getClassifyName();
-                if (appResponeMap.containsKey(key)) {
-                    appResponeMap.getJSONArray(key).add(input);
-                } else {
-                    List<AppCheckInputRespone> appCheckInputResponeList = new ArrayList<AppCheckInputRespone>();
-                    appCheckInputResponeList.add(input);
-                    appResponeMap.put(key, appCheckInputResponeList);
-                }
+                appCheckInputResponeList.add(input);
+
             });
+
+            appResponeMap.put("items", appCheckInputResponeList);
             pointCheckRespone.setAppCheckInput(appResponeMap);
         }
 

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

@@ -667,6 +667,8 @@
 			ppt.route_id routeId,
 			ppl.name planName,
 			ppt.begin_time checkTime,
+			ppt.begin_time beginTime,
+			ppt.end_time endTime,
 			ppl.dept_id checkDepartmentId,
 			ppt.user_id userId,
 		    ppt.user_name userName,