增加显示订单父订单

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/FlowDictionaryAndTimeDTO.java

@@ -27,6 +27,8 @@ public class FlowDictionaryAndTimeDTO implements Serializable {
     @ApiModelProperty(value = "抢单", example = "抢单")
     private RequirementsServiceDTO requirementsServiceDTO;
 
+    @ApiModelProperty(value = "需求方同意", example = "需求方同意")
+    private AgreePilotOrderDTO agreePilotOrderDTO;
     //抵达现场地址
     // service_arrive_scene
     @ApiModelProperty(value = "抵达现场", example = "抵达现场")

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -2826,6 +2826,9 @@ public class RequirementsServiceImpl implements RequirementsService {
 
         //这是这个订单所需要的总人数
         Integer requireNum = grabTheOrderVO.getRequireNum();
+        if(requireNum == null || grabTheOrderVO.getRequirementsInfoId() == null){
+            return ResultBody.error("参数不全");
+        }
 
         Integer fatherRequireId = null,fatherRepertory=null;
         //requireNum >= 2就说明这个订单是分开的有子订单

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -1638,7 +1638,8 @@
         sf.flyer_port,
         sf.order_status,
         ri.publish,
-        rau.update_order_amount
+        rau.update_order_amount,
+        ri.father_require_id
         FROM
         requirements_info ri
         LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id