PilotCertificationDO(update)

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/dronepilot/PilotCertificationDTO.java

@@ -98,5 +98,9 @@ public class PilotCertificationDTO {
      */
     @ApiModelProperty(value = "申请飞手的手机号", example = "18921312312")
     private String phoneNum;
+    @ApiModelProperty(value = "审批不通过原因id", example = "1")
+    private Integer reasonId;
+    @ApiModelProperty(value = "审批不通过的原因", example = "1")
+    private String reason;
 
 }

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/dronepilot/PilotAuditStatusQO.java

@@ -28,7 +28,7 @@ public class PilotAuditStatusQO {
 
 
     @ApiModelProperty(value = "2不通过的原因", required = false, example = "信息不完善")
-    private String reason;
+    private String reasonId;
 
     @ApiModelProperty(value = "审批人", required = false, example = "信息不完善", hidden = true)
     private Integer operatorUserId;

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/dronepilot/PilotCertificationDO.java

@@ -101,6 +101,10 @@ public class PilotCertificationDO {
 
     private Integer age;
 
+    private Integer reasonId;
+
+    private String reason;
+
     /**
      * 申请飞手的手机号
      */
@@ -146,6 +150,8 @@ public class PilotCertificationDO {
                 .age(this.age)
                 .sex(this.sex)
                 .phoneNum(this.getPhoneNum())
+                .reasonId(this.reasonId)
+                .reason(this.reason)
                 .build();
     }
 

csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml

@@ -24,6 +24,8 @@
         <result property="birthday" column="birthday"/>
         <result property="sex" column="sex"/>
         <result property="phoneNum" column="phone_num"/>
+        <result property="reasonId" column="reason_id"/>
+        <result property="reason" column="reason"/>
         <collection property="pilotAbility" ofType="com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO"
                     select="selectAbilityList"
                     column="{pilotCertificationId=id}">
@@ -152,12 +154,15 @@
         pc.update_time,
         rna.user_name,
         rna.birthday,
-        rna.sex ,
-        ua.phone_num
+        rna.sex,
+        ua.phone_num,
+        pc.reason_id,
+        pr.reason
         FROM
         pilot_certification pc
         LEFT JOIN real_name_auth rna ON pc.user_account_id = rna.user_account_id
-        left join user_account ua on pc.user_account_id=ua.id
+        LEFT JOIN user_account ua ON pc.user_account_id = ua.id
+        LEFT JOIN pilot_reason pr ON pc.reason_id = pr.id
         WHERE
         1 =1
         <if test=" areaNumber != null and areaNumber != '' ">
@@ -200,10 +205,13 @@
                rna.user_name,
                rna.birthday,
                rna.sex,
-               ua.phone_num
+               ua.phone_num,
+               pc.reason_id,
+               pr.reason
         FROM pilot_certification pc
                  LEFT JOIN real_name_auth rna ON pc.user_account_id = rna.user_account_id
                  LEFT JOIN user_account ua ON pc.user_account_id = ua.id
+                 LEFT JOIN pilot_reason pr ON pr.id = pc.reason_id
         WHERE pc.id = #{id}
     </select>
 
@@ -226,10 +234,13 @@
                rna.user_name,
                rna.birthday,
                rna.sex,
-               ua.phone_num
+               ua.phone_num,
+               pc.reason_id,
+               pr.reason
         FROM pilot_certification pc
                  LEFT JOIN real_name_auth rna ON pc.user_account_id = rna.user_account_id
                  LEFT JOIN user_account ua ON pc.user_account_id = ua.id
+                 LEFT JOIN pilot_reason pr ON pc.reason_id = pr.id
         WHERE pc.user_account_id = #{userAccountId}
     </select>
 
@@ -247,7 +258,7 @@
         UPDATE pilot_certification
         <set>
             audit_status = #{auditStatus},
-            reason=#{reason},
+            reason_id=#{reasonId},
             operator_user_id=#{operatorUserId},
             update_time=NOW()
         </set>