Merge branch 'develop_dl_plan6_temp' of…

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

@@ -113,6 +113,31 @@ public class CheckController extends AbstractBaseController {
     private WebMqttComponent webMqttComponent;
 
     /**
+     *
+     * 巡查记录列表
+     * **/
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "巡检记录查询", notes = "巡检记录查询")
+    @RequestMapping(value = "/listNew", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    public CommonResponse qryCheckInfoPageNew(
+            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckInfoPageParam param,
+            @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        param.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+        param.setOrderBy("checkDate desc");
+        Page<CheckInfoVo> list = checkService.getCheckInfo(null,null,null,param);
+        return CommonResponseUtil.success(list);
+    }
+
+
+
+
+
+
+
+
+    /**
      * 巡检计划查询
      *
      * @param

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

@@ -211,7 +211,24 @@ public class PointController extends AbstractBaseController {
 		}
 	}
 
-
+	/**
+	 * 根据ID查询巡检点信息
+	 *
+	 * @param id
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "查询巡检点信息", notes = "查询巡检点信息")
+	@GetMapping(value = "/queryPointByIdNew", produces = "application/json;charset=UTF-8")
+	public CommonResponse queryPointByIdNew(@ApiParam(value = "巡检点id", required = true) @RequestParam String id) {
+		try {
+			Point point = iPointService.queryPointById(Long.valueOf(id));
+			return CommonResponseUtil.success(point);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return CommonResponseUtil.failure("查询巡检点失败");
+		}
+	}
 
 
 

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

@@ -103,4 +103,7 @@ public class CheckInfoPageParam extends CommonPageable{
 
 	private Integer dangerType;
 
+	private String bizOrgCode;
+
+
 }