no message

src/biz/qyszhx.ts

@@ -58,17 +58,22 @@ export async function getData(req, res) {
     let zzrzTableData = tablePackage(dbData["资质认证"].headerList[0], dbData["资质认证"].bodyList);
     ret['zzrzTable'] = getTableOut('资质认证表格', zzrzTableData);
 
-    let sxhc = keyValuePackage(dbData['失信详情'].count);
-    ret['sxhc'] = getKeyValueOut('失信详情', sxhc);
+    let sxhc = keyValuePackage(dbData['风险详情'].count);
+    ret['sxhc'] = getKeyValueOut('风险详情', sxhc);
 
-    let sxhcxx = keyValuePackage(dbData['失信详情'].dataList);
-    ret['sxhcxx'] = getKeyValueOut('失信详情详细', sxhcxx);
+    ret['sxhcxx'] = {title:'风险详情详细', dataList:dbData['风险详情'].dataList};
 
-    let wfhc = keyValuePackage(dbData['违法核查'].count);
-    ret['wfhc'] = getKeyValueOut('违法核查', wfhc);
+    // let sxhc = keyValuePackage(dbData['失信详情'].count);
+    // ret['sxhc'] = getKeyValueOut('失信详情', sxhc);
 
-    let wfhcxx = keyValuePackage(dbData['违法核查'].dataList);
-    ret['wfhcxx'] = getKeyValueOut('违法核查详细', wfhcxx);
+    // let sxhcxx = keyValuePackage(dbData['失信详情'].dataList);
+    // ret['sxhcxx'] = getKeyValueOut('失信详情详细', sxhcxx);
+
+    // let wfhc = keyValuePackage(dbData['违法核查'].count);
+    // ret['wfhc'] = getKeyValueOut('违法核查', wfhc);
+
+    // let wfhcxx = keyValuePackage(dbData['违法核查'].dataList);
+    // ret['wfhcxx'] = getKeyValueOut('违法核查详细', wfhcxx);
 
     let qyfwsqqk = keyValuePackage(dbData['企业服务申请情况'].dataList);
     ret['qyfwsqqk'] = getKeyValueOut('企业服务申请情况', qyfwsqqk);

src/data/db/jxgljsc.ts

@@ -161,6 +161,14 @@ async function getRfqyslbhqsMonth(在孵dbList, 迁出dbList) {
     }
     
     let 本月在孵数量 = 0;
+    在孵dbList.forEach(info => {
+        // 检查入孵开始时间的月份是否与当前月份相同
+        let parsedStartTime = moment(info.startTime); // 获取入孵开始时间
+        if (parsedStartTime.isValid() && moment(parsedStartTime).format("YY/MM") == currentMonth) {
+            本月在孵数量 += 1
+        }
+    })
+    
     let 上月在孵数量 = 0;
     for(let i = 0; i < month.length; i++) {
         let qianruMonth = 0;
@@ -171,9 +179,6 @@ async function getRfqyslbhqsMonth(在孵dbList, 迁出dbList) {
             if (parsedStartTime.isValid() && moment(parsedStartTime).format("YY/MM") === month[i]) {
                 qianruMonth += 1;
             }
-            if (parsedStartTime.isValid() && moment(parsedStartTime).format("YY/MM") == currentMonth) {
-                本月在孵数量 += 1
-            }
             if (parsedStartTime.isValid() && moment(parsedStartTime).format("YY/MM") == lastMonth) {
                 上月在孵数量 += 1
             }

src/data/db/qyszhx.ts

@@ -13,8 +13,9 @@ export async function getQyszhx(eId) {
         企业科创分: { count: [], dataList: [], chartData:[]}, //count:所属国际二级行业，chartData:饼图
         股权结构: { dataList: [], titleList: ['key', 'value'] },
         资质认证: {count:[], bodyList: [], headerList: [['生效时间', '证书类型', '状态']]}, //count:资质认证总数
-        失信详情: {count:[], dataList:[]},//todo
-        违法核查: {count:[], dataList: []},//todo
+        风险详情: {count:[], dataList:[]},
+        // 失信详情: {count:[], dataList:[]},//todo
+        // 违法核查: {count:[], dataList: []},//todo
         企业服务申请情况: { dataList: [], titleList: ['key', 'value'] },
         企业服务申请类型: { dataList: [], titleList: ['key', 'value'] },
         知识产权: { count:[], dataList: [], titleList: ['key', 'value'] },
@@ -112,29 +113,36 @@ export async function getQyszhx(eId) {
     qyszhx.资质认证.count = [{key:"资质认证", value:资质证书.length}];
     qyszhx.资质认证.bodyList = zzzs;
 
-    //企业风险动态：失信核查、失信详情、违法核查
-    let 企业风险动态 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.失信核查, {eId}, ["eId", "liandate", "anno", "executegov", "executestatus", "publicdate", "executeno", "actionRemark", "amount"]);
-    let qyfxdt = {失信详情:[], 违法核查:[]};
+    //企业风险动态：失信核查、失信详情、违法核查 --改为风险数据
+    let 企业风险动态 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.风险, {eId}, ["eId", "title", "description", "passage", "riskType", "typeCode"]);
+    let qyfxdt = {风险详情:[]};
     企业风险动态.forEach( info => {
-        qyfxdt.失信详情.push(info.actionRemark);
+        qyfxdt.风险详情.push(info.description);
     })
-    qyszhx.失信详情.count = [{key:"失信核查次数", value:企业风险动态.length}];
-    qyszhx.失信详情.dataList = qyfxdt.失信详情;
-
-    let 严重违法犯罪 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.严重违法犯罪, {eId}, ["eId", "Type", "AddReason", "AddDate", "AddOffice", "RemoveReason", "RemoveDate", "RemoveOffice"]);
-    严重违法犯罪.forEach( info => {
-        qyfxdt.违法核查.push(info.AddReason);
-    })
-    qyszhx.违法核查.count = [{key:"违法核查次数", value:严重违法犯罪.length}];
-    qyszhx.违法核查.dataList = qyfxdt.违法核查;
+    qyszhx.风险详情.count = [{key:"风险统计次数", value:企业风险动态.length}];
+    qyszhx.风险详情.dataList = qyfxdt.风险详情;
+    // let 企业风险动态 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.失信核查, {eId}, ["eId", "liandate", "anno", "executegov", "executestatus", "publicdate", "executeno", "actionRemark", "amount"]);
+    // let qyfxdt = {失信详情:[], 违法核查:[]};
+    // 企业风险动态.forEach( info => {
+    //     qyfxdt.失信详情.push(info.actionRemark);
+    // })
+    // qyszhx.失信详情.count = [{key:"失信核查次数", value:企业风险动态.length}];
+    // qyszhx.失信详情.dataList = qyfxdt.失信详情;
+
+    // let 严重违法犯罪 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.严重违法犯罪, {eId}, ["eId", "Type", "AddReason", "AddDate", "AddOffice", "RemoveReason", "RemoveDate", "RemoveOffice"]);
+    // 严重违法犯罪.forEach( info => {
+    //     qyfxdt.违法核查.push(info.AddReason);
+    // })
+    // qyszhx.违法核查.count = [{key:"违法核查次数", value:严重违法犯罪.length}];
+    // qyszhx.违法核查.dataList = qyfxdt.违法核查;
 
     //企业服务申请情况
     let 企业服务dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业服务表, {eId}, []); //获取所有企业服务表联查企业信息表
     let 未受理企业服务Count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业服务表, {eId, followUpStatus:FOLLOWUPSTATUS.未受理}, []);
-    let 已完成企业服务Count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业服务表, {eId, followUpStatus:FOLLOWUPSTATUS.已完成}, []);
+    let 已受理企业服务Count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业服务表, {eId, followUpStatus:{"%ne%":FOLLOWUPSTATUS.未受理}}, []);
     let qyfwsqqk = {
         服务次数:企业服务dbList.length,
-        已完成:已完成企业服务Count,
+        已受理:已受理企业服务Count,
         未受理:未受理企业服务Count
     }
     qyszhx.企业服务申请情况.dataList = getKeyValue(qyfwsqqk);