RequirementsInfoVO(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java

@@ -172,4 +172,10 @@ public class RequirementsInfoVO implements Serializable {
     @ApiModelProperty(value = "修改后url")
     private String afterModificationUrl;
 
+    @ApiModelProperty(value = "抢单者电话")
+    private String preemptPhone;
+
+    @ApiModelProperty(value = "抢单飞手用户id ")
+    private Integer pilotCertificationUserId;
+
 }

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java

@@ -164,6 +164,9 @@ public class RequirementsInfoDO implements Serializable {
     @ApiModelProperty(value = "修改后url")
     private String afterModificationUrl;
 
+    @ApiModelProperty(value = "抢单者电话")
+    private String preemptPhone;
+
     public RequirementsInfoVO buildRequirementsInfoVO() {
         return RequirementsInfoVO.builder().id(this.id).requirementTypeId(this.requirementTypeId).userAccountId(this.userAccountId).publishName(this.publishName)
                 .publishPhone(this.publishPhone).requireDescription(this.requireDescription).solved(this.solved).taskStartTime(this.taskStartTime).taskEndTime(this.taskEndTime)
@@ -192,6 +195,8 @@ public class RequirementsInfoDO implements Serializable {
                 .url(this.url)
                 .afterModificationReason(this.afterModificationReason)
                 .afterModificationUrl(this.afterModificationUrl)
+                .pilotCertificationUserId(this.pilotCertificationUserId)
+                .preemptPhone(this.preemptPhone)
                 .build();
 
     }

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

@@ -23,7 +23,7 @@
         FROM
         requirements_info ri
         LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
-        LEFT JOIN requirements_service rs ON rs.requirements_info_id = ra.id
+        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

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

@@ -381,7 +381,7 @@
                ri.require_description,
                ri.requirement_type_id,
                ri.user_account_id,
-               rt.type_name AS requirementTypeName,
+               rt.type_name                   AS requirementTypeName,
                ri.publish_phone,
                ri.publisher_number,
                ri.service_id,
@@ -398,12 +398,16 @@
                ra.reason,
                ra.url,
                ra.order_level,
-               rau.reason   AS afterModificationReason,
-               rau.url      AS afterModificationUrl
+               rau.reason                     AS afterModificationReason,
+               rau.url                        AS afterModificationUrl,
+               rs.pilot_certification_user_id AS pilotCertificationUserId,
+               rs.preempt_phone               AS preemptPhone
         FROM requirements_info ri
-                 LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
+                 LEFT JOIN requirements_type rt
+                           ON rt.id = ri.requirement_type_id
                  LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
                  LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
+                 LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
             AND ra.user_account_id = ri.user_account_id
         WHERE ri.id = #{id}