no message

src/biz/enterprise/enterprise.ts

@@ -122,7 +122,7 @@ export async function getEnterpriseByUscc(uscc:string) {
     let dataBaseInfo = await findEnterpriseByUscc(uscc);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在${uscc}这个企业`);
 
-    let data = extractData(EnterpriseInfoConfig, dataBaseInfo);
+    let data = extractData(EnterpriseInfoConfig, dataBaseInfo, false);
 
     return {data};
 }
@@ -182,7 +182,7 @@ export async function enterpriseList(createType:number, fuHuaQiUscc:string, indu
     let dataList = [];
 
     dataBaseList.forEach( info => {
-        let changeData:any = extractData(EnterpriseListConfig, info);
+        let changeData:any = extractData(EnterpriseListConfig, info, true);
         changeData.fuhuaqiUscc = usccMap[changeData.fuhuaqiUscc] || "";
         (changeData.isCreate) ? changeData.isCreate = "新注册" : changeData.isCreate = "新迁入";
 
@@ -230,7 +230,7 @@ export async function outPutEnterpriseData(createType:number, fuHuaQiUscc:string
     let dataBaseList = await findEnterpriseList(selectParam );
     let dataList = [];
     dataBaseList.forEach( info => {
-        let changeData:any = extractData(EnterpriseListConfig, info);
+        let changeData:any = extractData(EnterpriseListConfig, info, true);
         changeData.fuhuaqiUscc = usccMap[changeData.fuhuaqiUscc] || "";
         dataList.push(changeData);
     });

src/biz/enterprise/financing.ts

@@ -12,9 +12,9 @@ import { FinancingListConfig } from "../../config/ojbectResultKeyConfig";
 import { BizError } from "../../util/bizError";
 import { changeEnumValue, checkChange, checkParamater, extractData, getTaskId } from "../../util/tools";
 import { findEnterpriseInfoByName, findEnterpriseListByFuHuaQiUsccName } from "../../data/enterprise/enterprise";
-import { findFuHuaQiByName } from "../../data/fuHuaQi/fuhuaqi";
+import { findAllFuHuaQiOperationNameMap, findFuHuaQiByName } from "../../data/fuHuaQi/fuhuaqi";
 import moment = require("moment");
-import { FUHUAINDUSTRY, OUTPUTTYPE } from "../../config/enum";
+import { FUHUAINDUSTRY, INDUSTRY, OUTPUTTYPE } from "../../config/enum";
 
 
 /**
@@ -25,7 +25,7 @@ import { FUHUAINDUSTRY, OUTPUTTYPE } from "../../config/enum";
  * @returns {isSuccess:true/false}
  */
 export async function createFinancingInfo(uscc:string, param) {
-    checkParamater("录入企业融资信息", FinancingParamConfig, param, ["fuHuaQiInvestmentAmount", "fuHuaQiInvestmentStyle"]);
+    checkParamater("录入企业融资信息", FinancingParamConfig, param, ["fuHuaQiInvestment", "fuHuaQiInvestmentAmount", "fuHuaQiInvestmentStyle"]);
 
     if (param.fuHuaQiInvestment) {
         let subCheckName = "录入企业融资信息_孵化器是否参与";
@@ -33,7 +33,7 @@ export async function createFinancingInfo(uscc:string, param) {
             fuHuaQiInvestmentAmount:param.fuHuaQiInvestmentAmount,
             fuHuaQiInvestmentStyle:param.fuHuaQiInvestmentStyle,
         };
-        checkParamater(subCheckName, {fuHuaQiInvestmentAmount:"String", fuHuaQiInvestmentStyle:"String"}, subCheckData);
+        checkParamater(subCheckName, {fuHuaQiInvestmentAmount:"Number", fuHuaQiInvestmentStyle:"Number"}, subCheckData);
     } else {
         param.fuHuaQiInvestmentAmount = 0;
         param.fuHuaQiInvestmentStyle = 0;
@@ -50,7 +50,7 @@ export async function createFinancingInfo(uscc:string, param) {
     let dataBaseInfo = await findFinancingInfoByTaskIdAndSucc(TaskId, param.uscc);
     if ( dataBaseInfo&& dataBaseInfo.uscc) throw new BizError(ERRORENUM.该企业当月数据已存在, `${param.uscc}的融资信息已经存在`);
 
-    await createFinancing(uscc, TaskId, param);
+    await createFinancing(uscc, TaskId, enterpriseInfo.uscc, enterpriseInfo.logonTime, param);
 
     return {isSuccess:true};
 }
@@ -108,7 +108,7 @@ export async function getEnterpriseFinancingByUscc(fuHuaQiUscc:string, uscc:stri
     let dataBaseInfo = await findFinancingInfoByTaskIdAndSucc(TaskId, uscc);
     if (!dataBaseInfo || !dataBaseInfo.uscc) throw new BizError(ERRORENUM.未找到数据, `库中不存在${uscc}这个企业的本次融资数据`);
 
-    let data = extractData(EnterpriseFinancingInfoConfig, dataBaseInfo);
+    let data = extractData(EnterpriseFinancingInfoConfig, dataBaseInfo, false);
 
     return {data};
 }
@@ -190,11 +190,14 @@ export async function financingList(monthData:string, fuHuaQiName:string, indust
 
     let dataBaseList = await findFinancingListToPage(selectParam, (page-1)*10 );
     let count = await findFinancingCount(selectParam);
+    let usccMap = await findAllFuHuaQiOperationNameMap();
+    
     let dataList = [];
     dataBaseList.forEach( info => {
-        let changeData:any = extractData(FinancingListConfig, info);
+        let changeData:any = extractData(FinancingListConfig, info, true);
         
-        changeData.industry = changeEnumValue(FUHUAINDUSTRY, changeData.industry);
+        changeData.fuhuaqiUscc = usccMap[changeData.fuhuaqiUscc] || "";
+        changeData.industry = changeEnumValue(INDUSTRY, changeData.industry);
         dataList.push(changeData);
     });
 
@@ -240,7 +243,7 @@ export async function outPutFinancingList(monthData:string, fuHuaQiName:string,
     let dataBaseList = await findFinancingList(selectParam );
     let dataList = [];
     dataBaseList.forEach( info => {
-        let changeData = extractData(FinancingListConfig, info);
+        let changeData = extractData(FinancingListConfig, info, true);
         dataList.push(changeData);
     });
 

src/biz/fuHuqQi/base.ts

@@ -25,7 +25,7 @@ import { ERRORENUM } from "../../config/errorEnum";
 export async function homeData(uscc:string) {
     let dataBaseInfo = await findFuHuaQiByUSCC(uscc);
 
-    let data:any = extractData(FuHuaQiHomeDataConfig, dataBaseInfo);
+    let data:any = extractData(FuHuaQiHomeDataConfig, dataBaseInfo, false);
 
     data.enterpriseCount  = await findEnterpriseCountByFuHuaQiUscc(uscc);
     data.lv = tools.changeEnumValue(FUHUAQILV, dataBaseInfo.lv);
@@ -46,7 +46,7 @@ export async function selectFuHuaQiBaseData(uscc:string) {
 
     let enterpriseTotal = await findEnterpriseCountByFuHuaQiUscc(uscc); //企业总数
     
-    let data:any = extractData(FuHuaQiBaseDataConfig, dataBaseInfo);
+    let data:any = extractData(FuHuaQiBaseDataConfig, dataBaseInfo, false);
     
     data.enterpriseTotal = enterpriseTotal;
     data.numOfEntities = enterpriseTotal - dataBaseInfo.virtualEnterpriseNum; //企业总数 - 虚拟企业数量
@@ -117,7 +117,7 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
     let dataList = [];
 
     dataBaseList.forEach( info => {
-        let changeData:any = tools.extractData(FuHuaQiBaseListConfig, info);
+        let changeData:any = tools.extractData(FuHuaQiBaseListConfig, info, true);
         // let hatchingGround = info.hatchingGround;
         // hatchingGround.forEach (info => {
         //     let {personInChargeAdd, siteAcreage, leasePrice} = info;
@@ -166,7 +166,7 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe
     let dataList = [];
 
     dataBaseList.forEach( info => {
-        let changeData:any = tools.extractData(FuHuaQiBaseListConfig, info);
+        let changeData:any = tools.extractData(FuHuaQiBaseListConfig, info, true);
 
         let enterpriseTotal = enterpriseMap[info.uscc] || 0;
         let numOfEntities = enterpriseTotal - (info.virtualEnterpriseNum || 0 );

src/config/ojbectResultKeyConfig.ts

@@ -92,6 +92,7 @@ export const FinancingListConfig = {
     fuHuaQiInvestmentStyle:{key:"孵化器投资方式"},
     createTime:{key:"录入时间 不可修改", changeDate:true},
     industry:{key:"行业领域[] 最多 选择三个"},
+    logonTime:{key:"注册时间", changeDate:true}
 }
 
 /**

src/data/enterprise/financing.ts

@@ -23,6 +23,7 @@ const financingSchema = new Schema({
     draftLock:{type:Boolean, default:false},//草稿锁，true为提交之后，false为草稿
     createTime:Number,//录入时间
     industry:[Number],//领域
+    logonTime:Number,//注册时间
 });
 
 var financingModel;
@@ -84,8 +85,9 @@ export async function updateFinancingDraftLock(taskId:string) {
  * @param taskId 任务id 格式遵循tool中getTaskId
  * @param param 所添加表单 需要提前验证
  */
-export async function createFinancing(fuHuaQiUscc:string, taskId:string, param) {
-    let addInfo = Object.assign({fuHuaQiUscc, taskId, createTime:new Date().valueOf()}, param);
+export async function createFinancing(fuHuaQiUscc:string, taskId:string, uscc:string, logonTime:number, param) {
+    let addInfo = Object.assign({fuHuaQiUscc, taskId, uscc, logonTime, createTime:new Date().valueOf()}, param);
+    if (logonTime) addInfo.logonTime = logonTime;
     await financingModel.create(addInfo);
 }
 

src/util/tools.ts

@@ -208,15 +208,16 @@ export function getToken(uscc:string) {
  * @param data 
  * @returns 
  */
-export function extractData(conf, data) {
+export function extractData(conf, data, isAdmin) {
     let result = {};
     for (let key in conf) {
         let confInfo = conf[key];
         if (confInfo.changeDate) {
-            result[key] = moment(data[key]).format("YYYY-MM-DD");
+            if (isAdmin) result[key] = moment(data[key]).format("YYYY-MM-DD");
+            else result[key] = data[key] || 0;
         }else {
             result[key] = data[key];
-            if (!result[key]) result[key] = '';
+            if (typeof result[key] == 'string' && !result[key]) result[key] = '';
         }
     }
     return result;