xuefy преди 3 години
родител
ревизия
da09ff7cce

+ 27 - 3
sc-service/src/main/java/com/huyi/service/base/entity/SysCompany.java

@@ -14,8 +14,8 @@ import lombok.experimental.Accessors;
  * 公司表
  * </p>
  *
- * @author songqg
- * @since 2021-08-23
+ * @author xuefy
+ * @since 2021-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -50,6 +50,12 @@ public class SysCompany implements Serializable {
     private String scySocialCode;
 
     /**
+     * 注册资本
+     */
+    @TableField("scy_registered_capital")
+    private String scyRegisteredCapital;
+
+    /**
      * 证件注册日
      */
     @TableField("scy_start_time")
@@ -74,12 +80,18 @@ public class SysCompany implements Serializable {
     private String scyPhone;
 
     /**
-     * 法人证件(pub_file_inf.pfi_file_id)
+     * 法人证件正面(pub_file_inf.pfi_file_id)
      */
     @TableField("scy_legal_file")
     private String scyLegalFile;
 
     /**
+     * 法人证件反面(pub_file_inf.pfi_file_id)
+     */
+    @TableField("scy_legal_back_file")
+    private String scyLegalBackFile;
+
+    /**
      * 法定姓名
      */
     @TableField("scy_legal")
@@ -140,6 +152,18 @@ public class SysCompany implements Serializable {
     private String scyManager;
 
     /**
+     * 联系人ID(核心企业新增)
+     */
+    @TableField("scy_contract_id")
+    private Long scyContractId;
+
+    /**
+     * CFCA电子签章用户id
+     */
+    @TableField("scy_cfca_user_id")
+    private String scyCfcaUserId;
+
+    /**
      * 备注
      */
     @TableField("scy_remarks")

+ 9 - 3
sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -529,8 +529,15 @@ public class OwnMessageController extends BaseController {
             /**-------- 获取合同盖章关键字 结束--------**/
             /**-------- CFCA盖章 开始--------**/
             //盖章
-            //人员编号
-            String userId = "CA74686406B322C7E05311016B0A442F";
+            //当前公司
+            String companyId = tokenService.getLoginUser().getSysUser().getCompanyId();
+            //当前公司的cfca人员编号
+            //查询当前企业信息
+            SysCompany   currentCompany =   companyService.getById(companyId);
+            if(currentCompany == null) {
+                throw  new Exception("获取当前企业信息失败");
+            }
+            String userId = currentCompany.getScyCfcaUserId();
             //jks路径
             String jksPath = configService.selectConfigByKey("jks_path").getMsg();
             //项目编号
@@ -565,7 +572,6 @@ public class OwnMessageController extends BaseController {
             //上传到文件服务器
             //获取token
             String token = SecurityUtils.getToken(ServletUtils.getRequest());
-            String companyId = tokenService.getLoginUser().getSysUser().getCompanyId();
             //文件传输
             File file = new File(path + contractNo + ".pdf");
             FileInputStream input = new FileInputStream(file);

+ 4 - 0
sc-service/src/main/resources/mapper/base/SysCompanyMapper.xml

@@ -8,11 +8,13 @@
         <result column="scy_license_file" property="scyLicenseFile" />
         <result column="scy_name" property="scyName" />
         <result column="scy_social_code" property="scySocialCode" />
+        <result column="scy_registered_capital" property="scyRegisteredCapital" />
         <result column="scy_start_time" property="scyStartTime" />
         <result column="scy_end_time" property="scyEndTime" />
         <result column="scy_address" property="scyAddress" />
         <result column="scy_phone" property="scyPhone" />
         <result column="scy_legal_file" property="scyLegalFile" />
+        <result column="scy_legal_back_file" property="scyLegalBackFile" />
         <result column="scy_legal" property="scyLegal" />
         <result column="scy_legal_id" property="scyLegalId" />
         <result column="scy_authorization_file" property="scyAuthorizationFile" />
@@ -23,6 +25,8 @@
         <result column="scy_scale" property="scyScale" />
         <result column="scy_organization" property="scyOrganization" />
         <result column="scy_manager" property="scyManager" />
+        <result column="scy_contract_id" property="scyContractId" />
+        <result column="scy_cfca_user_id" property="scyCfcaUserId" />
         <result column="scy_remarks" property="scyRemarks" />
         <result column="scy_auth_status" property="scyAuthStatus" />
         <result column="scy_status" property="scyStatus" />