任务和工单的审批、app提交、接单、拒单

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

@@ -6,19 +6,26 @@ import com.huaxu.model.LoginUser;
 import com.huaxu.model.ResultStatus;
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkFlowDetail;
+import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.order.service.WorkFlowDetailService;
+import com.huaxu.order.service.WorkFlowLogService;
 import com.huaxu.order.service.WorkOrderManageService;
+import com.huaxu.process.dto.TaskPorcessResult;
+import com.huaxu.process.service.WorkFlowService;
+import com.huaxu.process.utils.Action;
+import com.huaxu.task.entity.PlanManage;
+import com.huaxu.task.service.PlanManageService;
 import com.huaxu.util.DatesUtil;
 import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @RestController
 @RequestMapping("/order/workOrderManage")
@@ -31,6 +38,15 @@ public class WorkOrderManageController {
     @Autowired
     WorkFlowDetailService workFlowDetailService;
 
+    @Autowired
+    PlanManageService planManageService;
+
+    @Autowired
+    WorkFlowLogService workFlowLogService;
+
+    @Autowired
+    WorkFlowService workFlowService;
+
     /**
      * 新增一条数据
      *
@@ -41,6 +57,7 @@ public class WorkOrderManageController {
     @ApiOperation(value = "插入工单")
     public AjaxMessage<Integer> insertSelective(@ApiParam(value = "工单信息", required = true) @RequestBody WorkOrderManageDto workOrderManageDto) {
         LoginUser currentUser = UserUtil.getCurrentUser();
+        workOrderManageDto.setTenantId(currentUser.getTenantId());
         workOrderManageDto.setCreateBy(currentUser.getUsername());
         workOrderManageDto.setDateCreate(new Date());
         workOrderManageDto.setOrderStatus(0);
@@ -63,7 +80,7 @@ public class WorkOrderManageController {
      * APP运维管理待处理查询
      * @return Response对象
      */
-    @RequestMapping(value = "selectAppTodo", method = RequestMethod.POST)
+    @RequestMapping(value = "selectAppTodo", method = RequestMethod.GET)
     @ApiOperation(value = "APP运维管理待处理查询")
     public AjaxMessage<List<WorkOrderManageDto>> selectAppTodo() {
         return new AjaxMessage<>(ResultStatus.OK,  workOrderManageService.selectAppTodo());
@@ -72,9 +89,100 @@ public class WorkOrderManageController {
      * APP运维管理全部查询
      * @return Response对象
      */
-    @RequestMapping(value = "selectAppAll", method = RequestMethod.POST)
+    @RequestMapping(value = "selectAppAll", method = RequestMethod.GET)
     @ApiOperation(value = "APP运维管理全部查询")
     public AjaxMessage<List<WorkOrderManageDto>> selectAppAll() {
         return new AjaxMessage<>(ResultStatus.OK,  workOrderManageService.selectAppAll());
     }
+    /**
+     * 任务和工单的审批、app提交、接单、拒单
+     * @return Response对象
+     */
+    @RequestMapping(value = "submitTask", method = RequestMethod.GET)
+    @ApiOperation(value = "任务和工单的审批、app提交、接单、拒单 ")
+    public AjaxMessage<Integer> submitTask(
+            @ApiParam(value = "1任务、2工单", required = true) @RequestParam Integer flowType,
+            @ApiParam(value = "任务、工单id", required = true) @RequestParam Integer flowId,
+            @ApiParam(value = "json格式存储对应任务详情", required = false) @RequestParam(required = false) String flowDetail,
+            @ApiParam(value = "处理结果", required = true) @RequestParam String flowResult,
+            @ApiParam(value = "1审批通过、2同意、3驳回", required = true) @RequestParam Integer actionId) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        //有任务详情的更新详情表数据
+        if(!StringUtils.isEmpty(flowDetail)) {
+            WorkFlowDetail workFlowDetail =new WorkFlowDetail();
+            workFlowDetail.setFlowType(flowType);
+            workFlowDetail.setFlowId(flowId);
+            workFlowDetail.setFlowDetail(flowDetail);
+            Integer detailId= workFlowDetailService.selectDetailId(workFlowDetail);
+
+            //插入或更新详情
+            if(detailId==null) {
+                workFlowDetail.setCreateBy(currentUser.getUsername());
+                workFlowDetail.setDateCreate(new Date());
+                workFlowDetailService.insertSelective(workFlowDetail);
+            }else{
+                workFlowDetail.setUpdateBy(currentUser.getUsername());
+                workFlowDetail.setDateUpdate(new Date());
+                workFlowDetail.setId(detailId);
+                workFlowDetailService.updateByPrimaryKeySelective(workFlowDetail);
+            }
+        }
+
+        WorkFlowLog workFlowLog=new WorkFlowLog();
+        workFlowLog.setFlowId(flowId);
+        workFlowLog.setFlowType(flowType);
+        workFlowLog.setFlowResult(flowResult);
+        workFlowLog.setCreateBy(currentUser.getUsername());
+        workFlowLog.setDateCreate(new Date());
+        workFlowLog.setHandleUserId(currentUser.getId()!=null?currentUser.getId().toString():null);
+        workFlowLog.setHandleUserName(currentUser.getUsername());
+
+        //流程流转 更新当前任务状态
+        Action action=null;
+        if(actionId==1){
+            action=Action.ACTION_AUDIT;
+        }else if(actionId==2){
+            action=Action.ACTION_RECEIVE;
+        }else if(actionId==3){
+            action=Action.ACTION_REJECT;
+        }
+        Map<String,Object> args=new HashMap<>();
+        //查询当前工单或任务 并更新当前状态
+        if(flowType == 1){
+            PlanManage plan= planManageService.selectByPrimaryKey(flowId);
+            workFlowLog.setProcessInstanceId(plan.getProcessInstanceId());
+            workFlowLog.setTaskId(plan.getCurrentTaskId());
+
+            List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,plan.getCurrentTaskId(), null, null);
+            plan.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
+            plan.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
+            plan.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);
+            plan.setUpdateBy(currentUser.getUsername());
+            plan.setDateUpdate(new Date());
+            if(handleResult.size()==0||handleResult==null) {
+                plan.setPlanStatus(2);
+                plan.setPlanEndDate(new Date());
+            }
+            planManageService.updateByPrimaryKey(plan);
+        }else if(flowType == 2){
+            WorkOrderManage order= workOrderManageService.selectByPrimaryKey(flowId);
+            workFlowLog.setProcessInstanceId(order.getProcessInstanceId());
+            workFlowLog.setTaskId(order.getCurrentTaskId());
+
+            List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,order.getCurrentTaskId(), null, null);
+            order.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
+            order.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);
+            order.setCurrentTaskName(handleResult.size()>0?handleResult.get(0).getCurrentTaskName():null);
+            order.setUpdateBy(currentUser.getUsername());
+            order.setDateUpdate(new Date());
+            if(handleResult.size()==0||handleResult==null) {
+                order.setOrderStatus(2);
+                order.setFinishDate(new Date());
+            }
+            workOrderManageService.updateByPrimaryKey(order);
+        }
+        //记录日志
+        workFlowLogService.insert(workFlowLog);
+        return new AjaxMessage<>(ResultStatus.OK );
+    }
 }

operation_manager/src/main/java/com/huaxu/order/dao/WorkFlowDetailMapper.java

@@ -18,4 +18,7 @@ public interface WorkFlowDetailMapper {
     int updateByPrimaryKeyWithBLOBs(WorkFlowDetail record);
 
     int updateByPrimaryKey(WorkFlowDetail record);
+
+    Integer selectDetailId(WorkFlowDetail record);
+
 }

operation_manager/src/main/java/com/huaxu/order/dao/WorkFlowLogMapper.java

@@ -0,0 +1,10 @@
+package com.huaxu.order.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaxu.order.entity.WorkFlowLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkFlowLogMapper  extends BaseMapper<WorkFlowLog> {
+
+}

operation_manager/src/main/java/com/huaxu/order/entity/WorkFlowLog.java

@@ -0,0 +1,58 @@
+package com.huaxu.order.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "流程任务处理历史")
+@TableName("sc_work_flow_log")
+public class WorkFlowLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(type= IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "任务、工单id")
+    private Integer flowId;
+
+    @ApiModelProperty(value = "流程示例id")
+    private String processInstanceId;
+
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+
+    @ApiModelProperty(value = "处理人id")
+    private String handleUserId;
+
+    @ApiModelProperty(value = " 处理人名称")
+    private String handleUserName;
+
+    @ApiModelProperty(value = "1任务、2工单")
+    private Integer flowType;
+
+    @ApiModelProperty(value = "处理结果")
+    private String flowResult;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date dateCreate;
+
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "修改时间")
+    private Date dateUpdate;
+}

operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderManage.java

@@ -65,7 +65,7 @@ public class WorkOrderManage implements Serializable {
     @ApiModelProperty(value = "部门机构id")
     private String departmentOrgId;
 
-    @ApiModelProperty(value = "0未接单、1进行中、2完成、3拒单")
+    @ApiModelProperty(value = "0未接单、1进行中、2完成")
     private Integer orderStatus;
 
     @ApiModelProperty(value = "1运维上报、2用户上报、3设备告警")
@@ -95,9 +95,6 @@ public class WorkOrderManage implements Serializable {
     @ApiModelProperty(value = "当前名称")
     private String currentTaskName;
 
-    @ApiModelProperty(value = "拒绝理由")
-    private String rejectReason;
-
     @ApiModelProperty(value = "经纬度")
     private String geo;
 

operation_manager/src/main/java/com/huaxu/order/service/WorkFlowDetailService.java

@@ -12,4 +12,18 @@ public interface WorkFlowDetailService {
      * @return 影响行数
      */
     int insertSelective(WorkFlowDetail workFlowDetail);
+    /**
+     * 修改数据
+     *
+     * @param workFlowDetail 实例对象
+     * @return 影响行数
+     */
+    int updateByPrimaryKeySelective(WorkFlowDetail workFlowDetail);
+    /**
+     * 根据流程查询详情的id
+     *
+     * @param workFlowDetail 实例对象
+     * @return 影响行数
+     */
+    Integer selectDetailId(WorkFlowDetail workFlowDetail);
 }

operation_manager/src/main/java/com/huaxu/order/service/WorkFlowLogService.java

@@ -0,0 +1,39 @@
+package com.huaxu.order.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaxu.order.dao.WorkFlowLogMapper;
+import com.huaxu.order.entity.WorkFlowLog;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 报警设置服务接口
+ *
+ * @author yjy
+ * @since 2020-11-17
+ */
+@Service
+public class WorkFlowLogService extends ServiceImpl<WorkFlowLogMapper, WorkFlowLog> {
+    @Resource
+    private WorkFlowLogMapper workFlowLogMapper;
+    /**
+     * 批量增加数据
+     *
+     * @param
+     * @return
+     */
+    public boolean insert(WorkFlowLog workFlowLog) {
+        return this.save(workFlowLog);
+    }
+    /**
+     * 根据id查询数据
+     *
+     * @param id 所属公司
+     * @return 单条数据
+     */
+    public WorkFlowLog selectById(Integer id){
+        return this.getById(id);
+    }
+}

operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -3,6 +3,7 @@ package com.huaxu.order.service;
 
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
+import com.huaxu.task.entity.PlanManage;
 
 import java.util.List;
 
@@ -23,5 +24,13 @@ public interface WorkOrderManageService {
      * APP运维管理全部查询
      */
     List<WorkOrderManageDto> selectAppAll();
+    /**
+     * 按id查询工单
+     */
+    WorkOrderManage selectByPrimaryKey(Integer id);
+    /**
+     * 更新工单
+     */
+    int updateByPrimaryKey(WorkOrderManage workOrderManage);
 
 }

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkFlowDetailServiceImpl.java

@@ -30,4 +30,24 @@ public class WorkFlowDetailServiceImpl implements WorkFlowDetailService {
     public int insertSelective(WorkFlowDetail workFlowDetail) {
         return workFlowDetailMapper.insertSelective(workFlowDetail);
     }
+    /**
+     * 修改数据
+     *
+     * @param workFlowDetail 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public int updateByPrimaryKeySelective(WorkFlowDetail workFlowDetail) {
+        return workFlowDetailMapper.updateByPrimaryKeySelective(workFlowDetail);
+    }
+    /**
+     * 根据流程查询详情的id
+     *
+     * @param workFlowDetail 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public Integer selectDetailId(WorkFlowDetail workFlowDetail) {
+        return workFlowDetailMapper.selectDetailId(workFlowDetail);
+    }
 }

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -5,6 +5,7 @@ import com.huaxu.order.dao.WorkOrderManageMapper;
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.order.service.WorkOrderManageService;
+import com.huaxu.task.entity.PlanManage;
 import com.huaxu.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,4 +53,18 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
         LoginUser currentUser = UserUtil.getCurrentUser();
         return workOrderManageMapper.selectAppAll(currentUser.getId(),currentUser.getTenantId());
     }
+    /**
+     * 按id查询工单
+     */
+    @Override
+    public WorkOrderManage selectByPrimaryKey(Integer id) {
+        return workOrderManageMapper.selectByPrimaryKey(id);
+    }
+    /**
+     * 更新工单
+     */
+    @Override
+    public int updateByPrimaryKey(WorkOrderManage record) {
+        return workOrderManageMapper.updateByPrimaryKey(record);
+    }
 }

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

@@ -6,9 +6,9 @@
     <result column="flow_id" property="flowId" jdbcType="INTEGER" />
     <result column="flow_type" property="flowType" jdbcType="INTEGER" />
     <result column="create_by" property="createBy" jdbcType="VARCHAR" />
-    <result column="date_create" property="dateCreate" jdbcType="DATE" />
+    <result column="date_create" property="dateCreate" jdbcType="TIMESTAMP" />
     <result column="update_by" property="updateBy" jdbcType="VARCHAR" />
-    <result column="date_update" property="dateUpdate" jdbcType="DATE" />
+    <result column="date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.huaxu.order.entity.WorkFlowDetail" extends="BaseResultMap" >
     <result column="flow_detail" property="flowDetail" jdbcType="LONGVARCHAR" />
@@ -36,8 +36,8 @@
       create_by, date_create, update_by, 
       date_update, flow_detail)
     values (#{id,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{flowType,jdbcType=INTEGER}, 
-      #{createBy,jdbcType=VARCHAR}, #{dateCreate,jdbcType=DATE}, #{updateBy,jdbcType=VARCHAR}, 
-      #{dateUpdate,jdbcType=DATE}, #{flowDetail,jdbcType=LONGVARCHAR})
+      #{createBy,jdbcType=VARCHAR}, #{dateCreate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{dateUpdate,jdbcType=TIMESTAMP}, #{flowDetail,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.huaxu.order.entity.WorkFlowDetail" >
     insert into sc_work_flow_detail
@@ -81,13 +81,13 @@
         #{createBy,jdbcType=VARCHAR},
       </if>
       <if test="dateCreate != null" >
-        #{dateCreate,jdbcType=DATE},
+        #{dateCreate,jdbcType=TIMESTAMP},
       </if>
       <if test="updateBy != null" >
         #{updateBy,jdbcType=VARCHAR},
       </if>
       <if test="dateUpdate != null" >
-        #{dateUpdate,jdbcType=DATE},
+        #{dateUpdate,jdbcType=TIMESTAMP},
       </if>
       <if test="flowDetail != null" >
         #{flowDetail,jdbcType=LONGVARCHAR},
@@ -107,13 +107,13 @@
         create_by = #{createBy,jdbcType=VARCHAR},
       </if>
       <if test="dateCreate != null" >
-        date_create = #{dateCreate,jdbcType=DATE},
+        date_create = #{dateCreate,jdbcType=TIMESTAMP},
       </if>
       <if test="updateBy != null" >
         update_by = #{updateBy,jdbcType=VARCHAR},
       </if>
       <if test="dateUpdate != null" >
-        date_update = #{dateUpdate,jdbcType=DATE},
+        date_update = #{dateUpdate,jdbcType=TIMESTAMP},
       </if>
       <if test="flowDetail != null" >
         flow_detail = #{flowDetail,jdbcType=LONGVARCHAR},
@@ -126,9 +126,9 @@
     set flow_id = #{flowId,jdbcType=INTEGER},
       flow_type = #{flowType,jdbcType=INTEGER},
       create_by = #{createBy,jdbcType=VARCHAR},
-      date_create = #{dateCreate,jdbcType=DATE},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
-      date_update = #{dateUpdate,jdbcType=DATE},
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP},
       flow_detail = #{flowDetail,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -137,9 +137,15 @@
     set flow_id = #{flowId,jdbcType=INTEGER},
       flow_type = #{flowType,jdbcType=INTEGER},
       create_by = #{createBy,jdbcType=VARCHAR},
-      date_create = #{dateCreate,jdbcType=DATE},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
-      date_update = #{dateUpdate,jdbcType=DATE}
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selectDetailId" resultType="java.lang.Integer">
+    select id
+    from sc_work_flow_detail
+    where flow_id= #{flowId} and flow_type=#{flowType}
+  </select>
+
 </mapper>

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

@@ -6,10 +6,10 @@
     <result column="task_no" property="taskNo" jdbcType="VARCHAR" />
     <result column="task_desc" property="taskDesc" jdbcType="VARCHAR" />
     <result column="order_user_id" property="orderUserId" jdbcType="VARCHAR" />
-    <result column="send_time" property="sendTime" jdbcType="DATE" />
+    <result column="send_time" property="sendTime" jdbcType="TIMESTAMP" />
     <result column="send_by" property="sendBy" jdbcType="VARCHAR" />
-    <result column="plan_finish_date" property="planFinishDate" jdbcType="DATE" />
-    <result column="finish_date" property="finishDate" jdbcType="DATE" />
+    <result column="plan_finish_date" property="planFinishDate" jdbcType="TIMESTAMP" />
+    <result column="finish_date" property="finishDate" jdbcType="TIMESTAMP" />
     <result column="date_limit" property="dateLimit" jdbcType="VARCHAR" />
     <result column="urgency" property="urgency" jdbcType="VARCHAR" />
     <result column="address" property="address" jdbcType="VARCHAR" />
@@ -29,10 +29,9 @@
     <result column="current_users" property="currentUsers" jdbcType="VARCHAR" />
     <result column="current_task_name" property="currentTaskName" jdbcType="VARCHAR" />
     <result column="create_by" property="createBy" jdbcType="VARCHAR" />
-    <result column="date_create" property="dateCreate" jdbcType="DATE" />
+    <result column="date_create" property="dateCreate" jdbcType="TIMESTAMP" />
     <result column="update_by" property="updateBy" jdbcType="VARCHAR" />
-    <result column="date_update" property="dateUpdate" jdbcType="DATE" />
-    <result column="reject_reason" property="rejectReason" jdbcType="VARCHAR" />
+    <result column="date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
     <result column="geo" property="geo" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
@@ -40,7 +39,7 @@
     date_limit, urgency, address, contact_user, contact_phone, order_time, company_org_id, 
     department_org_id, order_status, event_type, order_type_id, order_pid, tenant_id, 
     process_instance_id, process_def_id, current_task_id, current_users, current_task_name, 
-    create_by, date_create, update_by, date_update, reject_reason, geo
+    create_by, date_create, update_by, date_update, geo
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -63,18 +62,18 @@
       process_instance_id, process_def_id, current_task_id, 
       current_users, current_task_name, create_by, 
       date_create, update_by, date_update, 
-      reject_reason, geo)
+      geo)
     values (#{id,jdbcType=INTEGER}, #{taskNo,jdbcType=VARCHAR}, #{taskDesc,jdbcType=VARCHAR}, 
-      #{orderUserId,jdbcType=VARCHAR}, #{sendTime,jdbcType=DATE}, #{sendBy,jdbcType=VARCHAR}, 
-      #{planFinishDate,jdbcType=DATE}, #{finishDate,jdbcType=DATE}, #{dateLimit,jdbcType=VARCHAR}, 
+      #{orderUserId,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP}, #{sendBy,jdbcType=VARCHAR}, 
+      #{planFinishDate,jdbcType=TIMESTAMP}, #{finishDate,jdbcType=TIMESTAMP}, #{dateLimit,jdbcType=VARCHAR}, 
       #{urgency,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{contactUser,jdbcType=VARCHAR}, 
       #{contactPhone,jdbcType=VARCHAR}, #{orderTime,jdbcType=VARCHAR}, #{companyOrgId,jdbcType=VARCHAR}, 
       #{departmentOrgId,jdbcType=VARCHAR}, #{orderStatus,jdbcType=INTEGER}, #{eventType,jdbcType=INTEGER}, 
       #{orderTypeId,jdbcType=INTEGER}, #{orderPid,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, 
       #{processInstanceId,jdbcType=VARCHAR}, #{processDefId,jdbcType=VARCHAR}, #{currentTaskId,jdbcType=VARCHAR}, 
       #{currentUsers,jdbcType=VARCHAR}, #{currentTaskName,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, 
-      #{dateCreate,jdbcType=DATE}, #{updateBy,jdbcType=VARCHAR}, #{dateUpdate,jdbcType=DATE}, 
-      #{rejectReason,jdbcType=VARCHAR}, #{geo,jdbcType=VARCHAR})
+      #{dateCreate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{dateUpdate,jdbcType=TIMESTAMP}, 
+      #{geo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.huaxu.order.entity.WorkOrderManage" keyProperty="id" useGeneratedKeys="true">
     insert into sc_work_order_manage
@@ -169,9 +168,6 @@
       <if test="dateUpdate != null" >
         date_update,
       </if>
-      <if test="rejectReason != null" >
-        reject_reason,
-      </if>
       <if test="geo != null" >
         geo,
       </if>
@@ -190,16 +186,16 @@
         #{orderUserId,jdbcType=VARCHAR},
       </if>
       <if test="sendTime != null" >
-        #{sendTime,jdbcType=DATE},
+        #{sendTime,jdbcType=TIMESTAMP},
       </if>
       <if test="sendBy != null" >
         #{sendBy,jdbcType=VARCHAR},
       </if>
       <if test="planFinishDate != null" >
-        #{planFinishDate,jdbcType=DATE},
+        #{planFinishDate,jdbcType=TIMESTAMP},
       </if>
       <if test="finishDate != null" >
-        #{finishDate,jdbcType=DATE},
+        #{finishDate,jdbcType=TIMESTAMP},
       </if>
       <if test="dateLimit != null" >
         #{dateLimit,jdbcType=VARCHAR},
@@ -259,16 +255,13 @@
         #{createBy,jdbcType=VARCHAR},
       </if>
       <if test="dateCreate != null" >
-        #{dateCreate,jdbcType=DATE},
+        #{dateCreate,jdbcType=TIMESTAMP},
       </if>
       <if test="updateBy != null" >
         #{updateBy,jdbcType=VARCHAR},
       </if>
       <if test="dateUpdate != null" >
-        #{dateUpdate,jdbcType=DATE},
-      </if>
-      <if test="rejectReason != null" >
-        #{rejectReason,jdbcType=VARCHAR},
+        #{dateUpdate,jdbcType=TIMESTAMP},
       </if>
       <if test="geo != null" >
         #{geo,jdbcType=VARCHAR},
@@ -288,16 +281,16 @@
         order_user_id = #{orderUserId,jdbcType=VARCHAR},
       </if>
       <if test="sendTime != null" >
-        send_time = #{sendTime,jdbcType=DATE},
+        send_time = #{sendTime,jdbcType=TIMESTAMP},
       </if>
       <if test="sendBy != null" >
         send_by = #{sendBy,jdbcType=VARCHAR},
       </if>
       <if test="planFinishDate != null" >
-        plan_finish_date = #{planFinishDate,jdbcType=DATE},
+        plan_finish_date = #{planFinishDate,jdbcType=TIMESTAMP},
       </if>
       <if test="finishDate != null" >
-        finish_date = #{finishDate,jdbcType=DATE},
+        finish_date = #{finishDate,jdbcType=TIMESTAMP},
       </if>
       <if test="dateLimit != null" >
         date_limit = #{dateLimit,jdbcType=VARCHAR},
@@ -357,16 +350,13 @@
         create_by = #{createBy,jdbcType=VARCHAR},
       </if>
       <if test="dateCreate != null" >
-        date_create = #{dateCreate,jdbcType=DATE},
+        date_create = #{dateCreate,jdbcType=TIMESTAMP},
       </if>
       <if test="updateBy != null" >
         update_by = #{updateBy,jdbcType=VARCHAR},
       </if>
       <if test="dateUpdate != null" >
-        date_update = #{dateUpdate,jdbcType=DATE},
-      </if>
-      <if test="rejectReason != null" >
-        reject_reason = #{rejectReason,jdbcType=VARCHAR},
+        date_update = #{dateUpdate,jdbcType=TIMESTAMP},
       </if>
       <if test="geo != null" >
         geo = #{geo,jdbcType=VARCHAR},
@@ -379,10 +369,10 @@
     set task_no = #{taskNo,jdbcType=VARCHAR},
       task_desc = #{taskDesc,jdbcType=VARCHAR},
       order_user_id = #{orderUserId,jdbcType=VARCHAR},
-      send_time = #{sendTime,jdbcType=DATE},
+      send_time = #{sendTime,jdbcType=TIMESTAMP},
       send_by = #{sendBy,jdbcType=VARCHAR},
-      plan_finish_date = #{planFinishDate,jdbcType=DATE},
-      finish_date = #{finishDate,jdbcType=DATE},
+      plan_finish_date = #{planFinishDate,jdbcType=TIMESTAMP},
+      finish_date = #{finishDate,jdbcType=TIMESTAMP},
       date_limit = #{dateLimit,jdbcType=VARCHAR},
       urgency = #{urgency,jdbcType=VARCHAR},
       address = #{address,jdbcType=VARCHAR},
@@ -402,10 +392,9 @@
       current_users = #{currentUsers,jdbcType=VARCHAR},
       current_task_name = #{currentTaskName,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
-      date_create = #{dateCreate,jdbcType=DATE},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
-      date_update = #{dateUpdate,jdbcType=DATE},
-      reject_reason = #{rejectReason,jdbcType=VARCHAR},
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP},
       geo = #{geo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>