Pilot(add)

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

@@ -93,5 +93,10 @@ public class PilotCertificationDTO {
     private Integer sex;
     @ApiModelProperty(value = "申请用户的年龄", example = "1")
     private Integer age;
+    /**
+     * 申请飞手的手机号
+     */
+    @ApiModelProperty(value = "申请飞手的手机号", example = "18921312312")
+    private String phoneNum;
 
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/dronepilot/PilotCertificationController.java

@@ -60,10 +60,10 @@ public class PilotCertificationController extends BaseController {
 
     @ApiOperation(value = "小程序——列表————飞手执照及能力认证")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = PilotCertificationDTO.class)})
-    @PostMapping("/listPilot")
+    @PostMapping("/appListPilot")
     public ResultBody<PilotCertificationDTO> pilotList(HttpServletRequest request,
                                                        @Validated(value = {Page.class}) @ApiParam(value = "飞手查询", required = true) @RequestBody PilotCertificationQO param) {
-        return ResultBody.success(certificationService.pilotList(param, this.getUserLoginInfoFromRedis(request)));
+        return ResultBody.success(certificationService.pilotList(param));
     }
 
     @ApiOperation(value = "小程序——详情————飞手执照及能力认证")

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

@@ -101,6 +101,11 @@ public class PilotCertificationDO {
 
     private Integer age;
 
+    /**
+     * 申请飞手的手机号
+     */
+    private String phoneNum;
+
 
     public PilotCertificationDO(PilotCertificationVO pilotCertificationVO, Integer userAccountId) {
         this.id = pilotCertificationVO.getId();
@@ -140,6 +145,7 @@ public class PilotCertificationDO {
                 .userName(this.userName)
                 .age(this.age)
                 .sex(this.sex)
+                .phoneNum(this.getPhoneNum())
                 .build();
     }
 

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

@@ -68,7 +68,7 @@ public class PilotCertificationLogDO {
                 .userName(this.userName)
                 .phoneNum(this.phoneNum)
                 .operatorUserAccount(this.operatorUserAccount)
-                .operatorUserName(this.operatorUserAccount)
+                .operatorUserName(this.operatorUserName)
                 .createTime(this.createTime)
                 .updateTime(this.updateTime)
                 .build();

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

@@ -25,7 +25,7 @@ public interface PilotCertificationService {
     ResultBody updatePilot(PilotCertificationVO certificationVO, LoginSuccessDTO userLoginInfoFromRedis);
 
 
-    PageResult pilotList(PilotCertificationQO param, LoginSuccessDTO userLoginInfoFromRedis);
+    PageResult pilotList(PilotCertificationQO param);
 
     PilotCertificationDTO detailPilot(Integer id);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java

@@ -102,7 +102,7 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
     }
 
     @Override
-    public PageResult pilotList(PilotCertificationQO param, LoginSuccessDTO userLoginInfoFromRedis) {
+    public PageResult pilotList(PilotCertificationQO param) {
         Integer pageNo = param.getPageNo();
         param.buildCurrentPage();
         List<PilotCertificationDO> pilotList = certificationDao.pilotList(param);

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

@@ -23,6 +23,7 @@
         <result property="userName" column="user_name"/>
         <result property="birthday" column="birthday"/>
         <result property="sex" column="sex"/>
+        <result property="phoneNum" column="phone_num"/>
         <collection property="pilotAbility" ofType="com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO"
                     select="selectAbilityList"
                     column="{pilotCertificationId=id}">
@@ -198,10 +199,12 @@
                pc.update_time,
                rna.user_name,
                rna.birthday,
-               rna.sex
+               rna.sex,
+               ua.phone_num
         FROM pilot_certification pc
                  LEFT JOIN real_name_auth rna ON pc.user_account_id = rna.user_account_id
-        where pc.id = #{id}
+                 LEFT JOIN user_account ua ON pc.user_account_id = ua.id
+        WHERE pc.id = #{id}
     </select>
 
     <update id="updateRemark" parameterType="com.mmc.iuav.user.model.qo.dronepilot.PilotRemarkQO">

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -24,5 +24,6 @@ data-filter:
     - /userapp/cooperation/service/bitmap
     - /userapp/cooperation/appBrandList
     - /userapp/cooperation/appBrandMessage
-    - /userapp/pilot/listPilot
     - /userapp/pilot/detailPilot
+    - /userapp/pilot/appListPilot
+