Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/AuditSumVO.java

+package com.mmc.iuav.user.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author 张培
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AuditSumVO implements Serializable{
+    @ApiModelProperty(value = "审核失败总数")
+    Integer failAuditSum;
+    @ApiModelProperty(value = "审核成功总数")
+    Integer passAuditSum;
+    @ApiModelProperty(value = "未审核总数")
+    Integer unAuditedSum;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/PilotAuditSumVO.java

+package com.mmc.iuav.user.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author 张培
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PilotAuditSumVO implements Serializable  {
+    @ApiModelProperty(value = "飞手审核未通过总数")
+    Integer failPilotAuditSum;
+    @ApiModelProperty(value = "飞手审核通过总数")
+    Integer passPilotAuditSum;
+    @ApiModelProperty(value = "飞手未审核总数")
+    Integer unAuditedPilotSum;
+}

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

@@ -72,6 +72,14 @@ public class CooperationController extends BaseController {
         return ResultBody.success(cooperationService.listUserApplyTag(applyQO));
     }
 
+    @ApiOperation(value = "后台-获取审核总数")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AuditSumVO.class)})
+    @GetMapping("getAuditSum")
+    public ResultBody<AuditSumVO> getAuditSum() {
+        return cooperationService.getAuditSum();
+    }
+
+
     @ApiOperation(value = "后台-编辑服务商信息")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("editUserApplyTag")

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

@@ -11,6 +11,7 @@ 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;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotRemarkQO;
+import com.mmc.iuav.user.model.vo.PilotAuditSumVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
 import com.mmc.iuav.user.service.dronepilot.PilotCertificationService;
 import io.swagger.annotations.*;
@@ -93,6 +94,14 @@ public class PilotCertificationController extends BaseController {
         return ResultBody.success(certificationService.backListPilot(param, this.getUserLoginInfoFromRedis(request)));
     }
 
+    @ApiOperation(value = "后台管理——统计————飞手审核各个状态总数")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = PilotAuditSumVO.class)})
+    @GetMapping("/getPilotAuditSum")
+    public ResultBody getPilotAuditSumVO() {
+        return certificationService.getPilotAuditSum();
+    }
+
+
 
     @ApiOperation(value = "后台管理——审批不通过原因————飞手执照及能力认证")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = PilotCertificationDTO.class)})

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

@@ -85,6 +85,10 @@ public interface CooperationDao {
 
     List<UserApplyTagDO> listUserApplyTag(ApplyQO applyQO);
 
+
+    Integer getAuditSum(Integer status);
+
+
     void deleteApplyTag(Integer id);
 
     List<TagApplyResourceDO> getUserApplyResource(Integer id);

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

@@ -41,6 +41,8 @@ public interface PilotCertificationDao {
 
     List<PilotCertificationDO> pilotList(PilotCertificationQO param);
 
+    Integer getPilotAuditSum(Integer status);
+
     List<PilotAbilityVO> selectAbilityList(Integer pilotCertificationId);
 
     PilotCertificationDO detailPilot(Integer id);

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

@@ -47,6 +47,8 @@ public interface CooperationService {
 
     PageResult listUserApplyTag(ApplyQO applyQO);
 
+    ResultBody getAuditSum();
+
     ResultBody deleteApplyTag(Integer id);
 
     ResultBody applyTagDetails(Integer id, Integer userAccountId);

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

@@ -35,7 +35,7 @@ public interface PilotCertificationService {
 
     PageResult backListPilot(PilotCertificationQO param, LoginSuccessDTO userLoginInfoFromRedis);
 
-
+    ResultBody getPilotAuditSum();
     ResultBody updateRemark(PilotRemarkQO param, LoginSuccessDTO userLoginInfoFromRedis);
 
     ResultBody updateAuditStatus(PilotAuditStatusQO param, LoginSuccessDTO userLoginInfoFromRedis);

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

@@ -24,6 +24,7 @@ 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;
 import com.mmc.iuav.user.model.qo.dronepilot.PilotRemarkQO;
+import com.mmc.iuav.user.model.vo.PilotAuditSumVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
 import com.mmc.iuav.user.model.vo.userpoints.UserPointsVO;
@@ -245,6 +246,15 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         return pageResult;
     }
 
+    @Override
+    public ResultBody getPilotAuditSum() {
+        PilotAuditSumVO pilotAuditSumVO = new PilotAuditSumVO();
+        pilotAuditSumVO.setFailPilotAuditSum(certificationDao.getPilotAuditSum(2));
+        pilotAuditSumVO.setPassPilotAuditSum(certificationDao.getPilotAuditSum(1));
+        pilotAuditSumVO.setUnAuditedPilotSum(certificationDao.getPilotAuditSum(0));
+        return ResultBody.success(pilotAuditSumVO);
+    }
+
 
     @Override
     public ResultBody<PilotReasonDTO> backListReason() {

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

@@ -142,6 +142,15 @@ public class CooperationServiceImpl implements CooperationService {
     }
 
     @Override
+    public ResultBody getAuditSum() {
+        AuditSumVO auditSumVO = new AuditSumVO();
+        auditSumVO.setFailAuditSum(cooperationDao.getAuditSum(2));
+        auditSumVO.setPassAuditSum(cooperationDao.getAuditSum(1));
+        auditSumVO.setUnAuditedSum(cooperationDao.getAuditSum(0));
+        return ResultBody.success(auditSumVO);
+    }
+
+    @Override
     public ResultBody deleteApplyTag(Integer id) {
         UserApplyTagDO userApplyTag = cooperationDao.getUserApplyTag(id);
         if (userApplyTag.getApplyStatus().equals(1)) {

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

@@ -254,7 +254,9 @@ public class UserAccountServiceImpl implements UserAccountService {
             realNameextracted(id);
         }
         // 奖励邀请人
-        activityService.participateActivity(0, rcdUserId, id);
+        if (rcdUserId != null) {
+            activityService.participateActivity(0, rcdUserId, id);
+        }
         return ResultBody.success();
     }
 

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

@@ -262,6 +262,15 @@
         order by ua.create_time desc
         limit #{pageNo},#{pageSize}
     </select>
+    <select id="getAuditSum" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM
+        user_apply_tag ua
+        INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
+        INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
+        INNER JOIN company_info ci ON cm.company_info_id = ci.id
+        where ua.is_deleted = 0 and ua.apply_status = #{status}
+    </select>
     <select id="getUserApplyResource" resultType="com.mmc.iuav.user.entity.TagApplyResourceDO">
         SELECT user_apply_tag_id,
                url,

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

@@ -189,6 +189,19 @@
         order by pc.update_time desc, pc.create_time desc
     </select>
 
+    <select id="getPilotAuditSum" resultType="java.lang.Integer">
+        SELECT count(pc.id)
+        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
+            1 = 1
+          AND ua.`disable` = 0
+          AND rna.is_deleted =0
+        AND pc.audit_status = #{status}
+    </select>
 
     <select id="detailPilot" resultMap="pilotList">
         SELECT pc.id,

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/cms
-  newTag: cef2a5b7c70595d4ed54105a080d5eef44541bfa
+  newTag: ece705d2213818f5dc95d4c035aedb0015e1b0ce