no message

src/biz/admin.ts

@@ -668,7 +668,7 @@ export async function qiyeRenZheng(enterpriseName, page) {
         selectParam.enterpriseName = {"%like%":enterpriseName};
     }
     let manyTableInfo:any = {};
-    let manyTableColumn = ["kxState","kxTime","kxNumber","kxImg", "zjtxState","zjtxTime","zjtxImg",
+    let manyTableColumn = ["qId", "kxState","kxTime","kxNumber","kxImg", "zjtxState","zjtxTime","zjtxImg",
         "xjrState", "xjrTime","xjrImg","xjrPyState", "xjrPyTime","xjrPyImg",
         "gxjsState","gaoXinJiShuTime","gaoXinJiShuImg","listedState", "goPublicTime", "goPublicSector","other"];
     manyTableInfo[TABLENAME.企业资质] = {column:manyTableColumn, where:{} };
@@ -677,9 +677,9 @@ export async function qiyeRenZheng(enterpriseName, page) {
     let allDataList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, ["enterpriseName", "uscc"], manyTableInfo);
     
     let dataList = [];
-    resInfo.forEach(info => {
-        let {uscc, enterpriseName, enterprise_qualifications} = info;
-        let addItem = {
+    for (let res = 0; res < resInfo.length; res++) {
+        let {uscc, enterpriseName, enterprise_qualifications} = resInfo[res];
+        let addItem:any = {
             uscc, 
             enterpriseName, 
             kxTime:"-",
@@ -701,12 +701,41 @@ export async function qiyeRenZheng(enterpriseName, page) {
             gaoXinJiShuTime:"-",
             listedState:"否",
             other:"",
-            goPublicSector:[],
+            goPublicSector:"",
         };
 
         let imgConf = ["kxImg", "zjtxImg", "xjrImg", "xjrPyImg", "gaoXinJiShuImg"];
+
+        let updateInfo:any = {};
         for (let i = 0; i < enterprise_qualifications.length; i++) {
             let item = enterprise_qualifications[i];
+            /**状态与时间逻辑不对的话，修改状态 */
+            if (item.kxTime && item.kxState != enumConfig.STATE.否) {
+                updateInfo.kxState = enumConfig.STATE.是;
+                item.kxState = enumConfig.STATE.是;
+            }
+            if (item.zjtxTime && item.zjtxState != enumConfig.STATE.否) {
+                updateInfo.zjtxState = enumConfig.STATE.是;
+                item.zjtxState = enumConfig.STATE.是;
+            }
+            if (item.xjrTime && item.xjrState != enumConfig.STATE.否) {
+                updateInfo.xjrState = enumConfig.STATE.是; 
+                item.xjrState = enumConfig.STATE.是; 
+            }
+            if (item.xjrPyTime && item.xjrPyState != enumConfig.STATE.否) {
+                updateInfo.xjrPyState = enumConfig.STATE.是; 
+                item.xjrPyState = enumConfig.STATE.是; 
+            }
+            if (item.goPublicTime && item.listedState != enumConfig.STATE.否) {
+                updateInfo.listedState = enumConfig.STATE.是; 
+                item.listedState = enumConfig.STATE.是; 
+            }
+            if (item.gaoXinJiShuTime && item.gxjsState != enumConfig.STATE.否) {
+                updateInfo.gxjsState = enumConfig.STATE.是; 
+                item.gxjsState = enumConfig.STATE.是; 
+            }
+            await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.租赁信息, updateInfo, {qId:item.qId});
+
             if (item.kxTime) addItem.kxTime = moment(item.kxTime).format("YYYY");
             if (item.kxState) addItem.kxState = changeEnumValue(enumConfig.STATE, item.kxState);
             // if (item.kxImg) addItem.kxImg = JSON.parse(item.kxImg);
@@ -731,8 +760,11 @@ export async function qiyeRenZheng(enterpriseName, page) {
             // if (item.gaoXinJiShuImg) addItem.gaoXinJiShuImg = JSON.parse(item.gaoXinJiShuImg);
 
             if (item.goPublicSector && item.goPublicSector != "[]") {
-                addItem.goPublicSector = changeEnumValue(enumConfig.FINANCINGROUNDS, JSON.parse(item.goPublicSector));
+                // if (!addItem.goPublicSector) addItem.goPublicSector = [];
+                addItem.goPublicSector = changeEnumValue(enumConfig.LISTINGSITUATION, JSON.parse(item.goPublicSector));
             }
+            if (item.other) addItem.other = item.other;
+            if (item.kxNumber) addItem.kxNumber = item.kxNumber;
 
             for (let j = 0; j < imgConf.length; j++) {
                 let imgKey = imgConf[j];
@@ -745,17 +777,14 @@ export async function qiyeRenZheng(enterpriseName, page) {
             }
 
             dataList.push(addItem);
-        };
-    });
+        }
+    };
 
     return {dataList, dataCount:allDataList.length}; 
 }
 
 
 
-
-
-
 export async function enterpriseHonor(enterpriseName, page) {
     let selectParam:any = {};
     let manyTableInfo:any = {};
@@ -778,8 +807,8 @@ export async function enterpriseHonor(enterpriseName, page) {
             awardName, awardingUnit, 
             awardTime:moment(awardTime).format("YYYY"), 
             awardLevel:changeEnumValue(enumConfig.AWARDLEVEL,awardLevel),
-            // awardImg:JSON.parse(awardImg),
-            awardImg:JSON.parse(JSON.parse(awardImg)),
+            awardImg:JSON.parse(awardImg),
+            // awardImg:JSON.parse(JSON.parse(awardImg)),
         };
         
         dataList.push(addItem);

src/biz/zaiFu.ts

@@ -63,8 +63,9 @@ export async function getDetails(eId:string) {
         enterprise: await enterpriseById(eId),
         manage: await enterpriseManageById(eId),
         financing: await enterpriseFinancingById(eId),
-        talent: await enterpriseTalentById(eId),
-        service: await enterpriseServiceById(eId),
+        honor: await enterpriseHonorById(eId),
+        // talent: await enterpriseTalentById(eId),
+        // service: await enterpriseServiceById(eId),
     }
 
     return details;
@@ -260,6 +261,51 @@ export async function enterpriseFinancingById(eId:string) {
 
 
 /**
+ * 在孵企业详情 荣誉奖项
+ * @param eId 
+ * @returns 
+ */
+ export async function enterpriseHonorById(eId:string) {
+    let manyTableInfo:any = {};
+    manyTableInfo[TABLENAME.企业基础信息表] = {column:["enterpriseName" ], where:{eId} };
+    let filesList = ["awardName", "awardingUnit", "awardTime", "awardLevel"];
+    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业荣誉, {eId}, filesList, manyTableInfo);
+
+    let dataList = [];
+    resInfo.forEach(info => {
+        let {awardName, awardingUnit, awardTime, awardLevel, enterprise} = info;
+
+        let dataInfo = [
+            {
+                key:"企业名称",
+                value:enterprise.enterpriseName
+            },
+            {
+                key:"获奖名称",
+                value:awardName
+            },
+            {
+                key:"颁奖单位",
+                value:awardingUnit
+            },
+            {
+                key:"奖项等级",
+                value:changeEnumValue(enumConfig.AWARDLEVEL, awardLevel)
+            },
+            {
+                key:"奖项时间",
+                value:awardTime ? moment(awardTime).format("YYYY") : "-"
+            },
+        ]
+
+        dataList.push(dataInfo);
+    });
+
+    return dataList;
+}
+
+
+/**
  * 在孵企业详情 创始团队
  * @param eId 
  * @returns 
@@ -422,8 +468,9 @@ export async function getAllDwOutPut(eId:string) {
         enterprise: await dwBasicInformation(eId),
         manage: await dwBusinessData(eId),
         financing: await dwFinancingSituatione(eId),
-        talent: await dwEnterpriseTeam(eId),
-        service: await dwEnterpriseService(eId),
+        honor: await dwHonorById(eId),
+        // talent: await dwEnterpriseTeam(eId),
+        // service: await dwEnterpriseService(eId),
     }
 
     return details;
@@ -495,18 +542,16 @@ export async function dwBasicInformation(eId:string) {
  */
 
 export async function dwBusinessData(eId:string) {
-
-    let files = [{key:"企业名称",value:"enterpriseName"},
-                {key:"统一信用代码",value:"uscc"},
-                {key:"营收（万元）",value:"BI"},
-                {key:"纳税（万元）",value:"TXP"},
-                {key:"研发投入（万元）",value:"RD"},
-                {key:"季度",value:"annual"},
-                // {key:"审核状态",value:"state"},
-                // {key:"审核时间",value:"auditTime"}
-                ];
-
-    let selectParam:any = {eId};
+    let files = [
+        {key:"企业名称",value:"enterpriseName"},
+        {key:"统一信用代码",value:"uscc"},
+        {key:"营收（万元）",value:"BI"},
+        {key:"纳税（万元）",value:"TXP"},
+        {key:"研发投入（万元）",value:"RD"},
+        {key:"季度",value:"annual"},
+        // {key:"审核状态",value:"state"},
+        // {key:"审核时间",value:"auditTime"}
+    ];
     
     let filesList = ["enterpriseName", "uscc", "BI", "TXP", "RD", "annual","quarter"];
     let manyTableInfo:any = {};
@@ -563,7 +608,6 @@ export async function dwFinancingSituatione(eId: string) {
 
     let selectParam:any = {eId};
    
-    
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.企业融资] = {column:["financingAmount", "financingRounds", "investmentDate", "investmentInstitutionsName" ], where:{eId} };
     let filesList = ["enterpriseName","uscc"];
@@ -598,13 +642,57 @@ export async function dwFinancingSituatione(eId: string) {
 
 }
 
+
+/**
+ * 下载单企业荣誉奖项
+ * @param eId 
+ * @returns 
+ */
+ export async function dwHonorById(eId:string) {
+    let files = [
+        {key:"企业名称",value:"enterpriseName"},
+        {key:"获奖名称",value:"awardName"},
+        {key:"颁奖单位",value:"awardingUnit"},
+        {key:"奖项等级",value:"awardLevel"},
+        {key:"奖项时间",value:"awardTime"},
+    ];
+
+    let manyTableInfo:any = {};
+    manyTableInfo[TABLENAME.企业基础信息表] = {column:["enterpriseName" ], where:{eId} };
+    let filesList = ["awardName", "awardingUnit", "awardTime", "awardLevel"];
+    let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业荣誉, {eId}, filesList, manyTableInfo);
+
+    let dataList = [];
+    let titleList = []
+    let valueList = [];
+    files.forEach(item => {
+        titleList.push(item.key);
+        valueList.push(item.value);
+    });
+    dataList.push(titleList);
+    resInfo.forEach(info => {
+        let {awardName, awardingUnit, awardTime, awardLevel, enterprise} = info;
+        let subList = [];
+        valueList.forEach(subInfo => {
+            if (subInfo == "enterpriseName") subList.push(enterprise.enterpriseName);//企业名称
+            if (subInfo == "awardName") subList.push(awardName);//获奖名称
+            if (subInfo == "awardingUnit") subList.push(awardingUnit);//颁奖单位
+            if (subInfo == "awardTime") subList.push(moment(awardTime).format("YYYY"));//奖项时间
+            if (subInfo == "awardLevel") subList.push(changeEnumValue(enumConfig.AWARDLEVEL, awardLevel));//奖项等级
+        });
+        dataList.push(subList);
+    })
+
+    return {dataList};
+}
+
+
 /**
  * 下载单企业创始团队
  * @param name
  * @return
  */
 export async function dwEnterpriseTeam(eId:string) {
-
     let files = [
         {key:"姓名",value:"name"},
         {key:"性别",value:"sex"},
@@ -613,8 +701,6 @@ export async function dwEnterpriseTeam(eId:string) {
         {key:"毕业学校",value:"graduationSchool"},
         {key:"企业名称",value:"enterpriseName"},
     ];
-
-    let selectParam:any = {eId};
     
     let manyTableInfo:any = {};
     manyTableInfo[TABLENAME.企业基础信息表] = {column:["enterpriseName" ], where:{eId} };
@@ -630,10 +716,10 @@ export async function dwEnterpriseTeam(eId:string) {
     });
     dataList.push(titleList);
     resInfo.forEach(info => {
-        let {name,sex,birth,degree,graduationSchool,enterpriseName} = info;
+        let {name,sex,birth,degree,graduationSchool,enterprise} = info;
         let subList = [];
         valueList.forEach(subInfo => {
-            if (subInfo == "enterpriseName") subList.push(enterpriseName);//企业名称
+            if (subInfo == "enterpriseName") subList.push(enterprise.enterpriseName);//企业名称
             if (subInfo == "name") subList.push(name);//姓名
             if (subInfo == "sex") subList.push(changeEnumValue(enumConfig.SEX, sex));//性别
             if (subInfo == "birth") subList.push(moment(birth).format("YYYY-MM-DD"));//出生日期
@@ -680,10 +766,10 @@ export async function dwEnterpriseService(eId: string) {
     });
     dataList.push(titleList);
     resList.forEach(info => {
-        let {enterpriseName,needCategory,applyTime,followUpStatus,resolveTime,needContent} = info;
+        let {enterprise,needCategory,applyTime,followUpStatus,resolveTime,needContent} = info;
         let subList = [];
         valueList.forEach(subInfo => {
-            if (subInfo == "enterpriseName") subList.push(enterpriseName);//公司名称
+            if (subInfo == "enterpriseName") subList.push(enterprise.enterpriseName);//公司名称
             if(subInfo == "needCategory") subList.push(needCategory);//需求类别
             if(subInfo == "applyTime") subList.push(applyTime);//申请时间
             if(subInfo == "followUpStatus") subList.push(followUpStatus);//跟进状态

src/config/enum/enum.ts

@@ -35,7 +35,8 @@ export enum DEGREE {
     专科 = 1,
     本科,
     硕士,
-    博士
+    博士,
+    博士以上,
 }
 
 /**
@@ -119,7 +120,7 @@ export enum FOLLOWUPSTATUS {
  */
 export enum NEEDCATEGORY {
     // 物业服务 = 1,
-    工商税务 = 1,
+    工商税务 = 2,
     代理记账,
     贷款服务,
     法律服务,
@@ -151,6 +152,11 @@ export enum FINANCINGROUNDS {
 }
 
 
+export enum OUTCOME {
+    未解决 = 0,
+    已解决
+}
+
 
 export enum STATE {
     否 = 0,
@@ -179,6 +185,25 @@ export enum INTELLECTUALPROPERTYRIGHT {
 }
 
 
+/**
+ * 知识产权类型 前端用
+ */
+ export enum IPRTYPECLIENT {
+    其他 = 0, 
+    软件著作 = 1,
+    发明专利,
+    海外专利,
+}
+
+/**
+ * 知识产权类型其他 前端用
+ */
+export enum IPRTYPECLIENTQT {
+    植物新品种 = 4,
+    集成电路布图
+    
+}
+
 
 /**
  * 知识产权及专利
@@ -203,3 +228,7 @@ export enum INTELLECTUALPROPERTYRIGHT {
     icLayout
 }
 
+
+
+
+

src/routers/public.ts

@@ -23,6 +23,9 @@ const config = {
     "/public/output/enterprisetalent":outputEnumConfig.ENTERPRISETALENT,
     "/public/output/enterpriseservice":outputEnumConfig.ENTERPRISESERVICE,
     "/public/output/ipropertytype":enumConfig.IPROPERTYTYPE,//知识产权及专利类型
+    "/public/intellectualpropertyright":enumConfig.INTELLECTUALPROPERTYRIGHT,// 新增知识产权类型
+    "/public/iprtypeclient":enumConfig.IPRTYPECLIENT,// 新增知识产权类型
+    "/public/iprtypeclientqt":enumConfig.IPRTYPECLIENTQT,// 新增知识产权类型
     
     
     // "/public/output/basedata":outputEnumConfig.BASEDATA,