فهرست منبع

修改详情查询

yuejiaying 4 سال پیش
والد
کامیت
c692759e16

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

@@ -187,7 +187,7 @@ public class WorkOrderManageController {
             workFlowLog.setTaskId(plan.getCurrentTaskId());
 
             if(action!=null){
-                List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,plan.getCurrentTaskId(), null, null);
+                List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,plan.getCurrentTaskId(), args, 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);
@@ -234,7 +234,7 @@ public class WorkOrderManageController {
             }
 
             if(action!=null){
-                List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,order.getCurrentTaskId(), null, null);
+                List<TaskPorcessResult> handleResult = workFlowService.handleTask(action,order.getCurrentTaskId(), args, 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);

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

@@ -477,7 +477,7 @@
   <select id="selectPlanDetail" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select t1.*,t2.flow_detail
     from sc_plan_manage t1
-    left join sc_work_flow_detail t2 on t1.INTEGERid=t2.flow_id and t2.flow_type=1
+    left join sc_work_flow_detail t2 on t1.id=t2.flow_id and t2.flow_type=1
     where t1.id = #{id,jdbcType=INTEGER}
   </select>