no message

src/biz/fuhua.ts

@@ -9,7 +9,7 @@ import { operationalData, selectData, selectManyTableData } from "../data/operat
 import { getMySqlMs, randomId } from "../tools/system";
 import { changeEnumValue } from "../util/verificationEnum";
 import { eccFormParam } from "../util/verificationParam";
-import { AdminRegisterAddConfig, AdminRegisterUpdateConfig, YuYiBaseDataUpdateConfig } from "../config/eccParam/enterprise";
+import { AdminRegisterAddConfig, YuYiBaseDataUpdateConfig } from "../config/eccParam/enterprise";
 import { ERRORENUM } from "../config/enum/errorEnum";
 import { BizError } from "../util/bizError";
 import { extractData } from "../util/piecemeal";
@@ -171,34 +171,25 @@ export async function getOperateData(year) {
     let qushiConf = { "01": 0, "02": 0, "03": 0, "04": 0, "05": 0, "06": 0, "07": 0, "08": 0, "09": 0, "10": 0, "11": 0, "12": 0 };
 
     /**在孵企业 */
-    let zaifuParam = {
-        startTime: { "%lt%": yearTime },
-        endTime: { "%gt%": yearTime },
-        state: { "%notIn%": [FUHUASTATE.迁出] }
-    };
-    
-    let zaifuList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, zaifuParam, {});
-
-    operateData.当前在孵企业数 = zaifuList.length;
-
+    let fhColumn = ["fId", "eId", "startTime", "endTime", "state", "virtualCause", "virtualCauseDes", "moveOutType",
+        "moveOutTrace", "moveOutCause", "moveOutTime", "graduationTime", ];
+    let 在孵dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, {state: { "%between%": [FUHUASTATE.实体孵化, FUHUASTATE.虚拟孵化] }}, fhColumn);
     // 新增：统一统计每个月的数据
-    let trendInfo = { ...qushiConf }; // 初始化每月数据为0
-
-    zaifuList.forEach(info => {
-        let year = moment(info.endTime).format("YYYY");
-        let month = moment(info.endTime).format("MM");
+    let zaifuInfo = { ...qushiConf }; // 初始化每月数据为0
+    在孵dbList.forEach(info => {
+        let year = moment(info.startTime).format("YYYY");
+        let month = moment(info.startTime).format("MM");
 
         if (year === moment(yearTime).format("YYYY")) {
-            trendInfo[month] += 1;
+            operateData.当前在孵企业数 += 1;
+            zaifuInfo[month] += 1;
         }
-    });
+    })
 
-    // 转换为数组并排序
-    for (let key in trendInfo) {
-        operateData.在孵企业数变化趋势.在孵企业.push({ key, value: trendInfo[key].toString() });
-    }
+    operateData.在孵企业数变化趋势.在孵企业 = Object.keys(zaifuInfo)
+        .map(key => ({ key, value: zaifuInfo[key].toString() }))
+        .sort((a, b) => parseInt(a.key) - parseInt(b.key));
 
-    operateData.在孵企业数变化趋势.在孵企业.sort((a, b) => a.key - b.key);
 
     /**毕业企业 */
     let biyeList = await selectData(

src/biz/ruFu.ts

@@ -29,12 +29,12 @@ import { systemSendMail } from "./mail";
     let userInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {phone:param.phone}, ["uId"]);
     if (userInfo && userInfo.uId) throw new BizError(ERRORENUM.手机号码重复);
 
-    // let filesList = ["eId"];
     let filesList = ["eId", "uscc"];
-    let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc}, filesList);
-    // console.log("查询结果:", enterpriseUserInfo); // 添加日志
+    let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc, register:{"%ne%":enumConfig.CHANGESTATE.已驳回}}, filesList);
+    if (enterpriseUserInfo && enterpriseUserInfo.eId) {
+        throw new BizError(ERRORENUM.企业已存在);
+    }
 
-    if (enterpriseUserInfo && enterpriseUserInfo.eId) throw new BizError(ERRORENUM.企业已存在);
     let pinyinName = getPinyinInitials(param.enterpriseName);
     
     let addEInfo = {

src/biz/userRuFu.ts

@@ -9,7 +9,7 @@ import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
 import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
 import { BizError } from "../util/bizError";
 import { ERRORENUM } from "../config/enum/errorEnum";
-import { getMySqlMs, getToken, randomId } from "../tools/system";
+import { getMySqlMs, getPinyinInitials, getToken, randomId } from "../tools/system";
 import { changeAdd, extractData } from "../util/piecemeal";
 import { EnterpriseApplyForConfig } from "../config/splitResult/enterprise";
 import { CHANGESTATE, CHANGETYPE, FUHUASTATE, RUFUSTATE, STATE } from "../config/enum/enum";
@@ -128,15 +128,17 @@ export async function createRuFu(uId, param) {
     const FuncName = "网页添加信息填写"
     eccFormParam(FuncName, UserRegisterAddConfig, param );
 
-    // let filesList = ["eId", "uscc"];
-    // let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc}, filesList);
-    // if (enterpriseUserInfo && enterpriseUserInfo.eId) {
-    //     throw new BizError(ERRORENUM.企业已存在);
-    // }
+    let filesList = ["eId", "uscc"];
+    let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc:param.uscc, register:{"%ne%":CHANGESTATE.已驳回}}, filesList);
+    if (enterpriseUserInfo && enterpriseUserInfo.eId) {
+        throw new BizError(ERRORENUM.企业已存在);
+    }
     
+    let pinyinName = getPinyinInitials(param.enterpriseName);
     let addEInfo = {
         eId:randomId(TABLEID.企业基础信息表),
         enterpriseName:param.enterpriseName,
+        pinyinName,
         uscc:param.uscc,
         logonTime:getMySqlMs(param.logonTime),
         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),

src/config/eccParam/enterprise.ts

@@ -88,10 +88,10 @@ export const AdminRegisterAddConfig = {
 
 
 export const AdminRegisterUpdateConfig = {
-    leaseContract:{type:"String"},// 房屋租赁合同链接
-    entryPlan:{type:"String"},// 入驻计划复印件链接
-    businessLicense:{type:"String"},// 营业执照复印件链接
-    agreement:{type:"String"},// 孵化协议链接
+    leaseContract:{type:"String",required: true, message: '房屋租赁合同不能为空' },// 房屋租赁合同链接
+    entryPlan:{type:"String",required: true, message: '入驻计划复印件不能为空'},// 入驻计划复印件链接
+    businessLicense:{type:"String",required: true, message: '营业执照复印件不能为空'},// 营业执照复印件链接
+    agreement:{type:"String",required: true, message: '孵化协议不能为空'},// 孵化协议链接
 }
 
 

src/main.ts

 
-import { qccData } from "./biz/dataInit";
-import { TABLEID } from "./config/enum/dbEnum";
 import { initConfig, systemConfig } from "./config/serverConfig";
 import { httpServer } from "./net/http_server";
-import { randomId } from "./tools/system";
 
 async function lanuch() {
     await initConfig();
     httpServer.createServer(systemConfig.port);
     console.log('This indicates that the server is started successfully.');
-    // await qccData();
 }
 
 

src/routers/dbinit.ts

@@ -10,6 +10,7 @@ import { changeEnumValue } from '../util/verificationEnum';
 import { CHANGESTATE, DEGREE, FUHUASTATE, IPRALLTYPE, ZZMM } from '../config/enum/enum';
 import { operationalData } from '../data/operationalData';
 import { onceSheetBecomeOfblockData } from '../util/analysisExcel';
+import { qccData } from '../biz/dataInit';
 const xlsx = require('node-xlsx');
 const path = require('path');
 const fs = require('fs');
@@ -17,6 +18,7 @@ const fs = require('fs');
 export function setRouter(httpServer) {
     //管理员登录登出
     httpServer.post('/admin/data/maintenance/datainit/1210', checkInterior, asyncHandler(data1210));
+    httpServer.post('/admin/data/maintenance/datainit/qcc', checkInterior, asyncHandler(qccDatat0519));
 }
 
 export async function data1210(req, res) {
@@ -331,6 +333,15 @@ export async function data1210(req, res) {
     res.success({isSuccess:true});
 }
 
+
+export async function qccDatat0519(req, res) {
+    console.log("开始清洗企查查数据");
+    qccData();
+
+    res.success({isSuccess:true})
+}
+
+
 /**
  * 获取当个excel文件数据
  * @param filePath