Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -388,10 +388,10 @@ public class WorkOrderManageController {
             new AjaxMessage(ResultStatus.ERROR,"工单ID错误！");
         }
         if(StringUtils.isEmpty(workOrderManage.getCurrentTaskId())){
-            new AjaxMessage(ResultStatus.ERROR,"流程配置错误！");
+            new AjaxMessage(ResultStatus.ERROR,"任务ID错误！");
         }
         Map<String,Object> args=new HashMap<>();
-        List<TaskPorcessResult> handleResult = workFlowService.handleTask(Action.ACTION_SUBMIT,workOrderManage.getCurrentTaskId(), args, null);
+        List<TaskPorcessResult> handleResult = workFlowService.handleTask(Action.ACTION_AUDIT,workOrderManage.getCurrentTaskId(), args, null);
         workOrderManage.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
         workOrderManage.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
         workOrderManage.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -45,44 +45,39 @@ public class PlanManageController {
 
     @Autowired
     private UserCenterClient userCenterClient;
-    /**
-     * 新增巡检计划
-     * @param planName 任务名称
-     * @param taskType 任务类型
-     * @param planStartDate 计划开始时间
-     * @param planEndDate 计划结束时间
-     * @param userId 计划巡检人ID
-     * @param taskContent 任务内容
-     * @param taskAreaShape 任务区域坐标
-     * @param taskAreaName 任务区域名称
-     * @return
-     */
-    @GetMapping("/plan/add")
+
+
+    @PostMapping("/plan/add")
     @ApiOperation(value = "新增巡检计划")
-    public AjaxMessage addPlan(@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) {
+    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));
         PlanManage record = new PlanManage();
-        record.setUserId(userId);
+        record.setUserId(planManage.getUserId());
         record.setPlanId(planId);
-        record.setPlanName(planName);
-        record.setTaskType(taskType);
-        record.setTaskChecked(taskChecked);
+        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(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);
-        record.setTaskContent(taskContent);
-        record.setTaskAreaShape(taskAreaShape);
-        record.setTaskAreaName(taskAreaName);
+        record.setTaskContent(planManage.getTaskContent());
+        record.setTaskAreaShape(planManage.getTaskAreaShape());
+        record.setTaskAreaName(planManage.getTaskAreaName());
         record.setDateCreate(new Date());
         if(loginUser.getId() != null) {
             record.setPlanUserId(String.valueOf(loginUser.getId()));