修改分数

src/biz/admin/enterprise/enterprise.ts

@@ -333,6 +333,7 @@ export async function enterpriseMoveOutList(name:string, fuHuaQiUscc:string, ind
         changeData.industry = verificationEnumTools.changeEnumValue(configEnum.INDUSTRY, changeData.industry) || "-";
         
         changeData.moveOutCause = verificationEnumTools.changeEnumValue(configEnum.MOVEOUTCAUSE, changeData.moveOutCause);
+        changeData.moveOutTrace = verificationEnumTools.changeEnumValue(configEnum.MOVEOUTTRACE, changeData.moveOutTrace);
         changeData.moveOutType = verificationEnumTools.changeEnumValue(configEnum.MOVEOUTTYPE, changeData.moveOutType);
 
         changeData.logonAdd = changeAddToString(changeData.logonAddress) || "-";
@@ -383,10 +384,10 @@ export async function outPutEnterpriseMoveOutList(name:string, fuHuaQiUscc:strin
     let usccMap = await fuHuaQiData.findAllFuHuaQiOperationNameMap();//用于将孵化器uscc变成孵化器名称
     let dataBaseList = await enterpriseData.findEnterpriseList(selectParam);
 
-    let keyList = [ "name", "moveOutTime", "moveOutType", "moveOutCause", "fuHuaQiUscc", "industry",
+    let keyList = [ "name", "moveOutTime", "moveOutType", "moveOutTrace","moveOutCause", "fuHuaQiUscc", "industry",
         "createTime","uscc","mainBusiness","logonTime","timeOfImmigration","oldLogonAdd","firstIncubationTime",
         "isNaturalPersonHolding","logonAdd","operatingAdd","leasedArea"];
-    let titleList = ["企业名称"," 迁出时间"," 迁出类型"," 迁出原因"," 前所属孵化器"," 行业领域",
+    let titleList = ["企业名称"," 迁出时间"," 迁出类型","迁出方向","迁出原因"," 前所属孵化器"," 行业领域",
         "入库时间", "统一信用代码", "主营业务", "注册时间", "迁入时间", "迁入前注册地址",
         "首次入孵时间","是否自然人控股","注册地址","经营地址","租赁面积（平方米）"];
     /**组合返回结果 */
@@ -404,6 +405,7 @@ export async function outPutEnterpriseMoveOutList(name:string, fuHuaQiUscc:strin
 
         changeData.moveOutCause = verificationEnumTools.changeEnumValue(configEnum.MOVEOUTCAUSE, changeData.moveOutCause);
         changeData.moveOutType = verificationEnumTools.changeEnumValue(configEnum.MOVEOUTTYPE, changeData.moveOutType);
+        changeData.moveOutTrace = verificationEnumTools.changeEnumValue(configEnum.MOVEOUTTRACE, changeData.moveOutTrace);
 
         changeData.logonAdd = changeAddToString(changeData.logonAddress) || "-";
         changeData.operatingAdd = changeAddToString(changeData.operatingAddress) || "-";
@@ -484,7 +486,7 @@ export async function outPutBusinessDataList(name:string, year:number, quarter:n
     let dataBaseList = await businessData.findBusinessDataByParams(selectParam);
 
     let keyList = [ "name", "year", "quarter", "BI", "RD", "TXP"];
-    let titleList = ["企业名称"," 季度"," 年度"," 营业收入"," 研发投入"," 纳税"];
+    let titleList = ["企业名称"," 年度", " 季度"," 营业收入"," 研发投入"," 纳税"];
 
     let dataList = [titleList];
     dataBaseList.forEach(info => {

src/biz/admin/enterprise/financing.ts

@@ -198,6 +198,8 @@ export async function outPutEnterpriseFinancing(name:string, financingRounds:num
     dataBaseList.forEach(info => {
         let changeData:any = extractData(splitResultConfig.EnterpriseFinancingDataConfig, info, true);
         changeData.fuHuaQiInvestment = changeData.fuHuaQiInvestment ? "是" : "否";
+        changeData.financingRounds = changeEnumValue(configEnum.FINANCINGROUNDS, changeData.financingRounds);
+        changeData.fuHuaQiInvestmentStyle = changeEnumValue(configEnum.FUHUAQILNVESTMENTSTYLE, changeData.fuHuaQiInvestmentStyle);
 
         let subList = [];
         for (let i = 0; i < keyList.length; i++) {

src/biz/admin/fuHuaQi/instituQualify.ts

@@ -183,7 +183,7 @@ export async function outputIcrDataList(fuHuaQiName:string, cMode:number, type:n
 
     let dataList = [["运营机构名称", "合作机构", "合作企业","合作方式","合作成果", "开始时间"]];
     dataBaseList.forEach(info => {
-        let subList = [info.name, info.po, info.ce, info.cMode, info.cAchievements, info.startTimeMs];
+        let subList = [info.name, info.po, info.ce, info.cMode, info.cAchievements, moment(info.startTimeMs).format("YYYY-MM-DD") ];
         dataList.push(subList);
     });
 
@@ -287,7 +287,7 @@ export async function getPTPDataList(name:string, isCreatePTP:number, isParticip
     let selectParam:any = {};
     if (name) selectParam.operationName = {"$regex":`${name}`};
     if (isCreatePTP) selectParam.isCreatePTP = isCreatePTP;
-    if (isParticipateInPTP != 1 ) {
+    if (isParticipateInPTP ) {
         if (isParticipateInPTP == 2) selectParam.isParticipateInPTP = true;
         else selectParam.isParticipateInPTP = false;
     }
@@ -299,17 +299,20 @@ export async function getPTPDataList(name:string, isCreatePTP:number, isParticip
         dataList.push({
             name:info.operationName,//运营机构名称
             isCreatePTP:changeEnumValue(STATEENUM, info.isCreatePTP),//基金规模(万元)
-            scalePTP:info.scalePTP,//基金规模
-            isParticipateInPTP:info.isParticipateInPTP ? "是" : "否",//是否参与创投基金
+            scalePTP:info.scalePTP,
+            isParticipateInPTP:info.isParticipateInPTP == true ? "是" : "否",//是否参与创投基金
             participatingFundCompany:info.participatingFundCompany//参股基金公司名
         });
     });
 
+    // isCreatePTP:Number,//是否成立创投基金
+    // scalePTP:Number,//基金规模
+    // isParticipateInPTP:Boolean,//是否参与创投基金
+    // participatingFundCompany:String,//参股基金公司名
+
     return {count, dataList, pageCount:Math.ceil(count/10) };
 }
 
-
-
 export async function outputPTPDataList(fuHuaQiName:string, isCreatePTP:number, isParticipateInPTP:number, type:number) {
     let name = "全部";
     let selectParam:any = {};

src/biz/admin/fuHuaQi/task.ts

@@ -190,7 +190,7 @@ export async function quarterTaskList(state:number, year:number, quarter:number,
 
     if (state == 2) {//提交
         selectParam.draftLock = true;
-    } else {//未提交
+    } else if (state == 3) {//未提交
         selectParam.draftLock = false;
     }
     if (year) selectParam.year = year;
@@ -237,7 +237,7 @@ export async function outPutQuarterTaskDataList(type:number, state:number, year:
         name = "当前";
         if (state == 2) {//提交
             selectParam.draftLock = true;
-        } else {//未提交
+        } else if (state == 3) {//未提交
             selectParam.draftLock = false;
         }
         if (year) selectParam.year = year;

src/biz/admin/stats/guanWeiHui/fuhuaqiBase.ts

@@ -80,7 +80,7 @@ export async function fuHuaQiBaseData() {
     /**出租率趋势 */
     let czlqsInfo = await czlqs();
 
-    return {czlqsInfo, fhqpfpm, zcsjfb, jgxzfb, fhqjbfb, fhqlyfb};
+    return {czlqsInfo, fhqpfpm, zcsjfb, jgxzfb, fhqjbfb, fhqlyfb, fuHuaQiCount};
 }
 
 async function czlqs() {

src/biz/mobileEnterprise/quarterTask/businessData.ts

@@ -140,6 +140,8 @@ export async function replenishBusinessData(uscc:string, type:number, data) {
         await replenishData.replenishData(uscc, lastYear, quarter, type, value);
     }
 
+    
+
     /**加入埋点 */
     if (Object.keys(checkMap).length ) {
         let pointId;

src/config/splitResultConfig.ts

@@ -136,6 +136,7 @@ export const EnterpriseMoveOutListConfig = {
     name:{key:"企业名称"},
     moveOutTime:{key:"迁出时间", changeDate:true},
     moveOutType:{key:"迁出类型"},
+    moveOutTrace:{key:"迁出去向"},
     moveOutCause:{key:"迁出原因"},
     fuHuaQiUscc:{key:"前所属孵化器"},
     industry:{key:"行业领域[] 最多 选择三个"},

src/data/enterprise/quarterTask/team.ts

@@ -4,6 +4,7 @@
 
 import {Schema} from 'mongoose';
 import { baseDB } from '../../../db/mongo/dbInit';
+import { BizError } from '../../../util/bizError';
 
 
 /**团队信息 */
@@ -190,9 +191,9 @@ export async function statsEnterpriseTeamCountByNull(year:number, quarter:number
     let statsList = await teamModel.aggregate([
         {"$match":{year, quarter, "$or":[{isSubmit:true}, {fhqIsSubmit:true}] }},
         {"$project":{
-            name:1, count:[ "$doctor", "$master", "$undergraduate", "$juniorCollege", "$other"]
+            name:1, count:{"$sum":[ "$doctor", "$master", "$undergraduate", "$juniorCollege", "$other"]}
         }},
         {"$match":{count:0}},
     ]);
     return statsList;
-}
\ No newline at end of file
+}

src/data/fuHuaQi/scoreLog.ts

@@ -87,3 +87,8 @@ export async function addLogTOInitData(uscc:string, ways:number, changeMode:numb
     if (taskType) addInfo.taskType = taskType;
     await fuHuaQiScoreLogModel.create(addInfo);
 }
+
+
+export async function getAllLog() {
+    return await fuHuaQiScoreLogModel.find({ });
+}
\ No newline at end of file

src/data/fuHuaQi/scoreLogRepair.ts

+/**
+ * 得分日志表
+ * 
+ * 
+ */
+
+import {Schema} from 'mongoose';
+import { baseDB } from '../../db/mongo/dbInit';
+
+
+const fuhuaqiscorelogRepairSchema = new Schema({
+    uscc:{type:String, index:true},//孵化器uscc
+    ways:Number,//途径 遵循枚举 SCOREWAYS 值
+    taskType:Number,//任务类型 遵循枚举 TASKTYPEENUM 值
+    changeMode:Number,//分数变化方式 遵循枚举 CHANGEMODE 值
+    score:Number,//变化后的分数
+    addScore:Number,//增加/减少的分数
+    timeMs:{type:Number, index:true}//获得时间  时间戳
+});
+
+
+var fuhuaqiscorelogRepairModel;
+export function initModel(){
+    fuhuaqiscorelogRepairModel = baseDB.model('fuhuaqiscorelogRepair', fuhuaqiscorelogRepairSchema);
+}
+
+
+/**
+ * 批量添加得分日志
+ * @param addList 添加列表
+ */
+export async function addMany_repair(addList) {
+    await fuhuaqiscorelogRepairModel.insertMany(addList);
+}
+
+
+export async function getAllLog_repair() {
+    return await fuhuaqiscorelogRepairModel.find({ });
+}
\ No newline at end of file

src/data/fuHuaQi/scoreRepair.ts

+/**
+ * 得分表
+ * 记录孵化器分数
+ * 
+ */
+
+import {Schema} from 'mongoose';
+import { baseDB } from '../../db/mongo/dbInit';
+
+
+const scoreRepairSchema = new Schema({
+    uscc:{type:String, index:true},//孵化器uscc
+    startScore:{type:Number, default:400},//初始分 400  创建孵化器的时候要在这里加上
+    lastYearStar:{type:Number, default:3},//去年星值  这里默认是3星  每年12月31日12时，需要根据分算星然后更新到这里
+    myDataScore:{type:Number, default:0},//我的数据获得的分数
+    baseDataScore:{type:Number, default:0},//基础数据获得的分数
+    myEnterpriseScore:{type:Number, default:0},//我的企业获得的分数
+    taskScore:{type:Number, default:0},//任务获得分数
+    updateTime:{type:Number, default:0},//更新时间戳
+    /**上一次评分 */
+    lastScore:{type:Number, default:0}//在获取列表的时候要同步数据
+});
+
+
+var fuHuaQiScoreModel;
+export function initModel(){
+    fuHuaQiScoreModel = baseDB.model('fuhuaqiscoreRepair', scoreRepairSchema);
+    fuHuaQiScoreModel.selectOnceData = async function (paramater:object) {
+        let selectInfo = await fuHuaQiScoreModel.findOne(paramater).exec();
+        if (selectInfo) {
+            if (!selectInfo.runSave) {
+                selectInfo.runSave = selectInfo.save;
+                selectInfo.save = save.bind(selectInfo)
+            }
+        }
+        return selectInfo;
+    }
+}
+export async function save(throwError=false) {
+    if (!this.isModified()) return;
+    await this.runSave({validateBeforeSave:false}).catch(err=>{
+        console.log(err);
+    });
+}
+
+
+/**数据维护  用于初始化老的数据 */
+export async function initFuHuaQiScore_repair(array) {
+    return await fuHuaQiScoreModel.insertMany(array);
+}
+
+
+/**
+ * 查询孵化器分数信息
+ * @param uscc 孵化器统一信用代码
+ * @returns 
+ */
+export async function findFuHuaQiScoreInfo_repair(uscc:string) {
+    return await fuHuaQiScoreModel.selectOnceData({uscc});
+}
+
+/**通过条件查询孵化器得分信息 */
+export async function findScoreDataByParam_repair(param) {
+    return await fuHuaQiScoreModel.find(param);
+}
\ No newline at end of file

src/db/mongo/tableInit.ts

@@ -24,6 +24,10 @@ import * as initialTeamModel  from "../../data/enterprise/initialTeam";
 import * as guanweihuiModel  from "../../data/guanWeiHui/guanweihui";
 import * as informationModel  from "../../data/guanWeiHui/information";
 import * as dataMaintenanceLogModel  from "../../data/guanWeiHui/dataMaintenanceLog";
+
+/**测试 */
+import * as scoreRepairModel  from "../../data/fuHuaQi/scoreRepair";
+import * as scoreLogRepairModel  from "../../data/fuHuaQi/scoreLogRepair";
  
 
 export async function initTable() {
@@ -52,4 +56,8 @@ export async function initTable() {
     fuHuaQiQuarterTaskModel.initModel();
 
     dataMaintenanceLogModel.initModel();
+
+
+    scoreRepairModel.initModel();
+    scoreLogRepairModel.initModel();
 }
\ No newline at end of file

src/routers/provide.ts

@@ -28,6 +28,11 @@ export function setRouter(httpServer) {
 
     /**4.2 */
     httpServer.post('/admin/provide/enterprise/financing/industry', checkInterior, asyncHandler(addFinancingIndustry) );
+    /**4.3 */
+    // httpServer.post('/admin/provide/enterprise/bussiness/rep', checkInterior, asyncHandler(addBussinessData) );
+    httpServer.post('/admin/provide/fuhuaqi/scort/repair', checkInterior, asyncHandler(repairScoreData) );
+    httpServer.post('/admin/provide/fuhuaqi/scort/change', checkInterior, asyncHandler(repairChangeScortData) );
+    
     
 }
 
@@ -114,4 +119,22 @@ async function updateEnterprisePwd(req, res) {
 async function addFinancingIndustry(req, res) {
     await provideBiz.addFinancingIndustry();
     res.success({isUsccess:true});
+}
+
+/**未定 */
+async function addBussinessData(req, res) {
+    await provideBiz.addBussiness();
+    res.success({isUsccess:true});
+}
+
+
+async function repairScoreData(req, res) {
+    await provideBiz.repairScore();
+    res.success({isUsccess:true});
+}
+
+
+async function repairChangeScortData(req, res) {
+    await provideBiz.changeScortData();
+    res.success({isUsccess:true});
 }
\ No newline at end of file

src/util/analysisExcel.ts

@@ -9,7 +9,7 @@ const path = require('path');
  */
 export function onceSheetBecomeOfblockData(fileName, sheetName) {
     let {sheetMap} = getExcel( path.join(__dirname.substring(0,__dirname.indexOf("out")), "res", fileName ));
-    return sheetMap;
+    // return sheetMap;
     let thisBlockData = getBlockData(sheetMap[sheetName]);
     return thisBlockData;
 }