Commit 4db6d45b by chenjinjing

no message

parent f3c72a3b
...@@ -20,14 +20,11 @@ import { sendVerificationCode } from "./mail"; ...@@ -20,14 +20,11 @@ import { sendVerificationCode } from "./mail";
//企业用户表没有存uscc字段,先查询到企业eId,然后到用户表查询密码判断是否登录成功 //企业用户表没有存uscc字段,先查询到企业eId,然后到用户表查询密码判断是否登录成功
export async function enterpriseLogin(phone:string, pwd:string) { export async function enterpriseLogin(phone:string, pwd:string) {
// let dbInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc}, ["eId"]);
let filesList = ["userName", "eId", "pwd", "uId", "phone"]; let filesList = ["userName", "eId", "pwd", "uId", "phone"];
let includeConf = {}; let includeConf = {};
includeConf[TABLENAME.企业孵化信息] = {colum:["state", "startTime", "endTime"], where:{state:{"%ne%":enumConfig.FUHUASTATE.迁出}} }; includeConf[TABLENAME.企业孵化信息] = {colum:["state", "startTime", "endTime"], where:{state:{"%ne%":enumConfig.FUHUASTATE.迁出}} };
includeConf[TABLENAME.企业用户表] = {colum:filesList, where:{phone} }; includeConf[TABLENAME.企业用户表] = {colum:filesList, where:{phone} };
let enterpriseInfo = await selectManyTableData(OPERATIONALDATATYPE.多表单个, TABLENAME.企业基础信息表, {}, ["enterpriseName"], includeConf); let enterpriseInfo = await selectManyTableData(OPERATIONALDATATYPE.多表单个, TABLENAME.企业基础信息表, {state:enumConfig.CHANGESTATE.已通过}, ["enterpriseName"], includeConf);
if (!enterpriseInfo || !enterpriseInfo.enterpriseName) { if (!enterpriseInfo || !enterpriseInfo.enterpriseName) {
throw new BizError(ERRORENUM.账号或密码错误); throw new BizError(ERRORENUM.账号或密码错误);
...@@ -313,71 +310,6 @@ export async function taskList(eId:string, annual, state) { ...@@ -313,71 +310,6 @@ export async function taskList(eId:string, annual, state) {
} }
// export async function taskList(eId:string, annual, state) {
// let dataList:any[] = [];
// let thisYear = new Date().getFullYear();
// let jysjFile = ["BI", "TXP", "RD", "mId", "state", "isSubmit"];
// let thisYearjJysjInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业经营信息, {eId, annual:getMySqlMs(`${thisYear}-01-01 00:00:00`)}, jysjFile);
// if (!thisYearjJysjInfo || !thisYearjJysjInfo.mId) {
// //创建新的填报任务
// let itemInfo = {
// eId,
// mId:randomId(TABLEID.企业经营信息),
// annual:getMySqlMs(`${thisYear}-01-01 00:00:00`),
// BI:0,
// TXP:0,
// RD:0,
// createTime:getMySqlMs(),
// state:0,
// isSubmit:0,
// isUpdate:0
// }
// await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业经营信息, itemInfo, {});
// }
// let lastYearjJysjInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业经营信息, { eId, annual:getMySqlMs(`${thisYear-1}-01-01 00:00:00`)}, jysjFile);
// if (!lastYearjJysjInfo || !lastYearjJysjInfo.mId) {
// //创建新的填报任务
// let itemInfo = {
// eId,
// mId:randomId(TABLEID.企业经营信息),
// annual:getMySqlMs(`${thisYear-1}-01-01 00:00:00`),
// BI:0,
// TXP:0,
// RD:0,
// createTime:getMySqlMs(),
// state:0,
// isSubmit:0,
// isUpdate:0
// }
// await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业经营信息, itemInfo, {});
// }
// let selectParam:any = {eId, annual:getMySqlMs(`${thisYear}-01-01 00:00:00`)};
// if (state == 1 ) selectParam.isSubmit = 0;
// else selectParam.isSubmit = 1;
// let manageList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业经营信息, selectParam, jysjFile);
// manageList.forEach(info => {
// dataList.push({
// mId:info.mId,
// annual:moment(info.annual).format("YYYY"),
// state:info.isSubmit,
// remaining:!info.isSubmit ? 100:0,
// isSubmit:info.isSubmit == 1
// });
// });
// return {
// dataList
// }
// }
/** /**
* 获取企业基本信息 * 获取企业基本信息
* 回显 * 回显
...@@ -649,7 +581,7 @@ export async function deleteEnterpriseServiceInfo(eId, esId) { ...@@ -649,7 +581,7 @@ export async function deleteEnterpriseServiceInfo(eId, esId) {
/** /**
* 政策速递列表 * 政策速递列表
* @param state * @param state 1:进行中,2:往期速递
* @returns * @returns
*/ */
export async function enterprisePolicyList(state, policyType) { export async function enterprisePolicyList(state, policyType) {
......
...@@ -54,6 +54,18 @@ export enum FUHUASTATE { ...@@ -54,6 +54,18 @@ export enum FUHUASTATE {
迁出= 4 迁出= 4
} }
/**
* 入孵申请审批历史-审批状态
*/
export enum CHANGESTATE {
未审核 = 0,//未审核
已驳回 = 1,//已驳回
// 重新提交 = 2,
已通过
}
/** /**
* 迁出类型 * 迁出类型
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment