优化data结构

src/biz/admin/enterprise/enterprise.ts

@@ -10,7 +10,7 @@ import * as fuHuaQiData from "../../../data/fuHuaQi/fuhuaqi";
 import * as configEnum from "../../../config/enum";
 import * as verificationEnumTools from "../../../util/verificationEnum";
 import moment = require("moment");
-import { findBusinessDataByParams, findBusinessDataByParamsToPage } from "../../../data/enterprise/businessdata";
+import { findBusinessDataByParams, findBusinessDataByParamsToPage } from "../../../data/enterprise/quarterTask/businessdata";
 import { findEnterpriseInitialTeamsByParam, findEnterpriseInitialTeamsByParamToPage } from "../../../data/enterprise/initialTeam";
 
 

src/biz/admin/enterprise/financing.ts

@@ -4,7 +4,7 @@
  */
 
 import { ERRORENUM } from "../../../config/errorEnum";
-import * as financingData from "../../../data/enterprise/financing";
+import * as financingData from "../../../data/fuHuaQi/monthTask/financing";
 import * as splitResultConfig from "../../../config/splitResultConfig";
 import { BizError } from "../../../util/bizError";
 import * as fuhuaqiData from "../../../data/fuHuaQi/fuhuaqi";

src/biz/admin/fuHuaQi/fuHuaQi.ts

@@ -15,8 +15,8 @@ import { eccFormParam } from "../../../util/verificationParam";
 import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
 import { getPwdMd5, getTaskId, getTimeKey, md5PwdStr } from "../../../tools/system";
 import moment = require("moment");
-import * as monthTableData from "../../../data/fuHuaQi/monthTable";
-import * as taskData from "../../../data/fuHuaQi/task";
+import * as monthTableData from "../../../data/fuHuaQi/monthTask/monthTable";
+import * as taskData from "../../../data/fuHuaQi/monthTask/task";
 import { logHandle } from "../../../util/log";
 import * as scoreData from "../../../data/fuHuaQi/score";
 import * as scoreLogData from "../../../data/fuHuaQi/scoreLog";

src/biz/admin/fuHuaQi/month.ts

@@ -5,7 +5,7 @@
 
 import { ERRORENUM } from "../../../config/errorEnum";
 import { BizError } from "../../../util/bizError";
-import * as monthData from "../../../data/fuHuaQi/monthTable";
+import * as monthData from "../../../data/fuHuaQi/monthTask/monthTable";
 import { findAllFuHuaQiOperationNameMap } from "../../../data/fuHuaQi/fuhuaqi";
 import { OUTPUTTYPE } from "../../../config/enum";
 

src/biz/admin/fuHuaQi/task.ts

@@ -3,7 +3,7 @@
  */
 
 import { OUTPUTTYPE, TASKTYPEENUM } from "../../../config/enum";
-import * as taskData from "../../../data/fuHuaQi/task";
+import * as taskData from "../../../data/fuHuaQi/monthTask/task";
 import * as fuhuaqiData from "../../../data/fuHuaQi/fuhuaqi";
 import { BizError } from "../../../util/bizError";
 import { ERRORENUM } from "../../../config/errorEnum";

src/biz/admin/provide.ts

@@ -3,11 +3,11 @@
  * 用于版本更新的数据维护
  */
 
-import * as monthTableData from "../../data/fuHuaQi/monthTable";
-import * as taskData from "../../data/fuHuaQi/task";
+import * as monthTableData from "../../data/fuHuaQi/monthTask/monthTable";
+import * as taskData from "../../data/fuHuaQi/monthTask/task";
 import * as enterpriseData from "../../data/enterprise/enterprise";
 import * as fuhuaqiData from "../../data/fuHuaQi/fuhuaqi";
-import * as financingData from "../../data/enterprise/financing";
+import * as financingData from "../../data/fuHuaQi/monthTask/financing";
 import { CHANGEMODE, FUHUASTATE, INDUSTRY, SCOREWAYS, TASKTYPEENUM } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { findAllNotDisabledFuHuaQi, findFuHuaQiList } from "../../data/fuHuaQi/fuhuaqi";

src/biz/mobileEnterprise/businessData.ts

@@ -6,7 +6,7 @@
  */
 
 import moment = require("moment");
-import { findBusinessDataByUsccAndYear } from "../../data/enterprise/businessdata";
+import { findBusinessDataByUsccAndYear } from "../../data/enterprise/quarterTask/businessdata";
 import { eccEnumValue } from "../../util/verificationEnum";
 import { BUSINESSDATATYPE } from "../../config/enum";
 import { findRepleishDataByTypeAndYear, replenishData, selectRepleishData } from "../../data/enterprise/replenish";

src/biz/mobileEnterprise/dataDeclaration.ts

@@ -7,8 +7,8 @@
  */
 
 import moment = require("moment");
-import { addManyBusinessData, findBusinessDataByTimeAndUscc, findBusinessDataCountByTime, findNotSubmitBusinessDataByTimeAndUscc } from "../../data/enterprise/businessdata";
-import { addManyTeamData, addTeamData, findNotSubmitTeamByUsccAndTime, findTeamByUsccAndTime, findTeamDataCountByTime } from "../../data/enterprise/team";
+import { addManyBusinessData, findBusinessDataByTimeAndUscc, findBusinessDataCountByTime, findNotSubmitBusinessDataByTimeAndUscc } from "../../data/enterprise/quarterTask/businessdata";
+import { addManyTeamData, addTeamData, findNotSubmitTeamByUsccAndTime, findTeamByUsccAndTime, findTeamDataCountByTime } from "../../data/enterprise/quarterTask/team";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 import { ENTERPRISEDECLARATIONTYPE, FUHUASTATE } from "../../config/enum";
 import { BizError } from "../../util/bizError";

src/biz/mobileEnterprise/enterprise.ts

@@ -9,7 +9,7 @@ import { ERRORENUM } from "../../config/errorEnum";
 import { EnterpriseBaseConfig, EnterpriseInitialTeamConfig } from "../../config/splitResultConfig";
 import * as enterpriseData from "../../data/enterprise/enterprise";
 import { addMoneyEnterpriseInitialTeam, deleteMoneyEnterpriseInitialTeam, findEnterpriseInitialTeam, updateMoneyEnterpriseInitialTeam } from "../../data/enterprise/initialTeam";
-import { findEnterpriseNewTeamData } from "../../data/enterprise/team";
+import { findEnterpriseNewTeamData } from "../../data/enterprise/quarterTask/team";
 import { getInitialTeamMemberId } from "../../tools/system";
 import { BizError } from "../../util/bizError";
 import { checkChange, checkDataHaveNull, extractData } from "../../util/piecemeal";

src/biz/mobileFuHuaQi/enterprise/financing.ts

@@ -6,7 +6,7 @@
  */
 import * as eccFormParamConfig from "../../../config/eccFormParamConfig";
 import { ERRORENUM } from "../../../config/errorEnum";
-import * as financingData from "../../../data/enterprise/financing";
+import * as financingData from "../../../data/fuHuaQi/monthTask/financing";
 import * as splitResultConfig from "../../../config/splitResultConfig";
 import { BizError } from "../../../util/bizError";
 import * as sysTools from "../../../tools/system";

src/biz/mobileFuHuaQi/enterprise/toExamine.ts

@@ -5,9 +5,9 @@
  */
 
 import moment = require("moment");
-import { findBusinessDataByParams, findBusinessDataByTimeAndUscc } from "../../../data/enterprise/businessdata";
+import { findBusinessDataByParams, findBusinessDataByTimeAndUscc } from "../../../data/enterprise/quarterTask/businessdata";
 import { ENTERPRISEDECLARATIONTYPE } from "../../../config/enum";
-import { findTeamDataByParams, findTeamDataByUsccAndTime } from "../../../data/enterprise/team";
+import { findTeamDataByParams, findTeamDataByUsccAndTime } from "../../../data/enterprise/quarterTask/team";
 import { eccEnumValue } from "../../../util/verificationEnum";
 import { eccFormParam } from "../../../util/verificationParam";
 import { FuHuaQiReplenishEnterpriseBusinessDataConfig, FuHuaQiReplenishEnterpriseTeamDataConfig } from "../../../config/eccFormParamConfig";

src/biz/mobileFuHuaQi/fuHuaQi/month.ts

@@ -12,7 +12,7 @@
 
 import { ERRORENUM } from "../../../config/errorEnum";
 import { BizError } from "../../../util/bizError";
-import * as monthData from "../../../data/fuHuaQi/monthTable";
+import * as monthData from "../../../data/fuHuaQi/monthTask/monthTable";
 import { extractData } from "../../../util/piecemeal";
 import * as sysTools from "../../../tools/system";
 import { findAllFuHuaQiOperationNameMap } from "../../../data/fuHuaQi/fuhuaqi";

src/biz/mobileFuHuaQi/fuHuaQi/task.ts

@@ -16,10 +16,10 @@ import moment = require("moment");
 import { SCOREWAYS, TASKTYPEENUM } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { findEnterpriseCount, findEnterpriseListByTaskId, updateEnterpriseDraftLock } from "../../../data/enterprise/enterprise";
-import { findFinancingCount, findFinancingListByTaskId, updateFinancingDraftLock } from "../../../data/enterprise/financing";
+import { findFinancingCount, findFinancingListByTaskId, updateFinancingDraftLock } from "../../../data/fuHuaQi/monthTask/financing";
 import { findAllNotDisabledFuHuaQi } from "../../../data/fuHuaQi/fuhuaqi";
-import * as monthTableData from "../../../data/fuHuaQi/monthTable";
-import * as taskData from "../../../data/fuHuaQi/task";
+import * as monthTableData from "../../../data/fuHuaQi/monthTask/monthTable";
+import * as taskData from "../../../data/fuHuaQi/monthTask/task";
 import { BizError } from "../../../util/bizError";
 import { logHandle } from "../../../util/log";
 import { getLastMonthTimeKey, getTaskId, getTaskIdByTime, getThisMonthMs, getTimeKey } from "../../../tools/system";

src/biz/systemTask.ts

@@ -8,7 +8,7 @@
  */
 
 import moment = require("moment");
-import { findTaskCountByKey, findTaskListByParam } from "../data/fuHuaQi/task";
+import { findTaskCountByKey, findTaskListByParam } from "../data/fuHuaQi/monthTask/task";
 import { getTimeKey } from "../tools/system";
 import { provideTask, retrieveTask } from "./mobileFuHuaQi/fuHuaQi/task";
 import { findFuHuaQiList } from "../data/fuHuaQi/fuhuaqi";

src/data/enterprise/businessdata.ts → src/data/enterprise/quarterTask/businessdata.ts

@@ -3,7 +3,7 @@
  */
 
 import {Schema} from 'mongoose';
-import { baseDB } from '../../db/mongo/dbInit';
+import { baseDB } from '../../../db/mongo/dbInit';
 
 const businessSchema = new Schema({
     year:{type:Number, index:true},//年度

src/data/enterprise/team.ts → src/data/enterprise/quarterTask/team.ts

@@ -3,7 +3,7 @@
  */
 
 import {Schema} from 'mongoose';
-import { baseDB } from '../../db/mongo/dbInit';
+import { baseDB } from '../../../db/mongo/dbInit';
 
 
 /**团队信息 */

src/data/enterprise/financing.ts → src/data/fuHuaQi/monthTask/financing.ts

@@ -5,7 +5,7 @@
  */
 
 import {Schema} from 'mongoose';
-import { baseDB } from '../../db/mongo/dbInit';
+import { baseDB } from '../../../db/mongo/dbInit';
 
 const financingSchema = new Schema({
     uscc:{type:String, index:true},//融资企业统一信用代码 冗余字段

src/data/fuHuaQi/monthTable.ts → src/data/fuHuaQi/monthTask/monthTable.ts

@@ -7,7 +7,7 @@
  */
 
 import {Schema} from 'mongoose';
-import { baseDB } from '../../db/mongo/dbInit';
+import { baseDB } from '../../../db/mongo/dbInit';
 
 const monthTableSchema = new Schema({
     taskId:{type:String, index:true},//任务id

src/data/fuHuaQi/task.ts → src/data/fuHuaQi/monthTask/task.ts

@@ -8,7 +8,7 @@
  * type 依赖枚举
  */
 import {Schema} from 'mongoose';
-import { baseDB } from '../../db/mongo/dbInit';
+import { baseDB } from '../../../db/mongo/dbInit';
 
 const fuHuaQiTaskSchema = new Schema({
     key:{type:Number, index:true},//任务标识  格式为:YYYYMM

src/data/fuHuaQi/quarterTask/quarterTask.ts

+/**
+ * 孵化器季度任务 
+ * 
+ */
+
+import {Schema} from 'mongoose';
+import { baseDB } from '../../../db/mongo/dbInit';
+
+const monthTableSchema = new Schema({
+    key:{type:Number, index:true},//任务标识  格式为:YYYYMM
+    type: {type:Number,index:true},//任务类型
+    taskId:String,//任务id
+    fuHuaQiUscc:String,//任务所属孵化器id
+    submitTime:Number,//提交时间
+    // relevanceId:String,//任务关联的表 financing 或 enterprise 的id  弃用
+    isSubmit:Boolean,//是否提交
+    quarter:Number,//数据填报季度
+    year:Number,//数据填报年 2.0算分的时候加入的
+    submitCount:{type:Number, default:0},//提交数量  默认0
+});
+
+var monthTableModel;
+export function initModel(){
+    monthTableModel = baseDB.model('monthTable', monthTableSchema);
+    monthTableModel.selectOnceData = async function (paramater:object) {
+        let selectInfo = await monthTableModel.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);
+    });
+}
\ No newline at end of file

src/db/mongo/tableInit.ts

-import * as taskinModel  from "../../data/fuHuaQi/task";
+import * as taskinModel  from "../../data/fuHuaQi/monthTask/task";
 import * as fuhuaqiinModel  from "../../data/fuHuaQi/fuhuaqi";
 import * as enterpriseinModel  from "../../data/enterprise/enterprise";
-import * as financinginModel  from "../../data/enterprise/financing";
-import * as monthTableModel  from "../../data/fuHuaQi/monthTable";
+import * as financinginModel  from "../../data/fuHuaQi/monthTask/financing";
+import * as monthTableModel  from "../../data/fuHuaQi/monthTask/monthTable";
 import * as guanweihuiModel  from "../../data/guanWeiHui/guanweihui";
 import * as scoreModel  from "../../data/fuHuaQi/score";
 import * as scoreLogModel  from "../../data/fuHuaQi/scoreLog";
 import * as codeModel  from "../../data/fuHuaQi/code";
 import * as smsPointOutModel  from "../../data/fuHuaQi/smsPointOut";
 
-import * as businessdataModel  from "../../data/enterprise/businessdata";
+import * as businessdataModel  from "../../data/enterprise/quarterTask/businessdata";
 import * as financingInfoModel  from "../../data/enterprise/financingInfo";
 import * as replenishModel  from "../../data/enterprise/replenish";
-import * as teamModel  from "../../data/enterprise/team";
+import * as teamModel  from "../../data/enterprise/quarterTask/team";
 import * as initialTeamModel  from "../../data/enterprise/initialTeam";
 
 

src/tools/dataInit.ts

@@ -4,9 +4,9 @@
  */
 import { FUHUAQILNVESTMENTSTYLE, FUHUAQILV, INDUSTRY, INSTITUTIONALNATURE } from "../config/enum";
 import { createEnterpriseToList, findEnterpriseCount } from "../data/enterprise/enterprise";
-import { findFinancingCount } from "../data/enterprise/financing";
+import { findFinancingCount } from "../data/fuHuaQi/monthTask/financing";
 import { createFuHuaQiToList, findAllFuHuaQiOperationUsccMap, findAllNotDisabledFuHuaQi, findFuHuaQiUserCount } from "../data/fuHuaQi/fuhuaqi";
-import { createMonthTableToList, findMonthCount } from "../data/fuHuaQi/monthTable";
+import { createMonthTableToList, findMonthCount } from "../data/fuHuaQi/monthTask/monthTable";
 import { getPwdMd5, getTaskId } from "./system";
 const xlsx = require('node-xlsx');
 const path = require('path');