飞手团队可以查看飞手接的订单和飞手发的订单

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/ServiceOrderQO.java

@@ -41,6 +41,9 @@ public class ServiceOrderQO {
     @Min(value = 1, groups = Page.class)
     private Integer pageSize;
 
+    @ApiModelProperty(value = "0 查看飞手团队中飞手发的单子，1 查找的是飞手团队中飞手接的订单")
+    private int  isPilotOrder;
+
     @ApiModelProperty(value = "查询指定飞手列表中飞手的订单")
     @JsonIgnore
     private List<Integer> pilotUserIdList = null;

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

@@ -77,9 +77,17 @@
         LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE
         ri.publish =1 and ri.father_require_id = 0
-        <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and !pilotUserIdList.isEmpty()" />
+        <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and !pilotUserIdList.isEmpty()"/>
         <if test="isPilotUserIdListEmpty">
-            AND ri.user_account_id IN
+            AND
+            <choose>
+                <when test="isPilotOrder == 0">
+                    ri.user_account_id IN
+                </when>
+                <when test="isPilotOrder == 1">
+                    rs.pilot_certification_user_id IN
+                </when>
+            </choose>
             <foreach item="item" collection="pilotUserIdList" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -106,9 +114,18 @@
         LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
         LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE
-        ri.publish =1
-        <if test="pilotUserIdList != null">
-            AND ri.user_account_id IN
+        ri.publish =1 and ri.father_require_id = 0
+        <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and !pilotUserIdList.isEmpty()"/>
+        <if test="isPilotUserIdListEmpty">
+            AND
+            <choose>
+                <when test="isPilotOrder == 0">
+                    ri.user_account_id IN
+                </when>
+                <when test="isPilotOrder == 1">
+                    rs.pilot_certification_user_id IN
+                </when>
+            </choose>
             <foreach item="item" collection="pilotUserIdList" open="(" separator="," close=")">
                 #{item}
             </foreach>