no message

src/biz/enterpriseInfo.ts

@@ -96,7 +96,7 @@ export async function enterpriseByPhone(phone:string) {
 export async function homePage(eId:string) {
     let filesList = ["enterpriseName", "eId"];
     let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId}, filesList);
-    let canBaoFileList = ["annual", "zhuanKe", "benKe", "shuoshi", "boShi", "qiTa"];
+    let canBaoFileList = ["annual", "zhuanKe", "benKe", "shuoshi", "boShi", "qiTa", "boshiyishang"];
     let canBaoInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.参保记录, {eId}, canBaoFileList);
 
     canBaoInfo.sort( (a, b) => {return new Date(b.annual).valueOf() - new Date(a.annual).valueOf()});
@@ -107,6 +107,7 @@ export async function homePage(eId:string) {
         if (canBaoInfo[0].benKe) chongYeRenYuan += canBaoInfo[0].benKe;
         if (canBaoInfo[0].shuoshi) chongYeRenYuan += canBaoInfo[0].shuoshi;
         if (canBaoInfo[0].boShi) chongYeRenYuan += canBaoInfo[0].boShi;
+        if (canBaoInfo[0].boshiyishang) chongYeRenYuan += canBaoInfo[0].boshiyishang;
         if (canBaoInfo[0].qiTa) chongYeRenYuan += canBaoInfo[0].qiTa;
     }
     canBaoInfo.sort( (a, b) => {return new Date(b.annual).valueOf() - new Date(a.annual).valueOf()});
@@ -126,7 +127,7 @@ export async function homePage(eId:string) {
                 poId,
                 title, 
                 source, 
-                createTimeMs,
+                createTimeMs: createTimeMs ? moment(createTimeMs).format("YYYY-MM-DD") : "",
                 closeTimeMs:formattedCloseTime, 
                 coverImg:coverImgDefault
             });
@@ -590,7 +591,7 @@ export async function enterprisePolicyList(state) {
                     poId,
                     title, 
                     source,
-                    createTimeMs,
+                    createTimeMs:createTimeMs ? moment(createTimeMs).format("YYYY-MM-DD") : "",
                     closeTimeMs:formattedCreateTime, 
                     coverImg:coverImg ? JSON.parse(coverImg)[0] :'',
                     isPermanent
@@ -602,7 +603,7 @@ export async function enterprisePolicyList(state) {
                     poId,
                     title, 
                     source,
-                    createTimeMs,
+                    createTimeMs:createTimeMs ? moment(createTimeMs).format("YYYY-MM-DD") : "",
                     closeTimeMs:formattedCreateTime, 
                     coverImg:coverImg ? JSON.parse(coverImg)[0] :'',
                     isPermanent
@@ -618,7 +619,7 @@ export async function enterprisePolicyList(state) {
 
 
 export async function enterprisePolicyInfo(poId) {
-    let filesList = ["poId", "desc", "title", "source", "closeTimeMs", "coverImg","isPermanent"];
+    let filesList = ["poId", "desc", "title", "source", "closeTimeMs", "coverImg","isPermanent", "createTimeMs"];
     let resInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.政策表, {poId}, filesList);
     if (!resInfo || !resInfo.poId) {
         throw new BizError(ERRORENUM.数据不存在);
@@ -635,7 +636,8 @@ export async function enterprisePolicyInfo(poId) {
         title:resInfo.title,
         source:resInfo.source, 
         closeTimeMs: formattedCreateTime, 
-        coverImg:JSON.parse(resInfo.coverImg)
+        coverImg:JSON.parse(resInfo.coverImg),
+        // createTimeMs:moment(closeTimeMs).format("YYYY-MM-DD")
     }
 
 

src/biz/qualification.ts

@@ -120,21 +120,33 @@ export async function enterpriseIPRInfo(eId:string) {
     let filesList = ["iprId", "year", "number"];
     let iprList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.知识产权, {eId}, filesList);
 
-    let dataList:any[] = [];
-    if (iprList || iprList.length) {
-        let yearStr = moment(iprList[0].year).format("YYYY");
-
+    let iprInfo = {};
+    if (iprList && iprList.length) {
         iprList.forEach(item => {
+            let yearStr = moment(item.year).format("YYYY");
             let {iprId, year, number} = item;
-            dataList.push({
+            if (!iprInfo[yearStr]) iprInfo[yearStr] = {};
+            else number = number + iprInfo[yearStr].number;
+            iprInfo[yearStr] = {
                 iprId,
                 year,
                 yearStr:`${yearStr}年`,
                 number
-            });
+            };
         });
     }
-    
+
+    let dataList:any = [];
+    for (let key in iprInfo) {
+        let {iprId, year, yearStr, number} = iprInfo[key];
+        dataList.push({
+            iprId,
+            year,
+            yearStr,
+            number
+        })
+    }
+
     //倒序
     dataList.sort(function(a, b) {
         return parseInt(moment(b.year).format("YYYY")) - parseInt(moment(a.year).format("YYYY"));
@@ -454,28 +466,26 @@ export async function updateEnterpriseQualificationInfo(eId, param) {
     let iprInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业资质, {eId}, filesList)
 
     /**修改字段 */
-    filesList.forEach(keyStr => {
-        if (keyStr == "goPublicSector" || keyStr == "kxState" || keyStr == "zjtxState" 
-            || keyStr == "xjrState" || keyStr == "xjrPyState" || keyStr == "gxjsState" || keyStr == "listedState" 
-        ) return;
-        if (!param[keyStr]) delete param[keyStr]
-    });
-
-    let addInfo:any = {};
-
+    // filesList.forEach(keyStr => {
+    //     if (keyStr == "goPublicSector" || keyStr == "kxState" || keyStr == "zjtxState" 
+    //         || keyStr == "xjrState" || keyStr == "xjrPyState" || keyStr == "gxjsState" || keyStr == "listedState" 
+    //     ) return;
+    //     if (!param[keyStr]) delete param[keyStr]
+    // });
+
+    param.kxNumber = param.kxNumber ? param.kxNumber : null;
     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);
+    param.kxTime = param.kxTime ? getMySqlMs(param.kxTime) : null;
+    param.zjtxTime = param.zjtxTime ? getMySqlMs(param.zjtxTime) : null;
+    param.xjrTime = param.xjrTime ? getMySqlMs(param.xjrTime) : null;
+    param.xjrPyTime = param.xjrPyTime ? getMySqlMs(param.xjrPyTime) : null;
+    param.gaoXinJiShuTime = param.gaoXinJiShuTime ? getMySqlMs(param.gaoXinJiShuTime) : null;
+    param.goPublicTime = param.goPublicTime ? getMySqlMs(param.goPublicTime) : null;
 
     if (!iprInfo || !iprInfo.eId) {
         param.qId = randomId(TABLEID.企业资质);

src/routers/public.ts

@@ -43,6 +43,7 @@ function getEnumItf(enumCof) {
                 dataList.push({key, value:enumCof[key]});
             }
         }
+        console.log(dataList);
         res.success({dataList});
     }