app接口完善

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/CompanyAttestationController.java

@@ -43,6 +43,17 @@ public class CompanyAttestationController {
         return companyAttestationService.applyAudit(companyAttestationRequest);
     }
 
+    /**
+     * @param
+     * @return
+     * @description 认证结果
+     * @date 2020-01-07 20:44
+     */
+    @RequestMapping("/auditResult")
+    public RestResponse auditResult(@RequestBody CompanyAttestationRequest companyAttestationRequest) {
+        return companyAttestationService.getAuditResult(companyAttestationRequest);
+    }
+
     /**
      * @param companyAttestationRequest id:认证信息id，mtCompanyId:企业id
      * @return

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/MaintenanceCompany.java

@@ -207,6 +207,12 @@ public class MaintenanceCompany implements Serializable {
     @TableField(exist = false)
     private Integer userNum;
 
+    /**
+     * 是否当前团队 true表示是当前团队 false表示不是
+     */
+    @TableField(exist = false)
+    private boolean isCurrentTeamFlag;
+
     public MaintenanceCompany() {
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/IMtCompanyAttestationService.java

@@ -47,4 +47,12 @@ public interface IMtCompanyAttestationService extends IService<MtCompanyAttestat
      * @return
      */
     RestResponse applyList(CompanyAttestationRequest companyAttestationRequest);
+
+    /**
+     * @description 获取认证信息结果
+     * @date 2020-01-07 19:35
+     * @param
+     * @return
+     */
+    RestResponse getAuditResult(CompanyAttestationRequest companyAttestationRequest);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -138,6 +138,11 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             List<MaintenanceCompany> maintenanceCompanyList = (List<MaintenanceCompany>) this.listByIds(companyIdList);
             //设置维保公司人数
             setCompanyUserNum(maintenanceCompanyList);
+            for(MaintenanceCompany maintenanceCompany : maintenanceCompanyList) {
+                if(maintenanceCompany.getId() == maintenanceCompanyRequest.getCompanyId()) {
+                    maintenanceCompany.setCurrentTeamFlag(true);
+                }
+            }
             return RestResponse.success(maintenanceCompanyList, ApiConstants.RESULT_SUCCESS, "获取用户所在团队列表成功");
         }
         return RestResponse.success(null, ApiConstants.RESULT_NO_DATA, "用户还未加入任何团队");

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MtCompanyAttestationServiceImpl.java

@@ -91,6 +91,9 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
 
         //获取公司信息，将公司信息设置为审核中状态
         MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(companyAttestationRequest.getMtCompanyId());
+        if(maintenanceCompany == null){
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "团队不存在不能发起认证");
+        }
         maintenanceCompany.setIsCertificated(ApiConstants.CompanyConstants.MAINTENANCE_WAIT_CERTIFICATE);
         //设置公司审核信息为审核中
         mtCompanyAttestation.setIsCertificated(ApiConstants.CompanyConstants.MAINTENANCE_WAIT_CERTIFICATE);
@@ -220,6 +223,15 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
         return RestResponse.success(applyPageResponse, ApiConstants.RESULT_SUCCESS, "获取公司申请信息成功");
     }
 
+    @Override
+    public RestResponse getAuditResult(CompanyAttestationRequest companyAttestationRequest) {
+        //获取团队审核信息
+        MtCompanyAttestation mtCompanyAttestation = this.getOne(new QueryWrapper<MtCompanyAttestation>()
+                .eq("mt_company_id", companyAttestationRequest.getMtCompanyId())
+        );
+        return RestResponse.success(mtCompanyAttestation, ApiConstants.RESULT_SUCCESS, "获取申请信息成功");
+    }
+
     /**
      * @param
      * @return

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/PropertyUserController.java

@@ -39,7 +39,7 @@ public class PropertyUserController {
      * @date 2020-01-06 16:45
      */
     @PostMapping("/cancelPermission")
-    public RestResponse cancelPermission(PropertyUserRequest propertyUserRequest) {
+    public RestResponse cancelPermission(@RequestBody PropertyUserRequest propertyUserRequest) {
         return propertyUserService.cancelPermission(propertyUserRequest);
     }
 }