Merge branch 'develop'

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

 package com.mmc.csf.infomation.qo;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author 张培
  */
@@ -16,9 +17,10 @@ public class AgreeOrRefusePilotQO {
     @ApiModelProperty(value = "订单id")
     private Integer requireInfoId;
 
-    @ApiModelProperty(value = "同意传2 进入飞手到达现场 拒绝传 11")
+    @ApiModelProperty(value = "同意传2 进入飞手到达现场 拒绝传 1")
     private Integer serviceFlowId;
 
-    @ApiModelProperty(value = "接单飞手的user_id")
+    @ApiModelProperty(value = "接单飞手的user_id",required = true)
+    @NotNull(message = "飞手id不能为空")
     private Integer pilotCertificationUserId;
 }

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;

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 792be286e4ea95239926a7ae46cf1fbe26e7013e
+  newTag: 7a346eaef065e16de76ff3753787f18b5ab66be8

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -366,7 +366,7 @@ public class RequirementsController extends BaseController {
     @ApiOperation(value = "小程序—发单方(同意/拒绝)该飞手")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("agreeOrRefusePilot")
-    public ResultBody agreeOrRefusePilot(@RequestBody AgreeOrRefusePilotQO param) {
+    public ResultBody agreeOrRefusePilot(@Validated @RequestBody AgreeOrRefusePilotQO param) {
         return requirementsService.agreeOrRefusePilot(param);
     }
 }
\ No newline at end of file

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

@@ -78,9 +78,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>
@@ -107,9 +115,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>

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

@@ -710,7 +710,7 @@
         LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
         WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
         <if test=" requirementsInfoId != null  ">
-            and ri.id=#{requirementsInfoId}
+            and ri.father_require_id=#{requirementsInfoId}
         </if>
         <if test="requireDescription!=null and requireDescription!='' ">
             and  ri.require_description like CONCAT("%",#{requireDescription},"%")
@@ -747,13 +747,16 @@
         ri.publish,
         ri.require_num,
         rau.update_order_amount,
-        ri.repertory
+        ri.repertory,
+        rs.pilot_certification_id,
+        rs.pilot_certification_user_id
         FROM
         requirements_info ri
         LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
         LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
         LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
         LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
+        left join requirements_service rs on ri.id = rs.requirements_info_id
         WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
         and father_require_id = 0
         <if test=" requirementsInfoId != null  ">
@@ -1355,7 +1358,7 @@
 
     <select id="serviceAgreePilotOrderDTO" resultMap="serviceAgreePilotOrderMap">
             select require_info_id,create_time,service_flow_id from agree_pilot_order
-            where service_flow_id = 2 and require_info_id = #{requirementsInfoId}
+            where service_flow_id = 2 and require_info_id = #{requirementsInfoId} limit 1
     </select>
 
     <select id="serviceFulfilATaskDTO" resultMap="serviceFulfilATaskMap">