no message

src/biz/ruFu.ts

@@ -355,10 +355,14 @@ export async function enterpriseRegisterExamineList(enterpriseName, page) {
             eId:info.eId,
             enterpriseName:info.enterpriseName,
             randomCode:info.randomCode,
-            // leaseContract:info.enterprise_leases[0].leaseContract || "未提交",
-            // entryPlan:info.enterprise_leases[0].entryPlan || "未提交",
-            // businessLicense:info.enterprise_leases[0].businessLicense || "未提交",
-            // agreement:info.enterprise_leases[0].agreement || "未提交",
+            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 ||  "未提交"),
             leaseContract: getFileNameAndFormat(info.enterprise_leases[0].leaseContract),
             entryPlan: getFileNameAndFormat(info.enterprise_leases[0].entryPlan),
             businessLicense: getFileNameAndFormat(info.enterprise_leases[0].businessLicense),
@@ -370,7 +374,12 @@ 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 
@@ -396,10 +405,11 @@ export async function getRuFu(eId:string) {
     else dataInfo.endTime = "";
 
     dataInfo.area = leaseInfo.area;
-    // dataInfo.leaseContract = leaseInfo.leaseContract;
-    // dataInfo.entryPlan = leaseInfo.entryPlan;
-    // dataInfo.businessLicense = leaseInfo.businessLicense;
-    // dataInfo.agreement = leaseInfo.agreement;
+    dataInfo.leaseContractUrl = leaseInfo.leaseContract;
+    dataInfo.entryPlanUrl = leaseInfo.entryPlan;
+    dataInfo.businessLicenseUrl = leaseInfo.businessLicense;
+    dataInfo.agreementUrl = leaseInfo.agreement;
+
     dataInfo.leaseContract = getFileNameAndFormat(leaseInfo.leaseContract);
     dataInfo.entryPlan = getFileNameAndFormat(leaseInfo.entryPlan);
     dataInfo.businessLicense = getFileNameAndFormat(leaseInfo.businessLicense);

src/biz/zaiFu.ts

@@ -96,14 +96,13 @@ export async function enterpriseList(enterpriseName:string, page:number, logonSt
         if (!leaseWhere["%literal%"]) {
             leaseWhere["%literal%"] = `(startTime between '${getMySqlMs(startTime)}' and '${getMySqlMs(endTime)}' 
             or endTime between '${getMySqlMs(startTime)}' and '${getMySqlMs(endTime)}') `;
-        }    // leaseWhere["%or%"] = [
+        }    
+        // leaseWhere["%or%"] = [
         //     {startTime: { "%between%":[getMySqlMs(startTime), getMySqlMs(endTime)] }},
         //     {endTime: { "%between%":[getMySqlMs(startTime), getMySqlMs(endTime)] }}
         // ]
     }
 
-    // if (building && ['1', '3', '4'].includes(building)) {leaseWhere.building = building;}
-    // if (building) selectParam["enterprise_leases.building"] = building
     if (building) {
         leaseWhere.building = building;
     }
@@ -124,23 +123,10 @@ export async function enterpriseList(enterpriseName:string, page:number, logonSt
     }
 
     // 查询分页数据
-    let resInfo = await selectManyTableData(
-        OPERATIONALDATATYPE.多表分页,
-        TABLENAME.企业基础信息表,
-        selectParam,
-        filesList,
-        manyTableInfo,
-        page
-    );
+    let resInfo = await selectManyTableData( OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo, page );
 
     // 查询总数
-    let dataCount = await selectManyTableData(
-        OPERATIONALDATATYPE.多表联查,
-        TABLENAME.企业基础信息表,
-        selectParam,
-        filesList,
-        manyTableInfo
-    );
+    let dataCount = await selectManyTableData( OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, filesList, manyTableInfo );
 
     let dataList = [];
     for (let info of resInfo) {