数据补录版本改为正常版本

src/biz/mobileEnterprise/quarterTask/dataDeclaration.ts

@@ -83,13 +83,13 @@ export async function todoList(uscc:string) {
         endTime = Math.ceil((endTime - new Date().valueOf())/(24*3600*1000));
         distanceEnd = `距离本次填报结束还有${endTime}天`;
     } else {
-        //todo 这里要放开
-        // return {dataList:[], distanceEnd};
+        //todo 这里要放开  v
+        return {dataList:[], distanceEnd};
     }
-    //todo 这里10号之后要去掉
-    distanceEnd = `7月16日将停止填报本年度第一季数据`;
-    declarationYear = 2023;
-    declarationQuarter = 1;
+    // //todo 这里10号之后要去掉 v
+    // distanceEnd = `7月16日将停止填报本年度第一季数据`;
+    // declarationYear = 2023;
+    // declarationQuarter = 1;
 
     let businessDataInfo = await businessData.findNotSubmitBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
     let teamsDataInfo = await teamData.findNotSubmitTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
@@ -129,8 +129,6 @@ export async function completedList(uscc:string, year:number, quarter:number) {
     let {declarationQuarter, declarationYear} = getDeclarationTime();
 
     //是否可编辑  如果上个季度的，就可以编辑
-    //todo 过了这个月之后，这里要改回去
-    // let modifiable = (isInTime() && declarationQuarter == quarter && declarationYear == year);
     let modifiable = (declarationQuarter == quarter && declarationYear == year);
     
     let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, year, quarter);
@@ -171,13 +169,9 @@ export async function completedList(uscc:string, year:number, quarter:number) {
  * @param TXP 纳税
  */
 export async function addBusinessData(uscc:string, BI:number, RD:number, TXP:number) {
-    //todo  测试注释 后续要放开
-    //if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
-    // let {declarationQuarter, declarationYear} = getDeclarationTime();
-
-    //todo  测试注释 7-15日删除
-    let declarationQuarter = 1;
-    let declarationYear = 2023;
+    //todo  测试注释 后续要放开  v
+    if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+    let {declarationQuarter, declarationYear} = getDeclarationTime();
 
     
     let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
@@ -203,12 +197,12 @@ export async function addBusinessData(uscc:string, BI:number, RD:number, TXP:num
  * @param TXP 纳税
  */
 export async function updateBusinessData(uscc:string, BI:number, RD:number, TXP:number) {
-    //todo  测试注释 后续要放开
-    // if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
-    // let {declarationQuarter, declarationYear} = getDeclarationTime();
-    //todo  测试注释 7-15日删除
-    let declarationQuarter = 1;
-    let declarationYear = 2023;
+    //todo  测试注释 后续要放开 v
+    if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+    let {declarationQuarter, declarationYear} = getDeclarationTime();
+    // //todo  测试注释 7-15日删除 v
+    // let declarationQuarter = 1;
+    // let declarationYear = 2023;
 
 
     let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
@@ -231,13 +225,13 @@ export async function updateBusinessData(uscc:string, BI:number, RD:number, TXP:
  * @param uscc 企业统一信用代码
  */
 export async function businessInfo(uscc:string) {
-    //todo 测试注释 后续要放开
-    // if (!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}进行了违规操作`, '在非填报时间调用了回显接口');
-    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo 测试注释 后续要放开 v
+    if (!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}进行了违规操作`, '在非填报时间调用了回显接口');
+    let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-    //todo  测试注释 7-15日删除
-    let declarationQuarter = 1;
-    let declarationYear = 2023;
+    //todo  测试注释 7-15日删除 v
+    // let declarationQuarter = 1;
+    // let declarationYear = 2023;
 
 
     let businessDataInfo = await businessData.findBusinessDataByTimeAndUscc(uscc, declarationYear, declarationQuarter);
@@ -259,15 +253,15 @@ export async function businessInfo(uscc:string) {
  * @param form 表单
  */
 export async function addTeamInfo(uscc:string, form) {
-    //todo  测试注释 后续要放开
-    // if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
-     // let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo  测试注释 后续要放开  v
+    if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+    let {declarationQuarter, declarationYear} = getDeclarationTime();
     eccFormParam("企业申报团队信息数据", EnterpriseAddTeamDataConfig, form);
    
 
-    //todo  测试注释 7-15日删除
-    let declarationQuarter = 1;
-    let declarationYear = 2023;
+    //todo  测试注释 7-15日删除  v
+    // let declarationQuarter = 1;
+    // let declarationYear = 2023;
 
 
     let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
@@ -297,12 +291,12 @@ export async function addTeamInfo(uscc:string, form) {
  * @param uscc 企业统一信用代码
  */
 export async function getTeamInfo(uscc:string) {
-    //todo 测试注释 后续要放开
-    // if (!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}进行了违规操作`, '在非填报时间调用了回显接口');
-    // let {declarationQuarter, declarationYear} = getDeclarationTime();
-    //todo  测试注释 7-15日删除
-    let declarationQuarter = 1;
-    let declarationYear = 2023;
+    //todo 测试注释 后续要放开 v
+    if (!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}进行了违规操作`, '在非填报时间调用了回显接口');
+    let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo  测试注释 7-15日删除 v
+    // let declarationQuarter = 1;
+    // let declarationYear = 2023;
 
     let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo || !teamInfo.year) throw new BizError(ERRORENUM.未提交填报数据, `${uscc}进行了违规操作`, '未提交数据就调用了回显接口');
@@ -318,11 +312,11 @@ export async function getTeamInfo(uscc:string) {
  * @param uscc 企业统一信用代码
  */
 export async function showTeamInfo(uscc:string) {
-    //todo 测试注释 后续要放开
-    // let {declarationQuarter, declarationYear} = getDeclarationTime();
-    //todo  测试注释 7-15日删除
-    let declarationQuarter = 1;
-    let declarationYear = 2023;
+    //todo 测试注释 后续要放开 v
+    let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo  测试注释 7-15日删除  v
+    // let declarationQuarter = 1;
+    // let declarationYear = 2023;
 
     let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo || !teamInfo.year) {
@@ -345,13 +339,13 @@ export async function showTeamInfo(uscc:string) {
  * @param form 团队信息表单
  */
 export async function updateTeamInfo(uscc:string, form) {
-    //todo  测试注释 后续要放开
-    // if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
-    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo  测试注释 后续要放开  v
+    if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+    let {declarationQuarter, declarationYear} = getDeclarationTime();
     eccFormParam("企业修改团队信息数据", EnterpriseAddTeamDataConfig, form);
-   //todo  测试注释 7-15日删除
-   let declarationQuarter = 1;
-   let declarationYear = 2023;
+   //todo  测试注释 7-15日删除 v
+//    let declarationQuarter = 1;
+//    let declarationYear = 2023;
 
     let teamInfo = await teamData.findTeamByUsccAndTime(uscc, declarationYear, declarationQuarter);
     if (!teamInfo.isUpdate) throw new BizError(ERRORENUM.请先创建填报数据, `${uscc}修改团队信息数据前库里并没有创建数据`);
@@ -377,13 +371,13 @@ export async function updateTeamInfo(uscc:string, form) {
  */
 export async function submit(uscc:string, type:number) {
     eccEnumValue("企业提交数据申报", "type", ENTERPRISEDECLARATIONTYPE, type);
-    //todo 测试注释 后续要放开
-    // if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
-    // let {declarationQuarter, declarationYear} = getDeclarationTime();
+    //todo 测试注释 后续要放开v
+    if(!isInTime()) throw new BizError(ERRORENUM.不在填报范围之内, `${uscc}不在时间范围内提交申报`);
+    let {declarationQuarter, declarationYear} = getDeclarationTime();
 
-     //todo  测试注释 7-15日删除
-   let declarationQuarter = 1;
-   let declarationYear = 2023;
+     //todo  测试注释 7-15日删除  v
+//    let declarationQuarter = 1;
+//    let declarationYear = 2023;
 
     let dataInfo;
     if (type == ENTERPRISEDECLARATIONTYPE.团队信息) {

src/biz/mobileFuHuaQi/fuHuaQi/base.ts

@@ -21,7 +21,6 @@ import * as scoreBiz from "./score";
 /**
  * 主界面基础数据
  * 小程序端  首页的基础数据
- * 评分数据还没有
  * @param uscc 孵化器统一信用代码
  * @returns {} "incubatedAcreage", "acreageTotal", "acreagePersonalUse", "name", "lv", "institutionalNature"
  */
@@ -57,7 +56,7 @@ export async function selectFuHuaQiBaseData(uscc:string) {
     /**截取返回 */
     let data:any = extractData(splitResultConfig.FuHuaQiBaseDataConfig, dataBaseInfo, false);
     data.enterpriseTotal =  await findEnterpriseCountByFuHuaQiUscc(uscc); //企业总数
-    data.numOfEntities = data.enterpriseTotal - virtualEnterpriseNum; //实体企业总数 = 虚拟企业总数 - 虚拟企业数量
+    data.numOfEntities = data.enterpriseTotal - virtualEnterpriseNum; //实体企业总数 = 企业总数 - 虚拟企业数量
     data.numOfEntities = data.numOfEntities > 0 ? data.numOfEntities : 0;
     data.virtualEnterpriseNum = virtualEnterpriseNum;