工单增加图片和视频字段

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -87,6 +87,10 @@ public enum ResultStatus {
     PRODUCT_DELETE_ERROR(500018,"该产品已经有设备安装，无法删除"),
     CUSTOMER_DELETE_ERROR(500019,"该客户已经有设备安装，无法删除"),
 
+    //600 运维模块
+    CHILD_ORDER_ING(600001,"子单未完成，不能提交"),
+    PARENT_ORDER_ING(600002,"父单未完成，不能提交"),
+
     //900 其他
     ERROR(900000, "失败"),
     APPLICATION_ERROR(900001, "应用异常"),

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

@@ -53,30 +53,20 @@ public class WorkOrderManageController {
     /**
      * 新增一条数据
      *
-     * @param workOrderManageDto 实体类
+     * @param workOrderManage 实体类
      * @return Response对象
      */
     @RequestMapping(value = "insert", method = RequestMethod.POST)
     @ApiOperation(value = "插入工单")
-    public AjaxMessage<Integer> insertSelective(@ApiParam(value = "工单信息", required = true) @RequestBody WorkOrderManageDto workOrderManageDto) {
+    public AjaxMessage<Integer> insertSelective(@ApiParam(value = "工单信息", required = true) @RequestBody WorkOrderManage workOrderManage) {
         LoginUser currentUser = UserUtil.getCurrentUser();
-        workOrderManageDto.setTenantId(currentUser.getTenantId());
-        workOrderManageDto.setCreateBy(currentUser.getUsername());
-        workOrderManageDto.setDateCreate(new Date());
-        workOrderManageDto.setOrderStatus(0);
-        workOrderManageDto.setTaskNo(DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)));
-        workOrderManageService.insertSelective(workOrderManageDto);
-        int result =workOrderManageDto.getId();//返回新增数据的id
-        if(workOrderManageDto.getEventType().equals(1)) {
-            //运维上报插入工单详情
-            WorkFlowDetail workFlowDetail=new WorkFlowDetail();
-            workFlowDetail.setFlowId(result);
-            workFlowDetail.setFlowType(2);
-            workFlowDetail.setFlowDetail(workOrderManageDto.getFlowDetail());
-            workFlowDetail.setCreateBy(currentUser.getUsername());
-            workFlowDetail.setDateCreate(new Date());
-            workFlowDetailService.insertSelective(workFlowDetail);
-        }
+        workOrderManage.setTenantId(currentUser.getTenantId());
+        workOrderManage.setCreateBy(currentUser.getUsername());
+        workOrderManage.setDateCreate(new Date());
+        workOrderManage.setOrderStatus(0);
+        workOrderManage.setTaskNo(DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)));
+        workOrderManageService.insertSelective(workOrderManage);
+        int result =workOrderManage.getId();//返回新增数据的id
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
     /**

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

@@ -98,6 +98,12 @@ public class WorkOrderManage implements Serializable {
     @ApiModelProperty(value = "经纬度")
     private String geo;
 
+    @ApiModelProperty(value = "视频地址，多个以逗号隔开")
+    private String videos;
+
+    @ApiModelProperty(value = "图片地址，多个以逗号隔开")
+    private String pictures;
+
     @ApiModelProperty(value = "创建人")
     private String createBy;
 

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

@@ -33,6 +33,8 @@
     <result column="update_by" property="updateBy" jdbcType="VARCHAR" />
     <result column="date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
     <result column="geo" property="geo" jdbcType="VARCHAR" />
+    <result column="videos" property="videos" jdbcType="VARCHAR" />
+    <result column="pictures" property="pictures" jdbcType="VARCHAR" />
     <result column="flow_detail" property="flowDetail" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
@@ -40,7 +42,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, geo
+    create_by, date_create, update_by, date_update, geo,videos,pictures
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -63,7 +65,7 @@
       process_instance_id, process_def_id, current_task_id, 
       current_users, current_task_name, create_by, 
       date_create, update_by, date_update, 
-      geo)
+      geo,videos,pictures)
     values (#{id,jdbcType=INTEGER}, #{taskNo,jdbcType=VARCHAR}, #{taskDesc,jdbcType=VARCHAR}, 
       #{orderUserId,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP}, #{sendBy,jdbcType=VARCHAR}, 
       #{planFinishDate,jdbcType=TIMESTAMP}, #{finishDate,jdbcType=TIMESTAMP}, #{dateLimit,jdbcType=VARCHAR}, 
@@ -74,7 +76,7 @@
       #{processInstanceId,jdbcType=VARCHAR}, #{processDefId,jdbcType=VARCHAR}, #{currentTaskId,jdbcType=VARCHAR}, 
       #{currentUsers,jdbcType=VARCHAR}, #{currentTaskName,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, 
       #{dateCreate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{dateUpdate,jdbcType=TIMESTAMP}, 
-      #{geo,jdbcType=VARCHAR})
+      #{geo,jdbcType=VARCHAR},#{videos,jdbcType=VARCHAR},#{pictures,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.huaxu.order.entity.WorkOrderManage" keyProperty="id" useGeneratedKeys="true">
     insert into sc_work_order_manage
@@ -172,6 +174,12 @@
       <if test="geo != null" >
         geo,
       </if>
+      <if test="videos != null" >
+        videos,
+      </if>
+      <if test="pictures != null" >
+        pictures,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -267,6 +275,12 @@
       <if test="geo != null" >
         #{geo,jdbcType=VARCHAR},
       </if>
+      <if test="videos != null" >
+        #{videos,jdbcType=VARCHAR},
+      </if>
+      <if test="pictures != null" >
+        #{pictures,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.huaxu.order.entity.WorkOrderManage" >
@@ -362,6 +376,12 @@
       <if test="geo != null" >
         geo = #{geo,jdbcType=VARCHAR},
       </if>
+      <if test="videos != null" >
+        videos=#{videos,jdbcType=VARCHAR},
+      </if>
+      <if test="pictures != null" >
+        pictures=#{pictures,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -396,7 +416,9 @@
       date_create = #{dateCreate,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       date_update = #{dateUpdate,jdbcType=TIMESTAMP},
-      geo = #{geo,jdbcType=VARCHAR}
+      geo = #{geo,jdbcType=VARCHAR},
+      videos = #{videos,jdbcType=VARCHAR},
+      pictures = #{pictures,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>