wangbo 4 years ago
parent
commit
7976409baa

+ 10 - 2
operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -399,7 +399,8 @@ public class WorkOrderManageController {
             @ApiParam(value = "工单类型编号", required = true) @RequestParam(required = false) Integer orderTypeId,
             @ApiParam(value = "紧急程度", required = true) @RequestParam(required = true) String urgency,
             @ApiParam(value = "时限", required = true) @RequestParam(required = true) String dateLimit,
-            @ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId){
+            @ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId,
+            @ApiParam(value = "父单ID", required = false) @RequestParam(required = false) String orderPid){
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManage workOrderManage = workOrderManageService.selectByPrimaryKey(id);
         if(workOrderManage == null){
@@ -421,6 +422,9 @@ public class WorkOrderManageController {
         workOrderManage.setUrgency(urgency);//紧急程度
         workOrderManage.setOrderUserId(orderUserId);//接单人ID
         workOrderManage.setDateLimit(dateLimit);
+        if(workOrderManage.getOrderPid() != null) {
+            workOrderManage.setOrderPid(Integer.parseInt(orderPid));
+        }
         if(loginUser.getId() != null) {
             workOrderManage.setUpdateBy(String.valueOf(loginUser.getId()));
             workOrderManage.setSendBy(String.valueOf(loginUser.getId()));//派单人
@@ -454,7 +458,8 @@ public class WorkOrderManageController {
             @ApiParam(value = "工单类型名称", required = true) @RequestParam(required = true) String orderType,
             @ApiParam(value = "紧急程度", required = true) @RequestParam(required = true) String urgency,
             @ApiParam(value = "时限", required = true) @RequestParam(required = true) String dateLimit,
-            @ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId){
+            @ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId,
+            @ApiParam(value = "父单ID", required = false) @RequestParam(required = false) String orderPid){
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManage workOrderManage = workOrderManageService.selectByPrimaryKey(id);
 //        ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
@@ -490,6 +495,9 @@ public class WorkOrderManageController {
         workOrderManage.setUrgency(urgency);//紧急程度
         workOrderManage.setOrderUserId(orderUserId);//接单人ID
         workOrderManage.setDateLimit(dateLimit);
+        if(workOrderManage.getOrderPid() != null) {
+            workOrderManage.setOrderPid(Integer.parseInt(orderPid));
+        }
         if(loginUser.getId() != null) {
             workOrderManage.setUpdateBy(String.valueOf(loginUser.getId()));
             workOrderManage.setSendBy(String.valueOf(loginUser.getId()));//派单人

+ 0 - 1
operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -182,7 +182,6 @@ public class PlanManageController {
         return new AjaxMessage<>(ResultStatus.OK, result );
     }
 
-
     @GetMapping("/plan/submit")
     @ApiOperation(value = "提交巡检计划")
     public AjaxMessage submitPlan(

+ 4 - 4
operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -27,7 +27,7 @@
     <result column="date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
     <result column="company_org_id" property="compa=nyOrgId" jdbcType="VARCHAR" />
     <result column="department_org_id" property="departmentOrgId" jdbcType="VARCHAR" />
-    <result column="task_checked" property="taskChecked" jdbcType="VARCHAR" />
+    <result column="task_checked" property="taskChecked" jdbcType="LONGVARCHAR" />
     <result column="flow_detail" property="flowDetail" jdbcType="VARCHAR" />
   </resultMap>
 
@@ -267,7 +267,7 @@
         #{departmentOrgId,jdbcType=VARCHAR},
       </if>
       <if test="taskChecked != null" >
-        #{taskChecked,jdbcType=VARCHAR},
+        #{taskChecked,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
@@ -348,7 +348,7 @@
         department_org_id = #{departmentOrgId,jdbcType=VARCHAR},
       </if>
       <if test="taskChecked != null" >
-        task_checked = #{taskChecked,jdbcType=VARCHAR},
+        task_checked = #{taskChecked,jdbcType=LONGVARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -380,7 +380,7 @@
       date_update = #{dateUpdate,jdbcType=TIMESTAMP},
       company_org_id = #{companyOrgId,jdbcType=VARCHAR},
       department_org_id = #{departmentOrgId,jdbcType=VARCHAR},
-      task_checked = #{taskChecked,jdbcType=VARCHAR}
+      task_checked = #{taskChecked,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>