Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiAdminServer

src/biz/ruFu.ts

@@ -14,6 +14,7 @@ import moment = require("moment");
 import { changeAdd, extractData } from "../util/piecemeal";
 import { EnterpriseApplyForConfig } from "../config/splitResult/enterprise";
 import { changeEnumValue } from "../util/verificationEnum";
+import { systemConfig } from "../config/serverConfig";
 
 
 //=======================================================新入孵企业
@@ -355,14 +356,10 @@ export async function enterpriseRegisterExamineList(enterpriseName, page) {
             eId:info.eId,
             enterpriseName:info.enterpriseName,
             randomCode:info.randomCode,
-            leaseContractUrl:info.enterprise_leases[0].leaseContract || "未提交",
-            entryPlanUrl:info.enterprise_leases[0].entryPlan || "未提交",
-            businessLicenseUrl:info.enterprise_leases[0].businessLicense || "未提交",
-            agreementUrl:info.enterprise_leases[0].agreement || "未提交",
-            // leaseContractUrl:getUrl(info.enterprise_leases[0].leaseContract ||  "未提交"),
-            // entryPlanUrl:getUrl(info.enterprise_leases[0].entryPlan ||  "未提交"),
-            // businessLicenseUrl:getUrl(info.enterprise_leases[0].businessLicense ||  "未提交"),
-            // agreementUrl:getUrl(info.enterprise_leases[0].agreement ||  "未提交"),
+            leaseContractUrl: `${systemConfig.fileUrl}${info.enterprise_leases[0].leaseContract}` ||  "未提交",
+            entryPlanUrl:`${systemConfig.fileUrl}${info.enterprise_leases[0].entryPlan}` ||  "未提交",
+            businessLicenseUrl:`${systemConfig.fileUrl}${info.enterprise_leases[0].businessLicense}` ||  "未提交",
+            agreementUrl:`${systemConfig.fileUrl}${info.enterprise_leases[0].agreement}` ||  "未提交",
             leaseContract: getFileNameAndFormat(info.enterprise_leases[0].leaseContract),
             entryPlan: getFileNameAndFormat(info.enterprise_leases[0].entryPlan),
             businessLicense: getFileNameAndFormat(info.enterprise_leases[0].businessLicense),
@@ -374,12 +371,6 @@ export async function enterpriseRegisterExamineList(enterpriseName, page) {
     return {dataList, dataCount:allResList.length};
 }
 
-function getUrl(fileName: string | null | undefined): string {
-    if (fileName === null || fileName === undefined || fileName === "未提交") {
-        return "未提交";
-    }
-    return fileName; // 直接返回原始文件路径/URL
-}
 /**
  * 入孵材料回显
  * @param eId 

src/config/serverConfig.ts

@@ -16,7 +16,7 @@ export async function initConfig() {
 		if (!configInfo || !configInfo.config) throw new BizError('xml中无配置');
 		else {
             
-            let {port, sign, dbServer, imgUrl, imgFileUrl, qcc } = configInfo.config;
+            let {port, sign, dbServer, imgUrl, imgFileUrl, fileUrl, qcc } = configInfo.config;
             systemConfig.port = parseInt(port[0]);
 
             systemConfig.dbSign = sign[0];
@@ -24,6 +24,7 @@ export async function initConfig() {
             
             systemConfig.imgUrl = imgUrl[0];
             systemConfig.imgFileUrl = imgFileUrl[0];
+            systemConfig.fileUrl = fileUrl[0];
 
             systemConfig.qccKey  = qcc[0].key[0];
             systemConfig.qccSecretKey  = qcc[0].SecretKey[0];

src/config/systemClass.ts

@@ -8,8 +8,10 @@ export class ServerConfig {
     port:number;
     dbSign:String;
     dbPath:String;
+    imgPath:string; 
     imgUrl:String;
     imgFileUrl:String;
+    fileUrl:String;
     /**企查查 */
     qccKey:string;
     qccSecretKey:string;