Commit 7eae744f by 孙香冬

no message

parent 61683344
...@@ -14,7 +14,7 @@ import { changeEnumValue, checkChange, checkParamater, extractData, getTaskId } ...@@ -14,7 +14,7 @@ import { changeEnumValue, checkChange, checkParamater, extractData, getTaskId }
import { findEnterpriseInfoByName, findEnterpriseListByFuHuaQiUsccName } from "../../data/enterprise/enterprise"; import { findEnterpriseInfoByName, findEnterpriseListByFuHuaQiUsccName } from "../../data/enterprise/enterprise";
import { findAllFuHuaQiOperationNameMap, findFuHuaQiByName } from "../../data/fuHuaQi/fuhuaqi"; import { findAllFuHuaQiOperationNameMap, findFuHuaQiByName } from "../../data/fuHuaQi/fuhuaqi";
import moment = require("moment"); import moment = require("moment");
import { FINANCINGROUNDS, FUHUAINDUSTRY, INDUSTRY, OUTPUTTYPE } from "../../config/enum"; import { FINANCINGROUNDS, FUHUAINDUSTRY, FUHUAQILNVESTMENTSTYLE, INDUSTRY, OUTPUTTYPE } from "../../config/enum";
/** /**
...@@ -199,6 +199,7 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust ...@@ -199,6 +199,7 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
changeData.fuhuaqiUscc = usccMap[info.fuHuaQiUscc] || ""; changeData.fuhuaqiUscc = usccMap[info.fuHuaQiUscc] || "";
changeData.industry = changeEnumValue(INDUSTRY, info.industry); changeData.industry = changeEnumValue(INDUSTRY, info.industry);
changeData.financingRounds = changeEnumValue(FINANCINGROUNDS, info.financingRounds); changeData.financingRounds = changeEnumValue(FINANCINGROUNDS, info.financingRounds);
changeData.fuHuaQiInvestmentStyle = changeEnumValue(FUHUAQILNVESTMENTSTYLE, info.fuHuaQiInvestmentStyle);
dataList.push(changeData); dataList.push(changeData);
}); });
......
...@@ -133,6 +133,9 @@ export async function updateOrganizationData(uscc:string, param) { ...@@ -133,6 +133,9 @@ export async function updateOrganizationData(uscc:string, param) {
baseDataInfo[key] = param[key]; baseDataInfo[key] = param[key];
} }
baseDataInfo["foundingTeam"] = param.foundingTeam; baseDataInfo["foundingTeam"] = param.foundingTeam;
if (param.foundingTeam && param.foundingTeam.length > 0) {
baseDataInfo.foundingTeamType = param.foundingTeam[0].type;
} else baseDataInfo.foundingTeamType = 0;
await baseDataInfo.save(); await baseDataInfo.save();
...@@ -155,7 +158,7 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind ...@@ -155,7 +158,7 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
if (institutionalNature) selectParam.institutionalNature = institutionalNature; if (institutionalNature) selectParam.institutionalNature = institutionalNature;
if (industry) selectParam.industry = industry; if (industry) selectParam.industry = industry;
if (operationModel) selectParam.operationModel = operationModel; if (operationModel) selectParam.operationModel = operationModel;
if (foundingTeam) selectParam.foundingTeam = foundingTeam; if (foundingTeam) selectParam.foundingTeamType = foundingTeam;
let enterpriseMap = await groupFindEnterprise();//企业总数 let enterpriseMap = await groupFindEnterprise();//企业总数
...@@ -189,16 +192,22 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind ...@@ -189,16 +192,22 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
changeData.operationModel = changeData.operationModel.replace("_","+"); changeData.operationModel = changeData.operationModel.replace("_","+");
} }
changeData.foundingTeam = "无"; changeData.foundingTeamStr = "无";
let foundingTeam = [];
if (changeData.foundingTeam && changeData.foundingTeam.length) { if (changeData.foundingTeam && changeData.foundingTeam.length) {
changeData.foundingTeam.forEach(item => { changeData.foundingTeam.forEach(item => {
item.type = tools.changeEnumValue(TEAM, item.foundingTeam);//人才类型 let {memberName, memberAge, memberSchool, des} = item;
item.memberSex = tools.changeEnumValue(SEX, item.memberSex);//成员性别 let type = tools.changeEnumValue(TEAM, item.type);//人才类型
item.memberDEGREE = tools.changeEnumValue(DEGREE, item.memberDEGREE);//成员最高学历 foundingTeam.push({
memberName, memberAge, memberSchool, des, type,
memberSex : tools.changeEnumValue(SEX, item.memberSex),//成员性别
memberDEGREE : tools.changeEnumValue(DEGREE, item.memberDEGREE),//成员最高学历
});
// item.memberDEGREE = tools.changeEnumValue(DEGREE, item.foundingTeamStr);//成员最高学历 // item.memberDEGREE = tools.changeEnumValue(DEGREE, item.foundingTeamStr);//成员最高学历
/* 这里兼容了一下,团队类型数据库里存到了每一个人的信息里 以防后续要修改 */ /* 这里兼容了一下,团队类型数据库里存到了每一个人的信息里 以防后续要修改 */
changeData.foundingTeamStr = item.type; changeData.foundingTeamStr = type;
}); });
changeData.foundingTeam = foundingTeam;
} }
dataList.push(changeData); dataList.push(changeData);
...@@ -249,12 +258,22 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe ...@@ -249,12 +258,22 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe
changeData.operationModel = changeData.operationModel.replace("_","+"); changeData.operationModel = changeData.operationModel.replace("_","+");
} }
changeData.foundingTeamStr = "无";
let foundingTeam = [];
if (changeData.foundingTeam && changeData.foundingTeam.length) { if (changeData.foundingTeam && changeData.foundingTeam.length) {
changeData.foundingTeam.forEach(item => { changeData.foundingTeam.forEach(item => {
item.type = tools.changeEnumValue(TEAM, item.type);//人才类型 let {memberName, memberAge, memberSchool, des} = item;
item.memberSex = tools.changeEnumValue(SEX, item.memberSex);//成员性别 let type = tools.changeEnumValue(TEAM, item.type);//人才类型
item.memberDEGREE = tools.changeEnumValue(DEGREE, item.memberDEGREE);//成员最高学历 foundingTeam.push({
memberName, memberAge, memberSchool, des, type,
memberSex : tools.changeEnumValue(SEX, item.memberSex),//成员性别
memberDEGREE : tools.changeEnumValue(DEGREE, item.memberDEGREE),//成员最高学历
});
// item.memberDEGREE = tools.changeEnumValue(DEGREE, item.foundingTeamStr);//成员最高学历
/* 这里兼容了一下,团队类型数据库里存到了每一个人的信息里 以防后续要修改 */
changeData.foundingTeamStr = type;
}); });
changeData.foundingTeam = foundingTeam;
} }
dataList.push(changeData); dataList.push(changeData);
......
...@@ -87,7 +87,7 @@ export async function findEnterpriseListByTaskId(taskId:string) { ...@@ -87,7 +87,7 @@ export async function findEnterpriseListByTaskId(taskId:string) {
* @param taskId 任务id 格式遵循tool中getTaskId * @param taskId 任务id 格式遵循tool中getTaskId
*/ */
export async function updateEnterpriseDraftLock(taskId:string) { export async function updateEnterpriseDraftLock(taskId:string) {
return await enterpriseModel.update({taskId}, {$set:{draftLock:true}}, {upsert:true}); return await enterpriseModel.updateMany({taskId}, {$set:{draftLock:true}}, {upsert:true});
} }
......
...@@ -76,7 +76,7 @@ export async function findFinancingListByTaskId(taskId:string) { ...@@ -76,7 +76,7 @@ export async function findFinancingListByTaskId(taskId:string) {
* @param taskId 任务id 格式遵循tool中getTaskId * @param taskId 任务id 格式遵循tool中getTaskId
*/ */
export async function updateFinancingDraftLock(taskId:string) { export async function updateFinancingDraftLock(taskId:string) {
return await financingModel.update({taskId}, {$set:{draftLock:true}}, {upsert:true}); return await financingModel.updateMany({taskId}, {$set:{draftLock:true}}, {upsert:true});
} }
......
...@@ -46,6 +46,7 @@ const fuHuaQiSchema = new Schema({ ...@@ -46,6 +46,7 @@ const fuHuaQiSchema = new Schema({
personInChargePhone:String,//负责人联系电话 personInChargePhone:String,//负责人联系电话
hatchingGround:{type:[hatchingGroundSchema], default:[] },//经备案孵化场地 hatchingGround:{type:[hatchingGroundSchema], default:[] },//经备案孵化场地
foundingTeam:{type:[foundingTeamSchema], default:[]},//创业团队 foundingTeam:{type:[foundingTeamSchema], default:[]},//创业团队
foundingTeamType:{type:Number, default:0},//创业团队类型
operationModel:{type:[Number], default:[]},//运营模式 operationModel:{type:[Number], default:[]},//运营模式
operationModelDes:String,//运营模式描述 operationModelDes:String,//运营模式描述
/**登录相关 */ /**登录相关 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment