Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiAdminServer

# Conflicts:
#	src/biz/ruFu.ts

src/biz/dataInit.ts

@@ -96,8 +96,8 @@ export async function 获取规模(uscc) {
 
 export async function qccData() {
     // test();
-    统计();
-    return
+    // 统计();
+    // return
     let iMap = await 领域补充();
     let 企业名单 = onceSheetBecomeOfblockData('在孵企业导入1210.xlsx', "Sheet1");
     let dataList = 企业名单[0].blockData;
@@ -107,7 +107,7 @@ export async function qccData() {
 
         let uscc = dataList[i][6];
         if (!iMap[uscc]) console.log(dataList[i][0]);
-        continue;
+        // continue;
         await awaitData(uscc);
         console.log(`${dataList[i][1]} 同步成功, 下标 ${i}`);
     }
@@ -144,19 +144,19 @@ async function addManyData(tableName, dataList) {
 async function awaitData(uscc:string) {
     await 工商信息(uscc);
     await 软件著作(uscc);
-    // await 主要人员(uscc);
-    // await 分支机构(uscc);
-    // await 行政许可核查(uscc);
-    // await 空壳扫描(uscc);
-    // await 准入尽职调查(uscc);
-    // await 融资信息核查(uscc);
+    await 主要人员(uscc);
+    await 分支机构(uscc);
+    await 行政许可核查(uscc);
+    await 空壳扫描(uscc);
+    await 准入尽职调查(uscc);
+    await 融资信息核查(uscc);
     await 国际专利(uscc);
-    // await 科创分(uscc);
-    // await 资质证书(uscc);
-    // await 专利查询(uscc);
-    // await 失信核查(uscc);
-    // await 严重违法核查(uscc);
-    // await 企业对外投资核查(uscc);
+    await 科创分(uscc);
+    await 资质证书(uscc);
+    await 专利查询(uscc);
+    await 失信核查(uscc);
+    await 严重违法核查(uscc);
+    await 企业对外投资核查(uscc);
 
     console.log("企查查数据同步成功");
 }

src/biz/userRuFu.ts

@@ -12,7 +12,7 @@ import { ERRORENUM } from "../config/enum/errorEnum";
 import { getMySqlMs, getToken, randomId } from "../tools/system";
 import { extractData } from "../util/piecemeal";
 import { EnterpriseApplyForConfig } from "../config/splitResult/enterprise";
-import { FUHUASTATE, RUFUSTATE, STATE } from "../config/enum/enum";
+import { CHANGESTATE, CHANGETYPE, FUHUASTATE, RUFUSTATE, STATE } from "../config/enum/enum";
 
 
 /**
@@ -80,18 +80,40 @@ export async function getRuFuState(uId) {
     let enterpriseUserInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {uId}, ["uId", "phone", "pwd", "eId"]);
 
     let ruFuState = 0;
+    //没有eId数据代表未填写过入孵申请
     if (!enterpriseUserInfo.eId) {
-        ruFuState = RUFUSTATE.信息填写;
+        ruFuState = RUFUSTATE.入孵申请信息填写;
     } else {
         let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {eId:enterpriseUserInfo.eId}, ["enterpriseName", "eId", "state", "register"]);
-        if (enterpriseInfo.state == STATE.否 && enterpriseInfo.register == STATE.否) ruFuState = RUFUSTATE.信息审核中;
-        if (enterpriseInfo.state == STATE.否 && enterpriseInfo.register == STATE.是) {
+        if (enterpriseInfo.state == CHANGESTATE.未审核 && enterpriseInfo.register == CHANGESTATE.未审核) {
+            ruFuState = RUFUSTATE.入孵申请信息审核中;
+        }
+        if (enterpriseInfo.state == CHANGESTATE.未审核 && enterpriseInfo.register == CHANGESTATE.已驳回) {
+            ruFuState = RUFUSTATE.入孵申请信息驳回; //需要回显
+        }
+
+        if (enterpriseInfo.state == CHANGESTATE.未审核 && enterpriseInfo.register == CHANGESTATE.已通过) {
             let leaseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.租赁信息, {eId:enterpriseUserInfo.eId}, []);
-            if (!leaseInfo.leaseContract && !leaseInfo.entryPlan || !leaseInfo.businessLicense || !leaseInfo.agreement) ruFuState = RUFUSTATE.补充材料;
-            else ruFuState = RUFUSTATE.材料已提交;
+            //如果入孵申请已通过，并且入孵材料还未上传，进入材料上传界面
+            if (!leaseInfo.leaseContract && !leaseInfo.entryPlan || !leaseInfo.businessLicense || !leaseInfo.agreement) {
+                ruFuState = RUFUSTATE.入孵材料填写;
+            } else {
+                ruFuState = RUFUSTATE.入孵材料审核中;
+            }
+        }
+        if (enterpriseInfo.state == CHANGESTATE.已驳回 && enterpriseInfo.register == CHANGESTATE.已通过) {
+            ruFuState = RUFUSTATE.入孵材料驳回; //需要回显
         }
-        // if (enterpriseInfo.register == 2) ruFuState = RUFUSTATE.材料审核驳回;
-        if (enterpriseInfo.state == STATE.是 && enterpriseInfo.register == STATE.是) ruFuState = RUFUSTATE.材料审核完成;
+        if (enterpriseInfo.state == CHANGESTATE.已通过 && enterpriseInfo.register == CHANGESTATE.已通过) ruFuState = RUFUSTATE.入孵材料审核成功;        
+        
+        // if (enterpriseInfo.state == STATE.否 && enterpriseInfo.register == STATE.否) ruFuState = RUFUSTATE.信息审核中;
+        // if (enterpriseInfo.state == STATE.否 && enterpriseInfo.register == STATE.是) {
+        //     let leaseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.租赁信息, {eId:enterpriseUserInfo.eId}, []);
+        //     if (!leaseInfo.leaseContract && !leaseInfo.entryPlan || !leaseInfo.businessLicense || !leaseInfo.agreement) ruFuState = RUFUSTATE.补充材料;
+        //     else ruFuState = RUFUSTATE.材料已提交;
+        // }
+        // // if (enterpriseInfo.register == 2) ruFuState = RUFUSTATE.材料审核驳回;
+        // if (enterpriseInfo.state == STATE.是 && enterpriseInfo.register == STATE.是) ruFuState = RUFUSTATE.材料审核完成;
     }
     
     return {ruFuState};
@@ -119,12 +141,11 @@ export async function createRuFu(uId, param) {
         logonTime:getMySqlMs(param.logonTime),
         logonAddress:JSON.stringify(["", "", "", param.logonAddress]),
         mail:param.mail,//邮箱地址
-        state:0,
-        register:0
+        state:CHANGESTATE.未审核,
+        register:CHANGESTATE.未审核
     };
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业基础信息表, addEInfo, {});
 
-
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业用户表, {eId:addEInfo.eId}, {uId});
 
     let fuHuaInfo = {
@@ -153,6 +174,15 @@ export async function createRuFu(uId, param) {
     }
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.租赁信息, leaseInfo, {});
 
+    let addInfo = {
+        approvalId: randomId(TABLEID.入孵申请审批表),
+        eId:addEInfo.eId,
+        changeType: CHANGETYPE.入孵申请,
+        changeState: CHANGESTATE.未审核,
+        createTimeMs: getMySqlMs()
+    }
+    await operationalData( OPERATIONALDATATYPE.增加, TABLENAME.入孵申请审批表, addInfo, {} );
+
     // let addUInfo = {
     //     eId:addEInfo.eId,
     //     uId:randomId(TABLEID.企业用户表),

src/config/eccParam/enterprise.ts

@@ -42,17 +42,17 @@ export const SettleInForUpdateConfig = {
     fuHuaTimeEndTime:{type:"Number"},//孵化结束时间
     leaseStartTime:{type:"Number"},//租赁开始时间
     leaseEndTime:{type:"Number"},//租赁结束时间
+    uId:{type:"String"},
+    userName:{type:"String"},
+    phone:{type:"String"},
+    pwd:{type:"String"},
+    mail:{type:"String"},//邮箱
     area:{type:"Number"},//面积
-    // unitPrice:{type:"Number"},//单价
+    rent:{type:"Number"},//每月租金
     building:{type:"String"},//楼号
     roomNumber:{type:"String"},//室号
-    rent:{type:"Number"},//每月租金
+    // unitPrice:{type:"Number"},//单价
     // totalPrice:{type:"Number"},//总价
-    pwd:{type:"String"},
-    phone:{type:"String"},
-    userName:{type:"String"},
-    mail:{type:"String"},//邮箱
-    uId:{type:"String"}
 }
 
 export const RegisterUpdateConfig = {
@@ -66,24 +66,24 @@ export const RegisterUpdateConfig = {
 }
 
 export const AdminRegisterAddConfig = {
+    // unitPrice:{type:"Number"},//单价
+    // totalPrice:{type:"Number"},//总价
     enterpriseName:{type:"String",required: true, message: '企业名称不能为空'},//企业名称
     uscc:{type:"String",required: true, message: '统一信用代码不能为空'},//信用代码
     logonTime:{type:"Number",required: true, message: '注册时间不能为空'},//注册时间
     logonAddress:{type:"String",required: true, message: '注册地址不能为空'},//注册地址
     fuHuaTimeStart:{type:"Number",required: true, message: '孵化开始时间不能为空'},//孵化开始时间
     fuHuaTimeEndTime:{type:"Number",required: true, message: '孵化结束时间不能为空'},//孵化结束时间
-    area:{type:"Number", required: false},//面积非必填
-    // unitPrice:{type:"Number"},//单价
-    building: { type: 'string', required: false }, // 租赁楼号非必填
-    roomNumber:{type:"String", required: false},//室号非必填
-    rent:{type:"Number",required: true, message: '每月租金不能为空'},//每月租金
-    // totalPrice:{type:"Number"},//总价
-    pwd:{type:"String",required: true, message: '密码不能为空'},
-    phone:{type:"String",required: true, message: '手机号码不能为空'},
-    userName:{type:"String",required: true, message: '用户名不能为空'},
     leaseStartTime: { type: 'Number', required: true, message: '租赁开始时间不能为空' },
     leaseEndTime: { type: 'Number', required: true, message: '租赁结束时间不能为空' },
+    userName:{type:"String",required: true, message: '用户名不能为空'},
+    phone:{type:"String",required: true, message: '手机号码不能为空'},
+    pwd:{type:"String",required: true, message: '密码不能为空'},
     mail: { type: 'string', required: true, message: '邮箱地址不能为空' },
+    rent:{type:"Number",required: true, message: '每月租金不能为空'},//每月租金
+    area:{type:"Number", required: false},//面积非必填
+    building: { type: 'string', required: false }, // 租赁楼号非必填
+    roomNumber:{type:"String", required: false},//室号非必填
 }
 
 
@@ -142,7 +142,7 @@ export const UserRegisterAddConfig = {
     building: { type: 'string', required: false }, // 租赁楼号非必填
     roomNumber: { type: 'string', required: false },    // 租赁室号非必填
     area: { type: 'number', required: false },          // 租赁面积非必填
-    }
+}
 
     /**
      * 备份

src/config/enum/enum.ts

@@ -223,9 +223,9 @@ export enum STATE {
  */
 export enum CHANGESTATE {
     未审核 = 0,//未审核
-    已通过 = 1,//已通过
-    已驳回 = 2,
-    重新提交
+    已驳回 = 1,//已通过
+    // 重新提交 = 2,
+    已通过
 }
 
 
@@ -285,14 +285,24 @@ export enum IPRTYPECLIENTZL {
 
 
 export enum RUFUSTATE {
-    信息填写 = 1,
-    信息审核中 = 2,
-    信息审核成功 = 3,
-    信息审核失败 = 4,
-    补充材料 = 5,
-    材料已提交 = 6,
-    // 材料审核驳回 = 7,
-    材料审核完成 = 7
+    /**步骤1 */
+    入孵申请信息填写 = 1,
+    入孵申请信息驳回 = 2,
+    入孵申请信息审核中 = 3,
+    入孵申请信息审核成功 = 4,
+    /**步骤2 */
+    入孵材料填写 = 5,
+    入孵材料驳回 = 6,
+    入孵材料审核中 = 7,
+    入孵材料审核成功 = 8
+    
+    // 信息填写 = 1,
+    // 信息审核中 = 2,
+    // 信息审核成功 = 3,
+    // 信息审核失败 = 4,
+    // 补充材料 = 5,
+    // 材料已提交 = 6,
+    // 材料审核完成 = 7
 }
 
 export enum RISKTYPE {

src/main.ts

@@ -9,7 +9,7 @@ async function lanuch() {
     await initConfig();
     httpServer.createServer(systemConfig.port);
     console.log('This indicates that the server is started successfully.');
-    await qccData();
+    // await qccData();
 }
 
 

src/routers/admin.ts

@@ -22,6 +22,7 @@ export function setRouter(httpServer) {
     // //新入孵企业
     httpServer.post('/admin/enterprise/settlein/list', checkUser, asyncHandler(settleIn));
     httpServer.post('/admin/enterprise/settlein/pass', checkUser, asyncHandler(settleInPass));
+    httpServer.post('/admin/enterprise/settlein/info', checkUser, asyncHandler(settleInById));
     httpServer.post('/admin/enterprise/settlein/update', checkUser, asyncHandler(settleUpdate));
     httpServer.post('/admin/enterprise/settlein/out', checkUser, asyncHandler(settleInOut));
     httpServer.post('/admin/fuhua/rufu/add', checkUser, asyncHandler(addRuFu));
@@ -758,6 +759,20 @@ async function settleInPass(req, res) {
  * @param req 
  * @param res 
  */
+async function settleInById(req, res) {
+    const UserInfo = req.userInfo;
+    let { eId } = req.body
+    let result = await ruFuBiz.settleInEnterpriseById(eId);
+
+    res.success(result);
+}
+
+
+/**
+ * 
+ * @param req 
+ * @param res 
+ */
 async function settleInOut(req, res) {
     const UserInfo = req.userInfo;
     let { eId } = req.body

src/routers/userRuFu.ts

@@ -42,7 +42,7 @@ export function setRouter(httpServer) {
 
 
 /**
- * 登录
+ * 获取入孵流程状态
  * @param req 
  * @param res 
  */