| 
					
				 | 
			
			
				@@ -51,15 +51,6 @@ public class PlanManageController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @ApiOperation(value = "新增巡检计划") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public AjaxMessage addPlan( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             @ApiParam(value = "新增巡检计划", required = true) @RequestBody PlanManage planManage 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//            @ApiParam(value = "任务名称", required = true) @RequestParam(required = true) String planName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                               @ApiParam(value = "任务类型", required = true) @RequestParam(required = true) Integer taskType, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                               @ApiParam(value = "计划开始时间", required = true) @RequestParam(required = true) String planStartDate, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                               @ApiParam(value = "计划结束时间", required = true) @RequestParam(required = true) String planEndDate, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                               @ApiParam(value = "计划巡检人ID", required = true) @RequestParam(required = true) String userId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                               @ApiParam(value = "任务内容", required = true) @RequestParam(required = true) String taskContent, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                               @ApiParam(value = "任务区域坐标", required = true) @RequestParam(required = true) String taskAreaShape, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                               @ApiParam(value = "任务区域名称", required = true) @RequestParam(required = true) String taskAreaName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                               @ApiParam(value = "任务签到点", required = false) @RequestParam(required = false) String taskChecked 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         LoginUser loginUser = UserUtil.getCurrentUser(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String planId=DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -69,9 +60,6 @@ public class PlanManageController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         record.setPlanName(planManage.getPlanName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         record.setTaskType(planManage.getTaskType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         record.setTaskChecked(planManage.getTaskChecked()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //record.setPlanDate(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//        record.setPlanStartDate(DatesUtil.parseDate( planStartDate,"yyyy-MM-dd")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//        record.setPlanEndDate(DatesUtil.parseDate(planEndDate,"yyyy-MM-dd")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         record.setPlanStartDate(planManage.getPlanStartDate()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         record.setPlanEndDate(planManage.getPlanEndDate()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         record.setPlanStatus(0); 
			 |