no message

src/biz/enterpriseInfo.ts

@@ -512,16 +512,18 @@ export async function updateEnterpriseFaRenInfo(eId, param) {
  * @param uscc 
  */
 export async function enterpriseLeaseInfo(eId) {
-    let filesList = ["area", "unitPrice", "startTime", "endTime", "roomNumber", "rent"];
+    // let filesList = ["area", "unitPrice", "startTime", "endTime", "building", "roomNumber","rent"];
+    let filesList = ["area", "startTime", "endTime", "building", "roomNumber","rent"];
     let includeConf = {};
     includeConf[TABLENAME.租赁信息] = {colum:filesList, where:{} };
-    includeConf[TABLENAME.企业孵化信息] = {colum:["state", "startTime", "endTime"], where:{} };
+    // includeConf[TABLENAME.企业孵化信息] = {colum:["state", "startTime", "endTime"], where:{} };
+    includeConf[TABLENAME.企业孵化信息] = {colum:["startTime", "endTime"], where:{} };
     let enterpriseInfo = await selectManyTableData(OPERATIONALDATATYPE.多表单个, TABLENAME.企业基础信息表, {eId}, ["enterpriseName"], includeConf);
     
     let dataInfo:any = extractData(EnterpriseLeaseInfoResConfig, enterpriseInfo.enterprise_leases[0]);
 
     dataInfo.enterpriseName = enterpriseInfo.enterpriseName;
-    dataInfo.state = changeEnumValue(enumConfig.FUHUASTATE, enterpriseInfo.enterprise_fuhuas[0].state);
+    // dataInfo.state = changeEnumValue(enumConfig.FUHUASTATE, enterpriseInfo.enterprise_fuhuas[0].state);
 
     //如果 startTime 或 endTime 为空或无效，可以设置默认值或提示信息：
     if (enterpriseInfo.enterprise_leases) {
@@ -646,17 +648,19 @@ export async function deleteEnterpriseServiceInfo(eId, esId) {
 //===========================================政策速递
 
 /**
- * 
+ * 政策速递列表
  * @param state 
  * @returns 
  */
-export async function enterprisePolicyList(state) {
-    let filesList = ["poId", "title", "source", "createTimeMs", "closeTimeMs", "coverImg","isPermanent"];
-    let resList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.政策表, {}, filesList);
+export async function enterprisePolicyList(state, policyType) {
+    let filesList = ["poId", "title", "source", "createTimeMs", "closeTimeMs", "coverImg", "isPermanent", "policyType"];
+    let selectParam:any = {};
+    if (policyType != enumConfig.POLICYTYPE.全部) selectParam.policyType = policyType;
+    let resList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.政策表, selectParam, filesList);
 
     let dataList = [];
     resList.forEach(info => {
-        let { poId, title, source,createTimeMs, closeTimeMs, coverImg, isPermanent } = info;
+        let { poId, title, source,createTimeMs, closeTimeMs, coverImg, isPermanent, policyType } = info;
         // 判断是否为永久有效政策
         let formattedCreateTime = "-";
         if (isPermanent == 1) formattedCreateTime = "永久有效";
@@ -671,7 +675,8 @@ export async function enterprisePolicyList(state) {
                     createTimeMs:createTimeMs ? moment(createTimeMs).format("YYYY-MM-DD") : "",
                     closeTimeMs:formattedCreateTime, 
                     coverImg:coverImg ? JSON.parse(coverImg)[0] :'',
-                    isPermanent
+                    isPermanent,
+                    policyType:changeEnumValue(enumConfig.POLICYTYPE, policyType)
                 });
             }
         } else if (state == 2) {
@@ -683,7 +688,8 @@ export async function enterprisePolicyList(state) {
                     createTimeMs:createTimeMs ? moment(createTimeMs).format("YYYY-MM-DD") : "",
                     closeTimeMs:formattedCreateTime, 
                     coverImg:coverImg ? JSON.parse(coverImg)[0] :'',
-                    isPermanent
+                    isPermanent,
+                    policyType:changeEnumValue(enumConfig.POLICYTYPE, policyType)
                 } );
             }
         }
@@ -696,13 +702,13 @@ export async function enterprisePolicyList(state) {
 
 
 export async function enterprisePolicyInfo(poId) {
-    let filesList = ["poId", "desc", "title", "source", "closeTimeMs", "coverImg","isPermanent", "createTimeMs"];
+    let filesList = ["poId", "desc", "title", "source", "closeTimeMs", "coverImg","isPermanent", "createTimeMs","policyType"];
     let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.政策表, {poId}, filesList);
     if (!resInfo || !resInfo.poId) {
         throw new BizError(ERRORENUM.数据不存在);
     }
 
-    let {closeTimeMs, isPermanent } = resInfo;
+    let {closeTimeMs, isPermanent, policyType } = resInfo;
 
     // 判断是否为永久有效政策
     let formattedCreateTime = isPermanent ? "永久有效" :  moment(closeTimeMs).format("YYYY-MM-DD");
@@ -715,6 +721,7 @@ export async function enterprisePolicyInfo(poId) {
         closeTimeMs: formattedCreateTime, 
         coverImg:JSON.parse(resInfo.coverImg),
         // createTimeMs:moment(closeTimeMs).format("YYYY-MM-DD")
+        policyType:changeEnumValue(enumConfig.POLICYTYPE, policyType)
     }
 
 

src/config/enum/enum.ts

@@ -63,6 +63,17 @@ export enum EMIGRATIONTYPE {
 
 
 /**
+ * 政策类型
+ */
+export  enum POLICYTYPE {
+    全部 = 0, 
+    财政补贴 = 1,
+    资质申报 = 2,
+    政策扶持 = 3,
+    
+}
+
+/**
  * 上市情况
  */
 export enum LISTINGSITUATION {

src/config/splitResult/enterprise.ts

@@ -48,7 +48,8 @@ export const EnterpriseFaRenInfoResConfig = {
 
 export const EnterpriseLeaseInfoResConfig = {
    area:{key:"租赁面积"},
-   unitPrice:{key:"出租单价"},
+   // unitPrice:{key:"出租单价"},
+   building:{key:"楼号"},
    roomNumber:{key:"室号"},
    rent:{key:"每月租金"}
 }

src/routers/enterpriseInfo.ts

@@ -55,8 +55,8 @@ export function setRouter(httpServer) {
  */
 async function policyList(req, res) {
     const UserInfo = req.userInfo;
-    let { state } = req.body;
-    let result = await enterpriseInfoBiz.enterprisePolicyList(state);
+    let { state, policyType } = req.body;
+    let result = await enterpriseInfoBiz.enterprisePolicyList(state, policyType);
 
     res.success(result);
 }

src/routers/public.ts

@@ -20,6 +20,7 @@ const config = {
     // "/public/iprtypeclient":enumConfig.IPRTYPECLIENT,// 新增知识产权类型
     "/public/iprtypeclientqt":enumConfig.IPRTYPECLIENTQT,// 新增知识产权类型
     "/public/iprtypeclientzl":enumConfig.IPRTYPECLIENTZL,// 新增知识产权专利
+    "/public/policytype":enumConfig.POLICYTYPE,//政策类型
     
 }