no message

src/biz/enterpriseInfo.ts

@@ -111,16 +111,17 @@ 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");
+        let formattedCloseTime = isPermanent == 1 ? "永久有效" : moment(closeTimeMs).format("YYYY-MM-DD");
+        if (isPermanent == 1 || (isPermanent == 0 && closeTimeMs > getMySqlMs())) {
             zhengCeList.push( {
                 poId,
                 title, 
@@ -129,9 +130,11 @@ export async function homePage(eId:string) {
                 closeTimeMs:formattedCloseTime, 
                 coverImg:coverImgDefault
             });
-        
+        }
     })
 
+    zhengCeList = zhengCeList.slice(0, 5);
+
     let dataInfo = {
         name:enterpriseInfo.enterpriseName,
         chongYeRenYuan,
@@ -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,23 +573,31 @@ 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");
+        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, 
@@ -595,6 +607,9 @@ export async function enterprisePolicyList(state) {
                     coverImg:coverImg ? JSON.parse(coverImg)[0] :'',
                     isPermanent
                 } );
+            }
+        }
+        
     });
 
     return {dataList};

src/biz/qualification.ts

@@ -119,9 +119,11 @@ export async function deleteEnterpriseHonorInfo(eId, hId) {
 export async function enterpriseIPRInfo(eId:string) {
     let filesList = ["iprId", "year", "number"];
     let iprList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.知识产权, {eId}, filesList);
-    let yearStr = moment(iprList[0].year).format("YYYY");
 
     let dataList:any[] = [];
+    if (iprList || iprList.length) {
+        let yearStr = moment(iprList[0].year).format("YYYY");
+
         iprList.forEach(item => {
             let {iprId, year, number} = item;
             dataList.push({
@@ -131,6 +133,7 @@ export async function enterpriseIPRInfo(eId:string) {
                 number
             });
         });
+    }
     
     //倒序
     dataList.sort(function(a, b) {
@@ -236,7 +239,8 @@ export async function createEnterpriseIPRInfo(eId, param) {
         iprType:param.iprType,//新增知识产权类型
         iprName:param.iprName,//新增名称
         // iprUrl:param.iprUrl//新增证明材料
-        iprUrl:JSON.stringify(param.iprUrl)//新增证明材料
+        iprUrl:JSON.stringify(param.iprUrl),//新增证明材料
+        number:1
     };
 
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.知识产权, addInfo, {});
@@ -367,12 +371,7 @@ export async function deleteEnterprisePatentInfo(eId, pId) {
  * @param uscc 
  */
 export async function enterpriseQualificationInfo(eId) {
-    let filesList = ["eId", "kxState","kxTime","kxNumber","kxImg", "zjtxState","zjtxTime","zjtxImg",
-        "xjrState", "xjrTime","xjrImg","xjrPyState", "xjrPyTime","xjrPyImg",
-        "gxjsState","gaoXinJiShuTime","gaoXinJiShuImg","listedState", "goPublicTime", "goPublicSector","other"];
-    
-    // let filesList = ["eId", "qualificationType","qualificationTime", "qualificationNum", "qualificationImg", "xjrPyTime", "goPublicTime", "goPublicSector","other"];
-    let qualificationData = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业资质, {eId}, filesList);
+    let qualificationData = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业资质, {eId}, []);
     
     // let qualificationList = [];
     // if (qualificationData.goPublicSector) {
@@ -384,6 +383,29 @@ export async function enterpriseQualificationInfo(eId) {
     // }
 
     let result = {
+        kxState: 0,
+        kxTime: "",
+        kxNumber: "",
+        kxImg: [],
+        zjtxState: 0,
+        zjtxTime: "",
+        zjtxImg: [],
+        xjrState: 0,
+        xjrTime: "",
+        xjrImg: [],
+        xjrPyState: 0,
+        xjrPyTime: "",
+        xjrPyImg: [],
+        gxjsState: 0,
+        gaoXinJiShuTime: "",
+        gaoXinJiShuImg: [],
+        listedState: 0,
+        goPublicSector: [],
+        goPublicTime: "",
+        other: "",
+    };
+    if (qualificationData.qId) {
+        result = {
             kxState: qualificationData.kxState || 0,//新增科小状态
             kxTime: qualificationData.kxTime,
             kxNumber: qualificationData.kxNumber || '',//新增科小编号
@@ -406,6 +428,7 @@ export async function enterpriseQualificationInfo(eId) {
             // goPublicTime: qualificationData.goPublicTime ? moment(qualificationData.goPublicTime).valueOf() :  "",
             other: qualificationData.other || '',//新增其他
         };
+    }
 
     return result;
 }
@@ -422,7 +445,6 @@ export async function updateEnterpriseQualificationInfo(eId, param) {
    
     eccFormParam(FuncName, EnterpriseQualificationUpdateConfig, param );
 
-
     if (param.goPublicSector) eccEnumValue(FuncName, 'goPublicSector', enumConfig.LISTINGSITUATION, param.goPublicSector);
         
     let filesList = ["eId", "kxState","kxTime","kxNumber","kxImg", "zjtxState","zjtxTime","zjtxImg",
@@ -430,7 +452,7 @@ export async function updateEnterpriseQualificationInfo(eId, param) {
         "gxjsState","gaoXinJiShuTime","gaoXinJiShuImg","listedState", "goPublicTime", "goPublicSector","other"];
 
     let iprInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业资质, {eId}, filesList)
-    if (!iprInfo || !iprInfo.eId) throw new BizError(ERRORENUM.当前数据不存在);
+
     /**修改字段 */
     filesList.forEach(keyStr => {
         if (keyStr == "goPublicSector" || keyStr == "kxState" || keyStr == "zjtxState" 
@@ -441,36 +463,28 @@ export async function updateEnterpriseQualificationInfo(eId, param) {
 
     let addInfo:any = {};
 
-    if (param.kxState) addInfo.kxState = param.kxState;
-    if (param.goPublicSector && param.goPublicSector.length > 0) addInfo.goPublicSector = JSON.stringify(param.goPublicSector);
-    if (param.kxImg && param.kxImg.length > 0) addInfo.kxImg = JSON.stringify(param.kxImg);
-    if (param.zjtxImg && param.zjtxImg.length > 0) addInfo.zjtxImg = JSON.stringify(param.zjtxImg);
-    if (param.xjrImg && param.xjrImg.length > 0) addInfo.xjrImg = JSON.stringify(param.xjrImg);
-    if (param.xjrPyImg && param.xjrPyImg.length > 0) addInfo.xjrPyImg = JSON.stringify(param.xjrPyImg);
-    if (param.gaoXinJiShuImg && param.gaoXinJiShuImg.length > 0) addInfo.gaoXinJiShuImg = JSON.stringify(param.gaoXinJiShuImg);
-    
-    // if (param.goPublicSector) addInfo.goPublicSector = JSON.stringify(param.goPublicSector);
-    // if (param.kxImg) addInfo.kxImg = JSON.stringify(param.kxImg);
-    if (param.kxTime) addInfo.kxTime = getMySqlMs(param.kxTime);
-    if (param.kxNumber) addInfo.kxNumber = param.kxNumber;//新增科小编号
-    if (param.zjtxState) addInfo.zjtxState = param.zjtxState;
-    // if (param.zjtxImg) addInfo.zjtxImg = JSON.stringify(param.zjtxImg);
-    if (param.zjtxTime) addInfo.zjtxTime = getMySqlMs(param.zjtxTime);
-    if (param.xjrState) addInfo.xjrState = param.xjrState;
-    // if (param.xjrImg) addInfo.xjrImg = JSON.stringify(param.xjrImg);
-    if (param.xjrTime) addInfo.xjrTime = getMySqlMs(param.xjrTime);
-    if (param.xjrPyTime) addInfo.xjrPyTime = getMySqlMs(param.xjrPyTime);
-    if (param.xjrPyState) addInfo.xjrPyState = param.xjrPyState;
-    // if (param.xjrPyImg) addInfo.xjrPyImg = JSON.stringify(param.xjrPyImg);
-    if (param.gxjsState) addInfo.gxjsState = param.gxjsState;
-    if (param.gaoXinJiShuTime) addInfo.gaoXinJiShuTime = getMySqlMs(param.gaoXinJiShuTime);//高新技术
-    // if (param.gaoXinJiShuImg) addInfo.gaoXinJiShuImg = JSON.stringify(param.gaoXinJiShuImg);
-    if (param.listedState) addInfo.listedState = param.listedState;
-    if (param.goPublicTime) addInfo.goPublicTime = getMySqlMs(param.goPublicTime);
-    if (param.other) addInfo.other = param.other;//新增其他
-
-    if (addInfo && Object.keys(addInfo).length > 0) {
-        await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业资质, addInfo, {eId});
+    param.goPublicSector = param.goPublicSector ? JSON.stringify(param.goPublicSector) : "[]";
+    param.kxImg = param.kxImg ? JSON.stringify(param.kxImg) : "[]";
+    param.zjtxImg = param.zjtxImg ? JSON.stringify(param.zjtxImg) : "[]";
+    param.xjrImg = param.xjrImg ? JSON.stringify(param.xjrImg) : "[]";
+    param.xjrPyImg = param.xjrPyImg ? JSON.stringify(param.xjrPyImg) : "[]";
+    param.gaoXinJiShuImg = param.gaoXinJiShuImg ? JSON.stringify(param.gaoXinJiShuImg) : "[]";
+
+    if (param.kxTime) param.kxTime = getMySqlMs(param.kxTime);
+    if (param.zjtxTime) param.zjtxTime = getMySqlMs(param.zjtxTime);
+    if (param.xjrTime) param.xjrTime = getMySqlMs(param.xjrTime);
+    if (param.xjrPyTime) param.xjrPyTime = getMySqlMs(param.xjrPyTime);
+    if (param.gaoXinJiShuTime) param.gaoXinJiShuTime = getMySqlMs(param.gaoXinJiShuTime);//高新技术
+    if (param.goPublicTime) param.goPublicTime = getMySqlMs(param.goPublicTime);
+
+    if (!iprInfo || !iprInfo.eId) {
+        param.qId = randomId(TABLEID.企业资质);
+        param.eId = eId;
+        await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业资质, param, {});
+    } else {
+        if (param && Object.keys(param).length > 0) {
+            await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业资质, param, {eId});
+        }
     }
     
     return {isSuccess:true};

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,
     科创板,
     海外,
-    其他
+    // 其他
 }