refact(注册开通)：流程调整

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -33,11 +33,6 @@ public class BaseController {
      * 监管/行政审批局
      */
     public static final String COMPANY_TYPE_SUPERVISION = "supervision";
-    /**
-     * 企业
-     */
-    public static final String COMPANY_TYPE_COMPANY = "company";
-
 
     /**
      * 获取token
@@ -47,6 +42,11 @@ public class BaseController {
     }
 
     /**
+     * 企业
+     */
+    public static final String COMPANY_TYPE_COMPANY = "company";
+
+    /**
      * 用户选择信心redis获取
      **/
     protected ReginParams getSelectedOrgInfo() {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -165,4 +165,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "质量保证体系(请上传符合要求的自我声明)")
     private JSONArray quaSystemCert;
+
+    @ApiModelProperty(value = "登录单位类型")
+    private String companyLevel;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.BaseEnterpriseCertDto;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionCompanyPublicityDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
@@ -134,7 +135,7 @@ public class JyjcOpeningApplicationController extends BaseController {
     @GetMapping(value = "/detail")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
     public ResponseModel<JyjcOpeningApplicationModel> selectOne(@RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr));
+        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr, getSelectedOrgInfo().getCompany()));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonServiceImpl.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -335,4 +337,16 @@ public class CommonServiceImpl {
         }) : "";
     }
 
+
+    public static String getCompanyLevel(CompanyBo company) {
+        String companyLevel = "";
+        if (company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
+            companyLevel = BaseController.COMPANY_TYPE_COMPANY;
+        } else {
+            companyLevel = BaseController.COMPANY_TYPE_SUPERVISION;
+        }
+        return companyLevel;
+    }
+
+
 }