企业端 逻辑层 注释优化+引用优化

src/biz/mobileEnterprise/base/enterprise.ts

@@ -3,14 +3,12 @@
  * 作者：lxm
  */
 
-import { EnterpriseQualificationUpdateConfig, EnterpriseUpdateBaseDataConfig, InitialTeamUpdateConfig } from "../../../config/eccFormParamConfig";
-import { ENTERPRISETEAM, INDUSTRY, LISTINGSITUATION, STATEENUM } from "../../../config/enum";
+import { EnterpriseUpdateBaseDataConfig } from "../../../config/eccFormParamConfig";
+import { INDUSTRY, STATEENUM } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
-import { EnterpriseBaseConfig, EnterpriseInitialTeamConfig } from "../../../config/splitResultConfig";
+import { EnterpriseBaseConfig } from "../../../config/splitResultConfig";
 import * as enterpriseData from "../../../data/enterprise/enterprise";
-import { addMoneyEnterpriseInitialTeam, deleteMoneyEnterpriseInitialTeam, findEnterpriseInitialTeam, updateMoneyEnterpriseInitialTeam } from "../../../data/enterprise/initialTeam";
 import { findEnterpriseNewTeamData } from "../../../data/enterprise/quarterTask/team";
-import { getInitialTeamMemberId } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
 import { checkChange, checkDataHaveNull, extractData } from "../../../util/piecemeal";
 import { eccEnumValue } from "../../../util/verificationEnum";

src/biz/mobileEnterprise/base/initialTeams.ts

@@ -3,16 +3,15 @@
  * 作者：lxm
  */
 
-import { EnterpriseQualificationUpdateConfig, EnterpriseUpdateBaseDataConfig, InitialTeamUpdateConfig } from "../../../config/eccFormParamConfig";
-import { ENTERPRISETEAM, INDUSTRY, LISTINGSITUATION, STATEENUM } from "../../../config/enum";
+import { InitialTeamUpdateConfig } from "../../../config/eccFormParamConfig";
+import { ENTERPRISETEAM, STATEENUM } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
-import { EnterpriseBaseConfig, EnterpriseInitialTeamConfig } from "../../../config/splitResultConfig";
+import {  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/quarterTask/team";
+import * as initialTeamData from "../../../data/enterprise/initialTeam";
 import { getInitialTeamMemberId } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
-import { checkChange, checkDataHaveNull, extractData } from "../../../util/piecemeal";
+import { checkChange, extractData } from "../../../util/piecemeal";
 import { eccEnumValue } from "../../../util/verificationEnum";
 import { eccFormParam } from "../../../util/verificationParam";
 
@@ -44,7 +43,7 @@ export async function updateInitialTeamInfo(uscc:string, firstClassTalent:number
     enterpriseInfo.haveFirstClassTalent = firstClassTalent;
     await enterpriseInfo.save();
 
-    let enterpriseInitialTeamList = await findEnterpriseInitialTeam(uscc);
+    let enterpriseInitialTeamList = await initialTeamData.findEnterpriseInitialTeam(uscc);
     
     /**匹配数据操作逻辑 */
     let newTeamIdList = [];//用于匹配新数据，老数据不在新数据中 判定为被删除
@@ -80,9 +79,9 @@ export async function updateInitialTeamInfo(uscc:string, firstClassTalent:number
     });
 
     /**修改数据 */
-    if (addList.length) await addMoneyEnterpriseInitialTeam(addList);
-    if (updateList.length) await updateMoneyEnterpriseInitialTeam(updateList);
-    if (deleteList.length) await deleteMoneyEnterpriseInitialTeam(deleteList);
+    if (addList.length) await initialTeamData.addMoneyEnterpriseInitialTeam(addList);
+    if (updateList.length) await initialTeamData.updateMoneyEnterpriseInitialTeam(updateList);
+    if (deleteList.length) await initialTeamData.deleteMoneyEnterpriseInitialTeam(deleteList);
 
     return {isSuccess:true};
 }
@@ -98,7 +97,7 @@ export async function selectInitialTeamInfo(uscc:string) {
     let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(uscc);
     let firstClassTalent = enterpriseInfo.haveFirstClassTalent || STATEENUM.未选;
 
-    let initialTeamList = await findEnterpriseInitialTeam(uscc);
+    let initialTeamList = await initialTeamData.findEnterpriseInitialTeam(uscc);
 
     let initialTeam = [];
 

src/biz/mobileEnterprise/financing.ts

@@ -8,7 +8,7 @@ import { FINANCINGROUNDS, FUHUAQILNVESTMENTSTYLE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { EnterpriseFinancingListDataConfig } from "../../config/splitResultConfig";
 import { findEnterpriseByUscc } from "../../data/enterprise/enterprise";
-import { addFinancingInfo, deleteFinancingById, getFinancingById, selectFinancingListByUscc } from "../../data/enterprise/financingInfo";
+import * as enterpriseFinancingData from "../../data/enterprise/financingInfo";
 import { getFinancingId } from "../../tools/system";
 import { BizError } from "../../util/bizError";
 import { checkChange, extractData } from "../../util/piecemeal";
@@ -21,7 +21,7 @@ import { eccFormParam } from "../../util/verificationParam";
  * @param uscc 企业统一信用代码
  */
 export async function getEnterpriseFinancingList(uscc:string) {
-    let financingList = await selectFinancingListByUscc(uscc);
+    let financingList = await enterpriseFinancingData.selectFinancingListByUscc(uscc);
 
     let resultList = [];
     
@@ -72,7 +72,7 @@ export async function addEnterpriseFinancing(uscc:string, form) {
         id:getFinancingId(uscc), uscc, name:enterpriseInfo.name, createTime:new Date().valueOf(), type:2
     };
 
-    await addFinancingInfo(Object.assign(addInfo, form));
+    await enterpriseFinancingData.addFinancingInfo(Object.assign(addInfo, form));
 
     return {isSuccess:true};
 }
@@ -85,7 +85,7 @@ export async function addEnterpriseFinancing(uscc:string, form) {
  * @param id 融资数据标识
  */
 export async function getEnterpriseFinancingInfo(uscc:string, id:string) {
-    let financingInfo = await getFinancingById(id);
+    let financingInfo = await enterpriseFinancingData.getFinancingById(id);
     
     if (!financingInfo) throw new BizError(ERRORENUM.参数错误, `获取企业融资情况 id在库里找不到`);
     if ( financingInfo.uscc != uscc ) throw new BizError(ERRORENUM.只能修改本企业信息, `${uscc} 想修改 ${id}`);
@@ -122,7 +122,7 @@ export async function updateEnterpriseFinancingInfo(uscc:string, form) {
         form.fuHuaQiInvestmentStyle = 0;
     } 
 
-    let financingInfo = await getFinancingById(form.id);
+    let financingInfo = await enterpriseFinancingData.getFinancingById(form.id);
 
     if (!financingInfo) throw new BizError(ERRORENUM.参数错误, `修改企业信息的时候 id在库里找不到`);
     if ( financingInfo.uscc != uscc ) throw new BizError(ERRORENUM.只能修改本企业信息, `${uscc} 想修改 ${form.id}`);
@@ -148,12 +148,12 @@ export async function updateEnterpriseFinancingInfo(uscc:string, form) {
  * @returns 
  */
 export async function deleteEnterpriseFinancingInfo(uscc:string, id:string) {
-    let financingInfo = await getFinancingById(id);
+    let financingInfo = await enterpriseFinancingData.getFinancingById(id);
     
     if (!financingInfo) throw new BizError(ERRORENUM.参数错误, `获取企业融资情况 id在库里找不到`);
     if ( financingInfo.uscc != uscc ) throw new BizError(ERRORENUM.只能删除本企业信息, `${uscc} 想修改 ${id}`);
 
-    await deleteFinancingById(id);
+    await enterpriseFinancingData.deleteFinancingById(id);
 
     return {isSuccess:true};
 }
\ No newline at end of file

src/biz/mobileEnterprise/policy.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { selectInformationByParam, selectInformationByParamCount, selectInformationByParamToPage, selectInformationDataById, selectOnceInformationByParamToParam } from "../../data/guanWeiHui/information";
+import * as informationDat from "../../data/guanWeiHui/information";
 
 
 
@@ -21,8 +21,8 @@ export async function getInformationList(uscc:string, selectTitle:string, page:n
     if (selectTitle) {
         selectParam["title"] =  {"$regex":`${selectTitle}`};
     }
-    let informationList = await selectInformationByParamToPage(selectParam, (page-1) * 10 );
-    let count = await selectInformationByParamCount(selectParam);
+    let informationList = await informationDat.selectInformationByParamToPage(selectParam, (page-1) * 10 );
+    let count = await informationDat.selectInformationByParamCount(selectParam);
     let pageCount = count ? Math.ceil(count/10) : 0;
 
     let dataList = [];
@@ -51,8 +51,8 @@ export async function getOutOfDateInformationList(uscc:string, selectTitle:strin
     if (selectTitle) {
         selectParam["title"] =  {"$regex":`${selectTitle}`};
     }
-    let informationList = await selectInformationByParamToPage(selectParam, (page-1) * 10 );
-    let count = await selectInformationByParamCount(selectParam);
+    let informationList = await informationDat.selectInformationByParamToPage(selectParam, (page-1) * 10 );
+    let count = await informationDat.selectInformationByParamCount(selectParam);
     let pageCount = count ? Math.ceil(count/10) : 0;
     let dataList = [];
 
@@ -73,23 +73,25 @@ export async function getOutOfDateInformationList(uscc:string, selectTitle:strin
  * @param id 标识
  */
 export async function getOnceinformation(uscc:string, id:string) {
-    let informationData = await selectInformationDataById(id );
+    let dateBaseData = await informationDat.selectInformationDataById(id );
 
     let reuslt = {
-        title:informationData.title,
-        desc:informationData.desc,
-        source:informationData.source,
-        createTime:moment(informationData.createTimeMs).format("MM/DD")
+        title:dateBaseData.title,
+        desc:dateBaseData.desc,
+        source:dateBaseData.source,
+        createTime:moment(dateBaseData.createTimeMs).format("MM/DD")
     };
 
     return {infomation:reuslt};
 }
 
-
+/**
+ * 企业资讯列表 （首页）
+ * @returns 
+ */
 export async function getInformationTitleList() {
     let selectParam = {state:true, "$or":[{closeTimeMs: {"$gt":new Date().valueOf()} }, {isPermanent:true}] };
-    let informationData = await selectOnceInformationByParamToParam(selectParam)  || {title:""};;
-
+    let informationData = await informationDat.selectOnceInformationByParamToParam(selectParam)  || {title:""};;
    
     return {title:informationData.title};
 }
\ No newline at end of file

src/biz/mobileEnterprise/quarterTask/businessData.ts

@@ -9,7 +9,7 @@ import moment = require("moment");
 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";
+import * as replenishData from "../../../data/enterprise/replenish";
 
 
 /**
@@ -45,7 +45,7 @@ export async function getBusinessData(uscc:string) {
             deletionMap[key] += 1;
         }
     });
-    let lastYearRepleishData = await selectRepleishData(uscc, lastYear);
+    let lastYearRepleishData = await replenishData.selectRepleishData(uscc, lastYear);
     lastYearRepleishData.forEach(info => {
         if (info.type == BUSINESSDATATYPE.研发投入) {
             lastBusinessData.RD += info.value;
@@ -117,7 +117,7 @@ export async function replenishBusinessData(uscc:string, type:number, data) {
     });
      
     /**获取上一年度补录 */
-    let lastYearReplenishData = await findRepleishDataByTypeAndYear(uscc, type, lastYear);
+    let lastYearReplenishData = await replenishData.findRepleishDataByTypeAndYear(uscc, type, lastYear);
     lastYearReplenishData.forEach(info => {
         let addIndex = info.quarter - 1;
         resultData[addIndex] += info.value;
@@ -134,7 +134,7 @@ export async function replenishBusinessData(uscc:string, type:number, data) {
     for (let key in checkMap) {
         let quarter = parseInt(key);
         let value = checkMap[key];
-        await replenishData(uscc, lastYear, quarter, type, value);
+        await replenishData.replenishData(uscc, lastYear, quarter, type, value);
     }
 
     
@@ -160,7 +160,7 @@ export async function lastYearBusinessData(uscc:string, type:number) {
     });
      
     /**获取上一年度补录 */
-    let lastYearReplenishData = await findRepleishDataByTypeAndYear(uscc, type, lastYear);
+    let lastYearReplenishData = await replenishData.findRepleishDataByTypeAndYear(uscc, type, lastYear);
     lastYearReplenishData.forEach(info => {
         let addIndex = info.quarter - 1;
         resultData[addIndex] += info.value;

src/biz/mobileEnterprise/quarterTask/dataDeclaration.ts

@@ -7,8 +7,8 @@
  */
 
 import moment = require("moment");
-import { addManyBusinessData, findBusinessDataByTimeAndUscc, findBusinessDataCountByTime, findNotSubmitBusinessDataByTimeAndUscc } from "../../../data/enterprise/quarterTask/businessdata";
-import { addManyTeamData, addTeamData, findNotSubmitTeamByUsccAndTime, findTeamByUsccAndTime, findTeamDataCountByTime } from "../../../data/enterprise/quarterTask/team";
+import * as businessData from "../../../data/enterprise/quarterTask/businessdata";
+import * as teamData from "../../../data/enterprise/quarterTask/team";
 import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
 import { ENTERPRISEDECLARATIONTYPE, FUHUASTATE } from "../../../config/enum";
 import { BizError } from "../../../util/bizError";
@@ -16,8 +16,8 @@ import { ERRORENUM } from "../../../config/errorEnum";
 import { eccFormParam } from "../../../util/verificationParam";
 import { EnterpriseAddTeamDataConfig } from "../../../config/eccFormParamConfig";
 import { EnterpriseTeamConfig } from "../../../config/splitResultConfig";
-import { checkChange, extractData } from "../../../util/piecemeal";
-import { findEnterpriseByUscc, findEnterpriseList } from "../../../data/enterprise/enterprise";
+import { extractData } from "../../../util/piecemeal";
+import { findEnterpriseList } from "../../../data/enterprise/enterprise";
 import { logHandle } from "../../../util/log";
 
 /** ----------------------------------------------------- 通用方法 start -------------------------------------- */
@@ -87,8 +87,8 @@ export async function todoList(uscc:string) {
         // return {dataList:[], distanceEnd};
     }
 
-    let businessDataInfo = await findNotSubmitBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
-    let teamsDataInfo = await findNotSubmitTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
+    let businessDataInfo = await businessData.findNotSubmitBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
+    let teamsDataInfo = await teamData.findNotSubmitTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
 
     let title = getDeclarationChName(declarationQuarter)
 
@@ -129,8 +129,8 @@ export async function completedList(uscc:string, year:number, quarter:number) {
     // let modifiable = (isInTime() && declarationQuarter == quarter && declarationYear == year);
     let modifiable = (declarationQuarter == quarter && declarationYear == year);
     
-    let businessDataInfo = await findBusinessDataByTimeAndUscc(uscc, year, quarter);
-    let teamsDataInfo = await findTeamByUsccAndTime(uscc, year, quarter);
+    let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, year, quarter);
+    let teamsDataInfo = await teamData.findTeamByUsccAndTime(uscc, year, quarter);
 
     let dataList = [];
     let title = getDeclarationChName(quarter);
@@ -172,7 +172,7 @@ export async function addBusinessData(uscc:string, BI:number, RD:number, TXP:num
 
     let {declarationQuarter, declarationYear} = getDeclarationTime();
     
-    let businessDataInfo = await findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
+    let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     if (businessDataInfo.isSubmit || businessDataInfo.fhqIsSubmit) throw new BizError(ERRORENUM.请勿重复提交填报数据, `${uscc}已经提交了后点击创建企业经营数据`);
     if (businessDataInfo.isUpdate ) throw new BizError(ERRORENUM.不能重复创建填报, `${uscc}不能重复创建填报 经营数据`);
 
@@ -200,7 +200,7 @@ export async function updateBusinessData(uscc:string, BI:number, RD:number, TXP:
 
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-    let businessDataInfo = await findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
+    let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     if (!businessDataInfo.isUpdate) throw new BizError(ERRORENUM.请先创建填报数据, `${uscc}修改经营数据前库里并没有创建数据`);
 
     businessDataInfo.BI = BI;
@@ -225,7 +225,7 @@ export async function businessInfo(uscc:string) {
 
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-    let businessDataInfo = await findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
+    let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     if (!businessDataInfo || !businessDataInfo.year) throw new BizError(ERRORENUM.未提交填报数据, `${uscc}进行了违规操作`, '未提交数据就调用了回显接口');
 
     let result = {
@@ -250,7 +250,7 @@ export async function addTeamInfo(uscc:string, form) {
 
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-    let teamInfo = await findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
+    let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (teamInfo.isSubmit || teamInfo.fhqIsSubmit) throw new BizError(ERRORENUM.请勿重复提交填报数据, `${uscc}已经提交了后点击企业申报团队数据`);
     if (teamInfo.isUpdate ) throw new BizError(ERRORENUM.不能重复创建填报, `${uscc}不能重复创建填报 团队数据`);
 
@@ -282,7 +282,7 @@ export async function getTeamInfo(uscc:string) {
 
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-    let teamInfo = await findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
+    let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo || !teamInfo.year) throw new BizError(ERRORENUM.未提交填报数据, `${uscc}进行了违规操作`, '未提交数据就调用了回显接口');
 
     let result = extractData(EnterpriseTeamConfig, teamInfo, false);
@@ -299,7 +299,7 @@ export async function showTeamInfo(uscc:string) {
 
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-    let teamInfo = await findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
+    let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo || !teamInfo.year) {
         teamInfo = { 
             doctor:0, master:0, undergraduate:0, juniorCollege:0,
@@ -326,7 +326,7 @@ export async function updateTeamInfo(uscc:string, form) {
 
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-    let teamInfo = await findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
+    let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo.isUpdate) throw new BizError(ERRORENUM.请先创建填报数据, `${uscc}修改团队信息数据前库里并没有创建数据`);
 
     teamInfo.doctor = form.doctor || 0;
@@ -356,9 +356,9 @@ export async function submit(uscc:string, type:number) {
     let {declarationQuarter, declarationYear} = getDeclarationTime();
     let dataInfo;
     if (type == ENTERPRISEDECLARATIONTYPE.团队信息) {
-        dataInfo = await findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
+        dataInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     } else {
-        dataInfo = await findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
+        dataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     }
     if (!dataInfo || !dataInfo.year) throw new BizError(ERRORENUM.未提交填报数据不能修改, `${uscc}修改前库里并没有创建数据`);
 
@@ -376,8 +376,8 @@ export async function submit(uscc:string, type:number) {
 export async function dataDeclarationTask() {
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-    let teamDataCount = await findTeamDataCountByTime(declarationYear, declarationQuarter);
-    let businessDataCount = await findBusinessDataCountByTime(declarationYear, declarationQuarter);
+    let teamDataCount = await teamData.findTeamDataCountByTime(declarationYear, declarationQuarter);
+    let businessDataCount = await businessData.findBusinessDataCountByTime(declarationYear, declarationQuarter);
 
     if (teamDataCount >0 && businessDataCount > 0) return;
 
@@ -408,8 +408,8 @@ export async function dataDeclarationTask() {
     });
     
     /**发放任务 */
-    if (businessDataCount == 0 ) await addManyBusinessData(businessList);
+    if (businessDataCount == 0 ) await businessData.addManyBusinessData(businessList);
     logHandle(`添加了${businessList.length} 经营数据任务`);
-    if (teamDataCount == 0 ) await addManyTeamData(teamList);
+    if (teamDataCount == 0 ) await teamData.addManyTeamData(teamList);
     logHandle(`添加了${teamList.length} 团队数据任务`);
 }