终止流程更新时间

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

@@ -198,7 +198,7 @@ public class WorkOrderManageController {
                 }
                 if(handleResult.size()==0||handleResult==null) {
                     plan.setPlanStatus(2);
-                    plan.setPlanEndDate(new Date());
+                    plan.setFinishDate(new Date());
                 }
                 planManageService.updateByPrimaryKey(plan);
             }
@@ -788,6 +788,7 @@ public class WorkOrderManageController {
         workOrderManage.setId(id);
         workOrderManage.setOrderStatus(3);//工单终止状态
         workOrderManage.setCurrentUsers("");
+        workOrderManage.setFinishDate(new Date());
         workOrderManageService.updateByPrimaryKeySelective(workOrderManage);
         LoginUser currentUser = UserUtil.getCurrentUser();
         WorkFlowLog workFlowLog=new WorkFlowLog();

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

@@ -296,6 +296,7 @@ public class PlanManageController {
         planManage.setId(id);
         planManage.setPlanStatus(3);//任务终止状态
         planManage.setCurrentUsers("");
+        planManage.setFinishDate(new Date());
         planManageService.updateByPrimaryKeySelective(planManage);
         LoginUser currentUser = UserUtil.getCurrentUser();
         WorkFlowLog workFlowLog=new WorkFlowLog();

operation_manager/src/main/java/com/huaxu/task/entity/PlanManage.java

@@ -110,5 +110,9 @@ public class PlanManage implements Serializable {
     @ApiModelProperty(value = "处理中状态（null未提交、2已提交、3已审核）")
     private Integer inProcessStatus;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "完成时间")
+    private Date finishDate;
+
     private static final long serialVersionUID = 1L;
 }

readme.md

@@ -225,4 +225,6 @@ CREATE TABLE `sms_device_setup_method` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='参数设置指令';
 
 
-
+### sc_work_order_manage、sc_plan_manage 添加字段in_process_status
+ALTER TABLE sc_work_order_manage ADD in_process_status int(11) null COMMENT '处理中状态（null未接单、1已接单、2已提交、3已审核）';
+ALTER TABLE sc_plan_manage ADD in_process_status int(11) null COMMENT '处理中状态（null未提交、2已提交、3已审核）'