no message

src/config/enum.ts

@@ -193,6 +193,7 @@ export enum DEGREE {
     硕士,
     博士,
     博士以上,
+    其他
    
 }
 

src/data/db/jxgljsc.ts

@@ -338,10 +338,11 @@ async function getyj() {
         map[info.eId] = 1;
     });
 
+    // let 高风险 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.企业孵化信息, {moveOutType:{"%between%":[MOVEOUTTYPE.企业注销, MOVEOUTTYPE.非毕业迁出]}}, null);
 
     fhdbList.forEach(info => {
         let riskLevel = "";
-        if (info.enterprise_fuhuas[0].moveOutType == MOVEOUTTYPE.非毕业迁出) {
+        if (info.enterprise_fuhuas[0].moveOutType == MOVEOUTTYPE.非毕业迁出 || info.enterprise_fuhuas[0].moveOutType == MOVEOUTTYPE.企业注销) {
             yj.高风险 += 1;
             riskLevel = "高风险";
         } else if (!map[info.eId]) {

src/data/db/qyszhx.ts

@@ -89,10 +89,11 @@ export async function getQyszhx(eId) {
     企业服务联查includeConf[TABLENAME.企业服务表] = { cloum: 企业服务Column, where: {} }
     let 企业服务信息 = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, { eId }, [], 企业服务联查includeConf);
 
-    let 参保记录Column = ["cId", "eId", "annual", "zhuanKe", "benKe", "shuoshi", "boShi", "boshiyishang"];
+    let 参保记录Column = ["cId", "eId", "annual", "zhuanKe", "benKe", "shuoshi", "boShi", "boshiyishang", "qiTa"];
     let 参保记录联查includeConf = {};
     参保记录联查includeConf[TABLENAME.参保记录] = { cloum: 参保记录Column, where: {} }
-    let 参保记录信息 = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, { eId }, [], 参保记录联查includeConf);
+    // let 参保记录信息 = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, { eId }, [], 参保记录联查includeConf);
+    let 参保记录信息 = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.参保记录, { eId }, 参保记录Column);
 
     let 租赁信息Column = ["leaseId", "eId", "area", "startTime", "endTime"];
     let 租赁信息联查includeConf = {};
@@ -184,7 +185,7 @@ export async function getQyszhx(eId) {
     qyszhx.知识产权.dataList = getKeyValue(zscq);
 
     //企业员工画像
-    let qyyghx = await get企业员工画像(创业团队信息);
+    let qyyghx = await get企业员工画像(参保记录信息);
     qyszhx.企业员工画像.dataList = getKeyValue(qyyghx);
 
     let 专利总数 = 0;
@@ -522,11 +523,10 @@ function get租房补贴(企业资质信息, 企业专利信息, 参保记录信
     // 检查社保状态
     let shebaoCompleted = false;
     if (参保记录信息[0]) {
-        参保记录信息[0].enterprise_canbaos.forEach(info => {
-            if (info.zhuanKe || info.benKe || info.shuoshi || info.boShi || info.boshiyishang) {
+        
+        if (参保记录信息[0].zhuanKe || 参保记录信息[0].benKe || 参保记录信息[0].shuoshi || 参保记录信息[0].boShi || 参保记录信息[0].boshiyishang || 参保记录信息[0].qiTa ) {
             shebaoCompleted = true;
         }
-        });
     }
 
     zfbt.社保 = shebaoCompleted ? "已完成" : "未完成";
@@ -795,27 +795,45 @@ function get知识产权(data) {
 
 
 async function get企业员工画像(data) {
-    let qyyghx = {};
-
-    for (let key in DEGREE) {
-        let anyKey: any = key;
-        if (isNaN(anyKey)) {
-            let keyStr = key;
-            if (!qyyghx[keyStr]) qyyghx[keyStr] = 0;
-            let degree = DEGREE[key];
-            data.forEach(info => {
-                let { enterprise_teams } = info;
-                if (enterprise_teams && Array.isArray(enterprise_teams)) {
-                    enterprise_teams.forEach(team => {
-                        if (degree == team.degree) {
-                            qyyghx[keyStr] += 1;
-                        }
-                    })
-                }
-            })
-        }
+    let qyyghx = {
+        "专科":0,
+        "本科":0,
+        "硕士":0,
+        "博士":0,
+        "博士以上":0,
+        "其他":0,
+    };
+
+    if (data && data[0]) {
+        qyyghx["专科"] = data[0].zhuanKe || 0;
+        qyyghx["本科"] = data[0].benKe || 0;
+        qyyghx["硕士"] = data[0].shuoshi || 0;
+        qyyghx["博士"] = data[0].boShi || 0;
+        qyyghx["博士以上"] = data[0].boshiyishang || 0;
+        qyyghx["其他"] = data[0].qiTa || 0;
     }
    
+
+
+    // for (let key in DEGREE) {
+    //     let anyKey: any = key;
+    //     if (isNaN(anyKey)) {
+    //         let keyStr = key;
+    //         if (!qyyghx[keyStr]) qyyghx[keyStr] = 0;
+    //         let degree = DEGREE[key];
+    //         data.forEach(info => {
+    //             let { enterprise_teams } = info;
+    //             if (enterprise_teams && Array.isArray(enterprise_teams)) {
+    //                 enterprise_teams.forEach(team => {
+    //                     if (degree == team.degree) {
+    //                         qyyghx[keyStr] += 1;
+    //                     }
+    //                 })
+    //             }
+    //         })
+    //     }
+    // }
+
     return qyyghx;
 }