no message

src/biz/enterpriseInfo.ts

@@ -111,26 +111,29 @@ export async function homePage(eId:string) {
     }
     canBaoInfo.sort( (a, b) => {return new Date(b.annual).valueOf() - new Date(a.annual).valueOf()});
 
-    //只返回前五条改为3条
+    //只返回前五条
+    let zhengCeInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.政策表, {}, []);
     
-    let zhengCeInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.政策表, {isPermanent:1}, {}, 1, 3);
     let zhengCeList = [];
     zhengCeInfo.forEach(info => {
         let {poId, title, source, createTimeMs,closeTimeMs, coverImg,isPermanent} = info;
         let coverImgDefault = JSON.parse(coverImg)[0];
         if (!coverImgDefault) coverImgDefault = "/yuyi/files/默认图片.png";
         // 判断是否为永久有效政策
-        let formattedCloseTime = isPermanent ? "永久有效" : moment(closeTimeMs).format("YYYY-MM-DD");
-        zhengCeList.push( {
-            poId,
-            title, 
-            source, 
-            createTimeMs,
-            closeTimeMs:formattedCloseTime, 
-            coverImg:coverImgDefault
-        });
-        
-    })        
+        let formattedCloseTime = isPermanent == 1 ? "永久有效" : moment(closeTimeMs).format("YYYY-MM-DD");
+        if (isPermanent == 1 || (isPermanent == 0 && closeTimeMs > getMySqlMs())) {
+            zhengCeList.push( {
+                poId,
+                title, 
+                source, 
+                createTimeMs,
+                closeTimeMs:formattedCloseTime, 
+                coverImg:coverImgDefault
+            });
+        }
+    })
+
+    zhengCeList = zhengCeList.slice(0, 5);
 
     let dataInfo = {
         name:enterpriseInfo.enterpriseName,
@@ -180,6 +183,7 @@ export async function taskList(eId:string, annual, state) {
     let dataList:any[] = [];
 
     let jysjFile = ["BI", "TXP", "RD", "mId", "state", "isSubmit"];
+
     let selectParam:any = {eId, annual:getMySqlMs(`${year}-01-01 00:00:00`), quarter};
     if (state == 1 ) selectParam.isSubmit = 0;
     else selectParam.isSubmit = 1;
@@ -196,7 +200,7 @@ export async function taskList(eId:string, annual, state) {
            TXP:0,
            RD:0,
            createTime:getMySqlMs(),
-           state:0,
+           state:1,
            isSubmit:0,
            isUpdate:0 
        }
@@ -569,32 +573,43 @@ export async function deleteEnterpriseServiceInfo(eId, esId) {
  * @returns 
  */
 export async function enterprisePolicyList(state) {
-    let selectParam:any = {};
-    if (state == 1) {
-        selectParam.closeTimeMs = {"%lt%":getMySqlMs()}
-    } else if (state == 2) {
-        selectParam.closeTimeMs = {"%gt%":getMySqlMs()}
-    }
-
     let filesList = ["poId", "title", "source", "createTimeMs", "closeTimeMs", "coverImg","isPermanent"];
-    let resList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.政策表, selectParam, filesList);
-    
+    let resList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.政策表, {}, filesList);
+
     let dataList = [];
     resList.forEach(info => {
         let { poId, title, source,createTimeMs, closeTimeMs, coverImg, isPermanent } = info;
-
         // 判断是否为永久有效政策
-        let formattedCreateTime = isPermanent ? "永久有效" :moment(closeTimeMs).format("YYYY-MM-DD");
-
-        dataList.push( {
-            poId,
-            title, 
-            source,
-            createTimeMs,
-            closeTimeMs:formattedCreateTime, 
-            coverImg:coverImg ? JSON.parse(coverImg)[0] :'',
-            isPermanent
-        } );
+        let formattedCreateTime = "-";
+        if (isPermanent == 1) formattedCreateTime = "永久有效";
+        else formattedCreateTime = moment(closeTimeMs).format("YYYY-MM-DD");
+
+        if (state == 1) {
+            if (isPermanent == 1 || closeTimeMs > getMySqlMs()) {
+                dataList.push( {
+                    poId,
+                    title, 
+                    source,
+                    createTimeMs,
+                    closeTimeMs:formattedCreateTime, 
+                    coverImg:coverImg ? JSON.parse(coverImg)[0] :'',
+                    isPermanent
+                });
+            }
+        } else if (state == 2) {
+            if (isPermanent == 0 && getMySqlMs() > closeTimeMs) {
+                dataList.push( {
+                    poId,
+                    title, 
+                    source,
+                    createTimeMs,
+                    closeTimeMs:formattedCreateTime, 
+                    coverImg:coverImg ? JSON.parse(coverImg)[0] :'',
+                    isPermanent
+                } );
+            }
+        }
+        
     });
 
     return {dataList};

src/config/eccParam/enterprise.ts

@@ -48,26 +48,26 @@ export const EnterprisePatentUpdateConfig = {
 
 
 export const EnterpriseQualificationUpdateConfig = {
-    kxState:{key:"Number"},//科小认定状态
-    kxTime:{key:"Number"},//科小认定时间
-    kxImg:{key:"[String]"},//新增科小图片
-    kxNumber:{key:"Number"},//新增科小认定编号
-    zjtxState:{key:"Number"},//专精特新认定状态
-    zjtxImg:{key:"[String]"},//新增专精特新图片
-    zjtxTime:{key:"Number"},//专精特新认定时间
-    xjrImg:{key:"[String]"},//新增小巨人证书
-    xjrState:{key:"Number"},//小巨人认定状态
-    xjrTime:{key:"Number"},//小巨人认定时间
-    xjrPyTime:{key:"Number"},//小巨人培育认定时间
-    xjrPyState:{key:"Number"},//小巨人培育认定状态
-    xjrPyImg:{key:"[String]"},//新增小巨人培育证书
-    gaoXinJiShuTime:{key:"Number"},// 新增高新技术认定时间
-    gaoXinJiShuImg:{key:"[String]"},//新增高新技术图片
-    gxjsState:{key:"Number"},//高新技术状态
-    listedState:{key:"Number"},//上市状态
-    goPublicTime:{key:"Number"},//上市时间
-    goPublicSector:{key:"[Number]"},//上市板块
-    other:{key:"Number"},//新增其他
+    kxState:{key:"Number", notMustHave:true},//科小认定状态
+    kxTime:{key:"Number", notMustHave:true},//科小认定时间
+    kxImg:{key:"[String]", notMustHave:true},//新增科小图片
+    kxNumber:{key:"Number", notMustHave:true},//新增科小认定编号
+    zjtxState:{key:"Number", notMustHave:true},//专精特新认定状态
+    zjtxImg:{key:"[String]", notMustHave:true},//新增专精特新图片
+    zjtxTime:{key:"Number", notMustHave:true},//专精特新认定时间
+    xjrImg:{key:"[String]", notMustHave:true},//新增小巨人证书
+    xjrState:{key:"Number", notMustHave:true},//小巨人认定状态
+    xjrTime:{key:"Number", notMustHave:true},//小巨人认定时间
+    xjrPyTime:{key:"Number", notMustHave:true},//小巨人培育认定时间
+    xjrPyState:{key:"Number", notMustHave:true},//小巨人培育认定状态
+    xjrPyImg:{key:"[String]", notMustHave:true},//新增小巨人培育证书
+    gaoXinJiShuTime:{key:"Number", notMustHave:true},// 新增高新技术认定时间
+    gaoXinJiShuImg:{key:"[String]", notMustHave:true},//新增高新技术图片
+    gxjsState:{key:"Number", notMustHave:true},//高新技术状态
+    listedState:{key:"Number", notMustHave:true},//上市状态
+    goPublicTime:{key:"Number", notMustHave:true},//上市时间
+    goPublicSector:{key:"[Number]", notMustHave:true},//上市板块
+    other:{key:"Number", notMustHave:true},//新增其他
 }
 
 

src/config/enum/enum.ts

@@ -60,7 +60,7 @@ export enum LISTINGSITUATION {
     A股 = 1,
     科创板,
     海外,
-    其他
+    // 其他
 }