增加拒单标识

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

@@ -148,7 +148,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "1任务、2工单", required = true) @RequestParam Integer flowType,
             @ApiParam(value = "任务、工单id", required = true) @RequestParam Integer flowId,
             @ApiParam(value = "处理结果", required = true) @RequestParam String flowResult,
-            @ApiParam(value = "1通过、2同意(暂时不用)、3驳回、4漏点定位、5停水、6提交", required = true) @RequestParam Integer actionId) {
+            @ApiParam(value = "1通过、2同意(暂时不用)、3驳回、4漏点定位、5停水、6提交、7拒单", required = true) @RequestParam Integer actionId) {
         LoginUser currentUser = UserUtil.getCurrentUser();
 
         WorkFlowLog workFlowLog=new WorkFlowLog();
@@ -166,7 +166,7 @@ public class WorkOrderManageController {
             action=Action.ACTION_AUDIT;
         }else if(actionId==2){
             action=Action.ACTION_RECEIVE;
-        }else if(actionId==3){
+        }else if(actionId==3||actionId==7){
             action=Action.ACTION_REJECT;
         }
         Map<String,Object> args=new HashMap<>();
@@ -234,6 +234,10 @@ public class WorkOrderManageController {
                 if(handleResult.size()==0||handleResult==null) {
                     order.setOrderStatus(2);
                     order.setFinishDate(new Date());
+                }else if(actionId==7){
+                    order.setOrderStatus(4);
+                }else{
+                    order.setOrderStatus(1);
                 }
                 workOrderManageService.updateByPrimaryKey(order);
             }

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

@@ -478,11 +478,11 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectAppTodo" resultMap="BaseResultMap">
-    select id,task_no,send_time,address,order_type_id,create_by,update_by,task_desc,order_status
+    select id,task_no,send_time,address,order_type_id,create_by,update_by,task_desc,order_status,current_task_name
     from sc_work_order_manage
     where find_in_set(#{userId},current_users) and tenant_id = #{tenantId}
     union
-    select id,plan_id,plan_date,task_area_name,task_type,create_by,update_by,task_content,plan_status
+    select id,plan_id,plan_date,task_area_name,task_type,create_by,update_by,task_content,plan_status,current_task_name
     from sc_plan_manage
     where find_in_set(#{userId},current_users) and tenant_id = #{tenantId}
     order by send_time desc