PilotCertificationService(add)

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

+package com.mmc.iuav.user.model.dto.dronepilot;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author small
+ * @Date 2023/8/18 16:01
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PilotCertificationInteriorDTO {
+
+    @ApiModelProperty(value = "飞手执照id", example = "1")
+    @NotNull(message = "飞手执照id不能为空")
+    private Integer id;
+
+    @ApiModelProperty(value = "申请飞手用户的id", example = "1")
+    private Integer userAccountId;
+
+}

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

@@ -6,10 +6,7 @@ import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.controller.BaseController;
 import com.mmc.iuav.user.model.dto.RoleInfoDTO;
-import com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO;
-import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO;
-import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationLogDTO;
-import com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO;
+import com.mmc.iuav.user.model.dto.dronepilot.*;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO;
@@ -132,4 +129,12 @@ public class PilotCertificationController extends BaseController {
     }
 
 
+    @ApiOperation(value = "后台内部调用——详情————飞手执照及能力认证")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = PilotCertificationDTO.class)})
+    @GetMapping("/interiorDetailPilot")
+    public PilotCertificationInteriorDTO interiorDetailPilot(@RequestParam(value = "userAccountId", required = true) Integer userAccountId) {
+        return certificationService.interiorDetailPilot(userAccountId);
+    }
+
+
 }

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

@@ -47,6 +47,8 @@ public interface PilotCertificationDao {
 
     PilotCertificationDO userDetailPilot(Integer userAccountId);
 
+    PilotCertificationDO interiorDetailPilot(Integer userAccountId);
+
     void updateRemark(PilotRemarkQO param);
 
     void updateAuditStatus(PilotAuditStatusQO param);
@@ -60,4 +62,5 @@ public interface PilotCertificationDao {
     PilotReasonDO selectPilotReason(String reasonId);
 
     int selectFirstApprove(Integer id);
+
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.annotation.JSONField;
 import com.mmc.iuav.group.Create;
 import com.mmc.iuav.group.Update;
 import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO;
+import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationInteriorDTO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
 import io.swagger.annotations.ApiModelProperty;
@@ -159,4 +160,12 @@ public class PilotCertificationDO {
                 .build();
     }
 
+
+    public PilotCertificationInteriorDTO buildInterior() {
+        return PilotCertificationInteriorDTO.builder()
+                .id(this.id)
+                .userAccountId(this.userAccountId)
+                .build();
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO;
 import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO;
+import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationInteriorDTO;
 import com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO;
@@ -42,4 +43,6 @@ public interface PilotCertificationService {
     PageResult backPilotLogList(PilotCertificationLogQO param, LoginSuccessDTO userLoginInfoFromRedis);
 
     ResultBody<PilotReasonDTO> backListReason();
+
+    PilotCertificationInteriorDTO interiorDetailPilot(Integer userAccountId);
 }

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

@@ -18,10 +18,7 @@ import com.mmc.iuav.user.entity.dronepilot.*;
 import com.mmc.iuav.user.entity.userpoints.UserPointsDO;
 import com.mmc.iuav.user.entity.userpoints.UserPointsDetails;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
-import com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO;
-import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO;
-import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationLogDTO;
-import com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO;
+import com.mmc.iuav.user.model.dto.dronepilot.*;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO;
@@ -241,9 +238,10 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         if (param.getAuditStatus() == 1) {
             param.setIsFirstApprove(1);
         }
-        if (param.getAuditStatus()==2 && i==0){
+        if (param.getAuditStatus() == 2 && i == 0) {
             param.setIsFirstApprove(0);
-        }if(param.getAuditStatus()==2 && i ==1){
+        }
+        if (param.getAuditStatus() == 2 && i == 1) {
             param.setIsFirstApprove(1);
         }
     }
@@ -474,5 +472,21 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         return age;
     }
 
+    @Override
+    public PilotCertificationInteriorDTO interiorDetailPilot(Integer userAccountId) {
+        PilotCertificationDO certificationDO = certificationDao.interiorDetailPilot(userAccountId);
+        if (certificationDO == null) {
+            return null;
+        }
+        int yearsOfWorking = 0;
+        yearsOfWorking = getYearsOfWorking(certificationDO.getTimeOfApplication());
+        Integer Working = certificationDO.getYearsOfWorking();
+        yearsOfWorking = yearsOfWorking + Working;
+        certificationDO.setYearsOfWorking(yearsOfWorking);
+
+        certificationDO.setAge(getAgeByBirth(certificationDO.getBirthday()));
+        PilotCertificationInteriorDTO pilotCertificationInteriorDTO = certificationDO.buildInterior();
+        return pilotCertificationInteriorDTO;
+    }
 
 }

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

@@ -251,6 +251,39 @@
     </select>
 
 
+    <select id="interiorDetailPilot" resultMap="pilotList">
+        SELECT pc.id,
+               pc.license_type,
+               pc.license_number,
+               pc.license_url,
+               pc.area_number,
+               pc.years_of_working,
+               pc.ability_url,
+               pc.individual_resume,
+               pc.audit_status,
+               pc.user_account_id,
+               pc.time_of_application,
+               pc.remark,
+               pc.resident_city,
+               pc.create_time,
+               pc.update_time,
+               rna.user_name,
+               rna.birthday,
+               rna.sex,
+               ua.phone_num,
+               pc.reason_id,
+               pr.reason,
+               ua.user_img
+        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.user_account_id = #{userAccountId}
+          and ua.`disable` = 0
+          and pc.audit_status = 1
+    </select>
+
+
     <update id="updateRemark" parameterType="com.mmc.iuav.user.model.qo.dronepilot.PilotRemarkQO">
         UPDATE pilot_certification
         <set>