修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/Route.java

@@ -8,11 +8,8 @@ import javax.persistence.Entity;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-
 import org.hibernate.annotations.Where;
-import org.springframework.data.annotation.Transient;
-
-
+import javax.persistence.Transient;
 /**
  * The persistent class for the p_route database table.
  * 
@@ -33,7 +30,7 @@ public class Route extends BasicEntity {
 	/**
 	 * 巡查点下是否存在巡查对象
 	 * */
-	@Transient
+
 	private String isExist;
 	
 	/**
@@ -98,7 +95,7 @@ public class Route extends BasicEntity {
 	 */
 	@Column(name="boss_name")
 	private String bossName;
-
+	@Transient
 	public String getIsExist() {
 		return isExist;
 	}

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

@@ -471,6 +471,14 @@ public class InputItemController extends AbstractBaseController {
 		if (ObjectUtils.isEmpty(user)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
+		   List dt=new ArrayList<>();
+		if(param.getDataJson()==null){
+			param.setDataJson(dt);
+		}
+		if(param.getPictureJson()==null){
+			param.setPictureJson(dt );
+		}
+
 		try {
 			InputItem inputItem = new InputItem();
 			ReginParams reginParams = getSelectedOrgInfo();
@@ -519,7 +527,7 @@ public class InputItemController extends AbstractBaseController {
 				map.put("CheckValidDown",param.getCheckValidDown().equals("false")?false:true);
 				map.put("CheckOkUp",param.getCheckOkUp().equals("false")?false:true);
 				map.put("CheckOkDown",param.getCheckOkDown().equals("false")?false:true);
-				map.put("Precision",param.getPrecision());
+				map.put("Precision",param.getPrecision()!=null?param.getPrecision():0);
 				inputItem.setDataJson(JSONObject.toJSONString(map));
 			}
 			if (!ObjectUtils.isEmpty(param.getId())) {

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

@@ -223,7 +223,7 @@ public class PlanTaskController extends AbstractBaseController {
     /**
      * 执行计划导出
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "执行计划导出", notes = "执行计划导出")
     @GetMapping (value = "/reportPlanTaskNew", produces = "application/vnd.ms-excel;charset=UTF-8")
     public void planTaskReportNew(
@@ -239,6 +239,7 @@ public class PlanTaskController extends AbstractBaseController {
             String fileName = "计划执行" + new Date().getTime();
             FileHelper.exportExcel(list, "计划执行", "计划执行", PlanTaskVo.class, fileName + ".xls", response);
         } catch (Exception e) {
+            e.printStackTrace();
             log.error(e.getMessage(), e);
         }
     }

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

@@ -313,7 +313,7 @@ public class RouteServiceImpl implements IRouteService {
                                 RoutePointItem item = new RoutePointItem();
                                 item.setPointInputItemId((Long) ref.get("id"));
                                 item.setRoutePointId(rp.getId());
-                                item.setPointClassifyId(Long.valueOf(ref.get("classifyId").toString()));
+                                item.setPointClassifyId(ref.containsKey("classifyId")?Long.valueOf(ref.get("classifyId").toString()):null);
                                 item.setOrderNo(orderNum[0]++);
                                 item.setPointId(pointId);
                                 item.setIsDelete(false);