3.1 经营数据展示接口

src/biz/mobileFuHuaQi/fuHuaQi/fuHuaQiBusiness.ts

@@ -2,6 +2,7 @@
  * 孵化器经营数据填报
  * 
  */
+import moment = require("moment");
 import { FuHuaQiBusinessDataConfig } from "../../../config/eccFormParamConfig";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { FuHuaQiBusinessDataInfoConfig } from "../../../config/splitResultConfig";
@@ -70,7 +71,7 @@ export async function selectBusiness(uscc:string) {
     if ( !businessInfo.isUpdate ) throw new BizError(ERRORENUM.请先填报数据, `孵化器 ${uscc}调用回显接口时经营数据不存在`);
     if ( businessInfo.draftLock ) throw new BizError(ERRORENUM.已提交的数据不能进行操作, `孵化器 ${uscc}尝试 回显 已经提交的经营数据`);
 
-    let businessData = extractData(FuHuaQiBusinessDataInfoConfig, businessInfo, false)
+    let businessData = extractData(FuHuaQiBusinessDataInfoConfig, businessInfo, false);
 
     return {businessData};
 }
@@ -95,4 +96,16 @@ export async function updateBusiness(uscc:string, param) {
     await businessInfo.save();
     
     return {isSuccess:true};
+}
+
+
+
+export async function showBusinessData(uscc:string, year:number, quarter:number) {
+
+    let taskId = sysTools.getQuarterTaskIdByYearAndQuarter(uscc, year, quarter);
+    let businessInfo = await findBusinessByTaskId(taskId);
+
+    let businessData = extractData(FuHuaQiBusinessDataInfoConfig, businessInfo, false);
+
+    return {businessData};
 }
\ No newline at end of file

src/config/eccFormParamConfig.ts

@@ -20,10 +20,10 @@ export const BaseParamUpdateConfig = {
     hatchingGround:{type:"[Object]", notMustHave:true},//经备案孵化场地
     // isProfessionalTechnology:{type:"Boolean", notMustHave:true},//是否专业技术平台
     // professionalTechnologyName:{type:"String", notMustHave:true},//专业技术平台名称
-    cooperationInstitutions:{type:"String", notMustHave:true},//合作机构名称
-    isCooperation:{type:"Boolean", notMustHave:true},//是否与第三方机构合作
     // professionalTechnologyCreateTime:{type:"Number", notMustHave:true},//时间  年份 xxxx年01月01日 的时间戳
     // professionalTechnologyAmount:{type:"Number", notMustHave:true},//投资金额 万元
+    cooperationInstitutions:{type:"String", notMustHave:true},//合作机构名称
+    isCooperation:{type:"Boolean", notMustHave:true},//是否与第三方机构合作
 };
 /**
  * 使用端:   小程序端【孵化器入口】

src/data/fuHuaQi/quarterTask/businessData.ts

@@ -62,4 +62,4 @@ export async function findBusinessByTaskId(taskId:string) {
 
 export async function findBusinessListByTaskIdAndUpdate(taskId:string, isUpdate:boolean) {
     return await fuHuaQiBusinessModel.find({taskId, isUpdate});
-}
\ No newline at end of file
+}

src/routers/mobileClient/business.ts

@@ -8,6 +8,9 @@ import { eccReqParamater } from '../../util/verificationParam';
 import { checkFuHuaQiToken } from '../../middleware/user';
 
 export function setRouter(httpServer) {
+    /**我的数据展示 */
+    httpServer.post('/fuhuaqi/business/show', checkFuHuaQiToken, asyncHandler(showBusiness));
+    /**表单 */
     httpServer.post('/fuhuaqi/business/addreport', checkFuHuaQiToken, asyncHandler(addreportBusiness));
     httpServer.post('/fuhuaqi/business/updatereport', checkFuHuaQiToken, asyncHandler(updatereportBusiness));
     httpServer.post('/fuhuaqi/business/deletereport', checkFuHuaQiToken, asyncHandler(deletereportBusiness));
@@ -15,6 +18,20 @@ export function setRouter(httpServer) {
 }
 
 
+/**
+ *  展示孵化器经营数据
+ * @param req 
+ * @param res 
+ */
+async function showBusiness(req, res) {
+    let reqConf = {year: 'Number', quarter: 'Number' };
+    let { year, quarter } = eccReqParamater(reqConf, req.body);
+    const Uscc = req.headers.uscc;
+
+    let monthInfo = fuHuaQiBusinessBiz.showBusinessData(Uscc,  year, quarter);
+    res.success(monthInfo);
+}
+
 
 /**
  *  添加孵化器经营数据

src/tools/system.ts

@@ -38,9 +38,12 @@ export function getQuarterTimeKey() {
 }
 
 export function getQuarterTaskIdByTime(uscc:string, timeMs:number) {
-    return `${uscc}${new Date(timeMs).getFullYear()}${moment(timeMs).quarter() }`;
+    return `${uscc}${new Date(timeMs).getFullYear()}0${moment(timeMs).quarter() }`;
 }
 
+export function getQuarterTaskIdByYearAndQuarter(uscc:string, year:number, quarter:number) {
+    return `${uscc}${year}0${quarter }`;
+}
 
 /**
  * 根据时间生成任务id