4.2内容添加

src/biz/mobileEnterprise/base/enterprise.ts

@@ -5,7 +5,7 @@
 
 import moment = require("moment");
 import { EnterpriseUpdateBaseDataConfig } from "../../../config/eccParam/enterprise";
-import { INDUSTRY, STATEENUM } from "../../../config/enum";
+import { CYCSRBJ, CYCXFX, INDUSTRY, STATEENUM } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { EnterpriseBaseConfig } from "../../../config/splitResultConfig";
 import * as enterpriseData from "../../../data/enterprise/enterprise";
@@ -122,10 +122,69 @@ export async function updateEnterpriseBaseInfo(uscc:string, param) {
         if (key != "uscc" && key != "name") {
             enterpriseInfo[key] = param[key];
         }
-    });
+    }); 
 
     await enterpriseInfo.save();
     
     return {isSuccess:true};
 }
 
+
+/**
+ * 修改创业创新方向
+ * @param uscc 
+ * @param cycxfx 
+ */
+export async function updateCYCXFX(uscc:string, cycxfx) {
+    eccEnumValue('修改创业创新方向', 'cycxfx', CYCXFX, cycxfx);
+
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
+
+    enterpriseInfo.cycxfx = cycxfx;
+
+    await enterpriseInfo.save();
+
+    return {isSuccess:true};
+}
+
+
+/**
+ * 创业创新方向回显
+ * @param uscc 
+ */
+export async function selectCYCXFX(uscc:string) {
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
+
+    return {cycxfx:enterpriseInfo.cycxfx || []};
+}
+
+
+/**
+ * 修改创业创始人背景
+ * @param uscc 
+ * @param cycxfx 
+ */
+export async function updateCYCSRBJ(uscc:string, cycsrbj) {
+    eccEnumValue('修改创业创始人背景', 'cycsrbj', CYCSRBJ, cycsrbj);
+
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
+
+    enterpriseInfo.cycsrbj = cycsrbj;
+
+    await enterpriseInfo.save();
+
+    return {isSuccess:true};
+}
+
+
+/**
+ * 创业创始人背景回显
+ * @param uscc 
+ */
+export async function selectCYCSRBJ(uscc:string) {
+    let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
+
+    return {cycsrbj:enterpriseInfo.cycsrbj || []};
+}
+
+

src/biz/mobileFuHuaQi/enterprise/myEnterprise.ts

@@ -16,6 +16,11 @@ import { checkChange, extractData } from "../../../util/piecemeal";
 import * as scoreBiz from "../fuHuaQi/score";
 import { FUHUAQINODEENUM, POINTTYPEENUM } from "../../../config/pointConfig";
 import { addPoint } from "../../point";
+import moment = require("moment");
+import { findEnterpriseNewTeamData } from "../../../data/enterprise/quarterTask/team";
+import { EnterpriseTeamConfig } from "../../../config/splitResultConfig";
+import { findBusinessDataByUsccAndYear } from "../../../data/enterprise/quarterTask/businessdata";
+import { selectRepleishData } from "../../../data/enterprise/replenish";
 
 
 
@@ -440,3 +445,128 @@ export async function replenishMyEnterpriseCreateInfo(fuHuaQiUscc:string, param)
 
     return {isSuccess:true};
 }
+
+
+/**
+ * 我的企业入口查看企业资质
+ * @param uscc 企业统一信用代码
+ */
+export async function getMyEnterpriseQualification(uscc:string) {
+    let dataBaseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
+
+    let result = {
+        isHighTech:false,
+        highTechMs:"未获得",//高新技术
+        isZjtx:false,
+        zjtxMs:"未获得",//专精特新
+        isXjrpy:false,
+        xjrpyMs:"未获得",//小巨人培育
+        isXjr:false,
+        xjrMs:"未获得",//小巨人
+        isBeOnTheMarket:"未上市"//是否上市
+    };
+
+    let qualification = dataBaseInfo.qualification;
+    if (qualification) {
+        if (qualification.isHighTech) {
+            result.isHighTech = true;
+            result.highTechMs = moment(qualification.highTechMs).format("YYYY-MM-DD");
+        }
+        if (qualification.isZjtx) {
+            result.isZjtx = true;
+            result.zjtxMs = moment(qualification.zjtxMs).format("YYYY-MM-DD");
+        }
+        if (qualification.isXjrpy) {
+            result.isXjrpy = true;
+            result.xjrpyMs = moment(qualification.xjrpyMs).format("YYYY-MM-DD");
+        }
+        if (qualification.isXjr) {
+            result.isXjr = true;
+            result.xjrMs = moment(qualification.xjrMs).format("YYYY-MM-DD");
+        }
+        if (qualification.isBeOnTheMarket) result.isBeOnTheMarket = "已上市";
+    }
+
+
+    return result;
+}
+
+
+/**
+ * 我的企业入口查看企业团队信息
+ * 这里使用和 /enterprise/team/info 接口一样的逻辑
+ * @param uscc 企业统一信用代码
+ */
+export async function getMyEnterpriseTeamInfo(uscc:string) {
+
+    // let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
+    let teamInfo = await findEnterpriseNewTeamData(uscc);
+    if (!teamInfo || !teamInfo.year) {
+        teamInfo = { 
+            doctor:0, master:0, undergraduate:0, juniorCollege:0,
+            other:0, studyAbroad:0, graduates:0,
+        }
+    }
+
+    let result:any = extractData(EnterpriseTeamConfig, teamInfo, false);
+
+    result.count = result.doctor +result.master +result.undergraduate +result.juniorCollege +result.other;
+
+    return result;
+}
+
+
+/**
+ * 我的企业入口查看经济状况
+ * @param uscc 
+ */
+export async function getMyEnterpriseBusinessData(uscc:string, year:number) {
+    
+    /**找任务填报数据 */
+    let thisYearData = await findBusinessDataByUsccAndYear(uscc, year);
+
+    let checkKeyList = ["RD", "BI", "TXP"];
+    let thisYearBusinessData = {};//结构 {"季度":{RD:0, BI:0, TXP:0} }
+    for (let i= 1; i <= 4; i++) {
+        thisYearBusinessData[i] = {RD:0, BI:0, TXP:0};
+    }
+    thisYearData.forEach(info => {
+        let quarter = info.quarter;
+        checkKeyList.forEach(key => {
+            thisYearBusinessData[quarter][key] = info[key] || 0;
+        });
+    });
+    
+    /**找补录数据 */
+    let thisYearRepleishData = await selectRepleishData(uscc, year);
+
+    thisYearRepleishData.forEach(info => {
+        let {quarter, type, value} = info;
+        let key = "";
+        switch(type) {
+            case configEnum.BUSINESSDATATYPE.研发投入: key = "RD";
+            case configEnum.BUSINESSDATATYPE.纳税: key = "TXP";
+            case configEnum.BUSINESSDATATYPE.营业收入: key = "BI";
+        } 
+        if (thisYearBusinessData[quarter] && thisYearBusinessData[quarter][key] == 0 ) {
+            thisYearBusinessData[quarter][key] = value;
+        }
+    });
+    
+    let result = {
+        "RD":0,
+        "TXP":0,
+        "BI":0,
+        quarterDataList:[]
+    }; 
+
+    for (let quarter in thisYearBusinessData) {
+        let {RD, BI, TXP} = thisYearBusinessData[quarter];
+        result.BI += BI;
+        result.TXP += TXP;
+        result.RD += RD;
+        result.quarterDataList.push({quarter, RD, BI, TXP});
+    }
+
+    return result;
+}
\ No newline at end of file

src/config/eccParam/enterprise.ts

@@ -68,6 +68,7 @@ export const EnterpriseUpdateBaseDataConfig = {
     isNaturalPersonHolding:{type:"Boolean"},//是否自然人控股企业
     logonAddress:{type:"Address"},//注册地址
     operatingAddress:{type:"Address"},//经营地址
+    securePhon:{type:"String"},//安全手机号
 }
 
 

src/config/enum.ts

@@ -458,3 +458,25 @@ export enum CREATEENTERPRISETYPE {
     新迁入
 }
 
+
+/**
+ * 创业创新方向
+ */
+export enum CYCXFX {
+    颠覆性技术 = 1,
+    自主创新,
+    硬科技,
+    卡脖子技术,
+    前瞻性技术
+}
+
+
+/**
+ * 创业创始人背景
+ */
+export enum CYCSRBJ {
+    海归创业 = 1,
+    大企业高管创业,
+    连续创业,
+    大学生创业
+}
\ No newline at end of file

src/config/splitResultConfig.ts

@@ -329,6 +329,7 @@ export const EnterpriseBaseConfig = {
     logonAddress:{key:"注册地址"},
     operatingAddress:{key:"经营地址"},
     mainBusiness:{key:"主营业务"},
+    securePhon:{key:"安全手机号"},
 }
 
 

src/data/enterprise/enterprise.ts

@@ -89,7 +89,11 @@ const enterpriseSchema = new Schema({
     tipsIntellectualProperty:{type:Boolean, default:false},//标识-知识产权
     tipsFinancingInfo:{type:Boolean, default:false},//标识-企业融资
     /**3.3增加 */
-    graduation:{type:Boolean, default:false},//拟毕业情况  
+    graduation:{type:Boolean, default:false},//拟毕业情况
+    /**4.2增加*/
+    cycxfx:{type:[Number], default:[]},//创业创新方向
+    cycsrbj:{type:[Number], default:[]},//创业创始人背景
+    securePhon:String,//安全手机号，用于做修改密码用
 
 });
 

src/routers/enterpriseMobileClient/base.ts

@@ -35,6 +35,12 @@ export function setRouter(httpServer) {
     httpServer.post('/enterprise/information/titlelist', checkEnterpriseToken, asyncHandler(informationTitleListData));
     /**团队信息 */
     httpServer.post('/enterprise/team/info', checkEnterpriseToken, asyncHandler(showTeamInfomation));
+    /**创业创新方向 */
+    httpServer.post('/enterprise/cycxfx/update', checkEnterpriseToken, asyncHandler(cycxfxUpdate));
+    httpServer.post('/enterprise/cycxfx/select', checkEnterpriseToken, asyncHandler(cycxfxSelect));
+    /**创业创始人背景 */
+    httpServer.post('/enterprise/cycsrbj/update', checkEnterpriseToken, asyncHandler(cycsrbjUpdate));
+    httpServer.post('/enterprise/cycsrbj/select', checkEnterpriseToken, asyncHandler(cycsrbjSelect));
 }
 
 
@@ -232,3 +238,55 @@ async function informationTitleListData(req, res) {
     res.success(result);
 }
 
+
+/**
+ * 创业创新方向修改
+ * @param req 
+ * @param res 
+ */
+async function cycxfxUpdate(req, res) {
+    const Uscc = req.headers.uscc;
+    let reqConf = {cycxfx:'[Number]'};
+    let {cycxfx} = eccReqParamater(reqConf, req.body);
+    let result = await enterpriseBiz.updateCYCXFX(Uscc, cycxfx);
+    res.success(result);
+}
+
+
+/**
+ * 查询创业创新方向
+ * @param req 
+ * @param res 
+ */
+async function cycxfxSelect(req, res) {
+    const Uscc = req.headers.uscc;
+    let result = await enterpriseBiz.selectCYCXFX(Uscc);
+    res.success(result);
+}
+
+
+/**
+ * 创业创始人背景修改
+ * @param req 
+ * @param res 
+ */
+async function cycsrbjUpdate(req, res) {
+    const Uscc = req.headers.uscc;
+    let reqConf = {cycsrbj:'[Number]'};
+    let {cycsrbj} = eccReqParamater(reqConf, req.body);
+    let result = await enterpriseBiz.updateCYCSRBJ(Uscc, cycsrbj);
+    res.success(result);
+}
+
+
+/**
+ * 查询创业创始人背景
+ * @param req 
+ * @param res 
+ */
+async function cycsrbjSelect(req, res) {
+    const Uscc = req.headers.uscc;
+    let result = await enterpriseBiz.selectCYCSRBJ(Uscc);
+    res.success(result);
+}
+

src/routers/mobileClient/myEnterprise.ts

@@ -20,8 +20,11 @@ export function setRouter(httpServer) {
     httpServer.post('/fuhuaqi/myenterprise/update/physical', checkFuHuaQiToken, asyncHandler(updatePhysical));
     httpServer.post('/fuhuaqi/myenterprise/update/virtual', checkFuHuaQiToken, asyncHandler(updateVirtual));
     httpServer.post('/fuhuaqi/myenterprise/update/moveout', checkFuHuaQiToken, asyncHandler(updateMoveOut));
-    /**我的企业信息 回显 */
-    // httpServer.post('/fuhuaqi/myenterprise//moveout', checkFuHuaQiToken, asyncHandler(updateMoveOut));
+    /**4.2 */
+    httpServer.post('/fuhuaqi/myenterprise/qualification/select', checkFuHuaQiToken, asyncHandler(myEnterpriseQualification));
+    httpServer.post('/fuhuaqi/myenterprise/teaminfo/select', checkFuHuaQiToken, asyncHandler(myEnterpriseTeamInfo));
+    httpServer.post('/fuhuaqi/myenterprise/businessdata/select', checkFuHuaQiToken, asyncHandler(myEnterpriseBusinessData));
+     
 
 }
 
@@ -172,4 +175,49 @@ async function replenishInPut(req, res) {
 
     let result = await myEnterpriseBiz.replenishMyEnterpriseInPutInfo(Uscc, form);
     res.success(result);
-}
\ No newline at end of file
+}
+
+
+/**
+ * 企业资质
+ * 4.2
+ * @param req 
+ * @param res 
+ */
+async function myEnterpriseQualification(req, res) {
+    let reqConf = {uscc:"String"};
+    let { uscc } = eccReqParamater(reqConf, req.body);
+
+    let result = await myEnterpriseBiz.getMyEnterpriseQualification(uscc);
+    res.success(result);
+}
+
+
+/**
+ * 企业团队
+ * 4.2
+ * @param req 
+ * @param res 
+ */
+async function myEnterpriseTeamInfo(req, res) {
+    let reqConf = {uscc:"String"};
+    let { uscc } = eccReqParamater(reqConf, req.body);
+
+    let result = await myEnterpriseBiz.getMyEnterpriseTeamInfo(uscc);
+    res.success(result);
+}
+
+
+/**
+ * 经济状况
+ * @param req 
+ * @param res 
+ */
+async function myEnterpriseBusinessData(req, res) {
+    let reqConf = {uscc:"String", year:"Number"};
+    let { uscc, year } = eccReqParamater(reqConf, req.body);
+
+    let result = await myEnterpriseBiz.getMyEnterpriseBusinessData(uscc, year);
+    res.success(result);
+}
+

src/routers/public.ts

@@ -3,7 +3,7 @@
  */
 
 import * as asyncHandler from 'express-async-handler';
-import { FUHUAQILV, INSTITUTIONALNATURE, FUHUAINDUSTRY, INDUSTRY, FUHUAQILNVESTMENTSTYLE, OPERATIONMODEL, TEAM, DEGREE, FINANCINGROUNDS, INSIDESTATE, VIRTUALCAUSE, MOVEOUTTYPE, MOVEOUTCAUSE, MOVEOUTCAUSECLIENT, MOVEOUTCAUSENOTCLIENT, MOVEOUTTRACE, ENTERPRISETEAM, LISTINGSITUATION, BUSINESSDATATYPE, COOPERATIONMODE, SPECIALITY, TEACHERLV, ZJBEYONDLAYOUTOPERATIONMODE } from '../config/enum';
+import { FUHUAQILV, INSTITUTIONALNATURE, FUHUAINDUSTRY, INDUSTRY, FUHUAQILNVESTMENTSTYLE, OPERATIONMODEL, TEAM, DEGREE, FINANCINGROUNDS, INSIDESTATE, VIRTUALCAUSE, MOVEOUTTYPE, MOVEOUTCAUSE, MOVEOUTCAUSECLIENT, MOVEOUTCAUSENOTCLIENT, MOVEOUTTRACE, ENTERPRISETEAM, LISTINGSITUATION, BUSINESSDATATYPE, COOPERATIONMODE, SPECIALITY, TEACHERLV, ZJBEYONDLAYOUTOPERATIONMODE, CYCXFX, CYCSRBJ } from '../config/enum';
 
 export function setRouter(httpServer) {
     httpServer.post('/public/fuhuaqilv', asyncHandler(getFuHuaQiLv));
@@ -33,10 +33,49 @@ export function setRouter(httpServer) {
     httpServer.post('/public/speciality', asyncHandler(speciality) );
     httpServer.post('/public/teacherlv', asyncHandler(teacherLv) );
     httpServer.post('/public/zjbeyondlayoutoperationmode', asyncHandler(zjBeYondLayoutOperationMode) );
+    /**4.2 */
+    httpServer.post('/public/cycxfx', asyncHandler(cycxfx) );
+    httpServer.post('/public/cycsrbj', asyncHandler(cycsrbj) );
     
 }
 
 /**
+ * 小程序端 创业创始人背景
+ * @param req 
+ * @param res 
+ */
+function cycsrbj(req, res) {
+    let dataList = [];
+    for (let key in CYCSRBJ) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:CYCSRBJ[key]});
+        }
+    }
+    res.success({dataList});
+}
+
+
+/**
+ * 小程序端 创业创新方向
+ * @param req 
+ * @param res 
+ */
+function cycxfx(req, res) {
+    let dataList = [];
+    for (let key in CYCXFX) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            dataList.push({key:keyStr, value:CYCXFX[key]});
+        }
+    }
+    res.success({dataList});
+}
+
+
+/**
  * 小程序端 合作方式
  * @param req 
  * @param res