新增task、order 目录

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

@@ -64,6 +64,8 @@ public class WorkOrderManage implements Serializable {
 
     private Date dateUpdate;
 
+    private String rejectReason;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -305,4 +307,12 @@ public class WorkOrderManage implements Serializable {
     public void setDateUpdate(Date dateUpdate) {
         this.dateUpdate = dateUpdate;
     }
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason == null ? null : rejectReason.trim();
+    }
 }

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

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import sun.plugin.dom.exception.PluginNotSupportedException;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @RestController
@@ -35,6 +36,7 @@ public class PlanManageController {
      * @param taskContent 巡检类容
      * @param taskAreaShape 巡检区域坐标
      * @param taskAreaName 巡检区域名称
+     * @param createBy 记录创建人
      * @return
      */
     @PostMapping("/plan/add")
@@ -47,7 +49,8 @@ public class PlanManageController {
                                            String planUserId,
                                            String taskContent,
                                            String taskAreaShape,
-                                           String taskAreaName
+                                           String taskAreaName,
+                                           String createBy
                                          ) {
         PlanManage record = new PlanManage();
         record.setUserId(userId);
@@ -60,6 +63,8 @@ public class PlanManageController {
         record.setTaskContent(taskContent);
         record.setTaskAreaShape(taskAreaShape);
         record.setTaskAreaName(taskAreaName);
+        record.setCreateBy(createBy);
+        record.setDateCreate(new Date());
         int rows = planManageService.insertSelective(record);
         if(rows > 0) {
             return new AjaxMessage(ResultStatus.OK);

operation_manager/src/main/resources/generator/generatorConfig.xml

@@ -59,7 +59,7 @@
         <!-- 列出要生成代码的所有表，这里配置的是不生成Example文件 -->
         <!-- schema即为数据库名 tableName为对应的数据库表 domainObjectName是要生成的实体类 enable*ByExample
                    是否生成 example类   -->
-        <table tableName="sc_work_flow_detail" domainObjectName="WorkFlowDetail"
+        <table tableName="sc_work_order_manage" domainObjectName="WorkOrderManage"
                enableCountByExample="false"
                enableUpdateByExample="false"
                enableDeleteByExample="false"

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

@@ -32,13 +32,14 @@
     <result column="date_create" property="dateCreate" jdbcType="DATE" />
     <result column="update_by" property="updateBy" jdbcType="VARCHAR" />
     <result column="date_update" property="dateUpdate" jdbcType="DATE" />
+    <result column="reject_reason" property="rejectReason" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, task_no, task_desc, order_user_id, send_time, send_by, plan_finish_date, finish_date, 
     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
+    create_by, date_create, update_by, date_update, reject_reason
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -60,8 +61,8 @@
       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
-      )
+      date_create, update_by, date_update, 
+      reject_reason)
     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}, 
@@ -71,8 +72,8 @@
       #{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}
-      )
+      #{dateCreate,jdbcType=DATE}, #{updateBy,jdbcType=VARCHAR}, #{dateUpdate,jdbcType=DATE}, 
+      #{rejectReason,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.huaxu.order.entity.WorkOrderManage" >
     insert into sc_work_order_manage
@@ -167,6 +168,9 @@
       <if test="dateUpdate != null" >
         date_update,
       </if>
+      <if test="rejectReason != null" >
+        reject_reason,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -259,6 +263,9 @@
       <if test="dateUpdate != null" >
         #{dateUpdate,jdbcType=DATE},
       </if>
+      <if test="rejectReason != null" >
+        #{rejectReason,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.huaxu.order.entity.WorkOrderManage" >
@@ -351,6 +358,9 @@
       <if test="dateUpdate != null" >
         date_update = #{dateUpdate,jdbcType=DATE},
       </if>
+      <if test="rejectReason != null" >
+        reject_reason = #{rejectReason,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -384,7 +394,8 @@
       create_by = #{createBy,jdbcType=VARCHAR},
       date_create = #{dateCreate,jdbcType=DATE},
       update_by = #{updateBy,jdbcType=VARCHAR},
-      date_update = #{dateUpdate,jdbcType=DATE}
+      date_update = #{dateUpdate,jdbcType=DATE},
+      reject_reason = #{rejectReason,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -53,6 +53,7 @@
     process_instance_id, process_def_id, current_task_id, current_users, current_task_name, 
     create_by, date_create, update_by, date_update
   </sql>
+
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
@@ -324,4 +325,11 @@
       date_update = #{dateUpdate,jdbcType=DATE}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectPlanTagId" resultType="java.lang.String" parameterType="java.lang.String" >
+    select plan_id
+    from sc_plan_manage
+    where plan_id like "%" || #{planId,jdbcType=VARCHAR} || "%" and rownum=1
+    order by plan_id desc
+  </select>
 </mapper>