Merge remote-tracking branch 'origin/master'

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

@@ -185,7 +185,7 @@ public class PlanManageController {
     @GetMapping("/plan/submit")
     @ApiOperation(value = "提交巡检计划")
     public AjaxMessage submitPlan(
-            @ApiParam(value = "任务ID", required = true) @RequestParam(required = false) Integer id,
+            @ApiParam(value = "任务ID", required = true) @RequestParam(required = true) Integer id,
             @ApiParam(value = "任务类型", required = true) @RequestParam(required = true) String taskType){
         LoginUser loginUser = UserUtil.getCurrentUser();
         PlanManage planManage = planManageService.selectByPrimaryKey(id);

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -609,7 +609,7 @@
         and t1.date_create <= DATE_ADD(date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%c-%d'),INTERVAL 1 DAY)
       </if>
     </where>
-    order by t1.date_create
+    order by t1.date_create desc
   </select>
   <!--删除-->
   <delete id="batchDelete">

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -445,7 +445,7 @@
         and t1.date_create <= DATE_ADD(date_format(#{plan.endDate,jdbcType=VARCHAR},'%Y-%c-%d'),INTERVAL 1 DAY)
       </if>
     </where>
-    order by t1.date_create
+    order by t1.date_create desc
   </select>
 
   <!--待处理权限-->