Skip to content

Z
zjxcxServer
Commit f36aadcb by lixinming
Options

no message

parent afee3a4e
Showing with 364 additions and 4 deletions
src/biz/mobileFuHuaQi/enterprise/enterprise.ts
......@@ -19,7 +19,7 @@ import { checkChange, extractData } from "../../../util/piecemeal";
import { enterpriseLabelEvent } from "../../label";
import { findFuHuaQiByUSCC } from "../../../data/fuHuaQi/fuhuaqi";
import { LABELEVENT } from "../../../config/enum/labelEnum";
import * as leaseData from "../../../data/lease";
/**
* 添加新注册企业
......@@ -40,6 +40,16 @@ export async function registerEnterprise(uscc:string, param) {
let dataBaseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
if ( dataBaseInfo&& dataBaseInfo.uscc) throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在`);
if (param.jiaSu == 1 || param.jiaSu == 2) {
//判断
if (param.jiaSu == 1 && !param.jiaSuZiZhi) {
throw new BizError(ERRORENUM.参数错误, "加速企业缺失加速资质");
} else if (param.jiaSu == 1 && param.jiaSuZiZhi.indexOf(configEnum.JIASUZIZHI.其他) >-1 && !param.jiaSuZiZhiDesc) {
throw new BizError(ERRORENUM.参数错误, "加速企业的加速资质选了其他但是没填写内容");
}
} else throw new BizError(ERRORENUM.参数错误, "加速企业不符合1或2", param.jiaSu);
/**添加新注册企业标识 */
param.draftId = sysTools.getDraftId(uscc);//草稿箱id
param.isCreate = true;//标识此次操作是否是新注册企业并不是迁入企业
......@@ -47,6 +57,42 @@ export async function registerEnterprise(uscc:string, param) {
param.state = configEnum.FUHUASTATE.实体孵化;
await enterpriseData.createEnterprise(uscc, TaskId, param);
//2025新加内容
let leaseInfo = await leaseData.findOnceData({uscc:param});
if (leaseInfo && leaseInfo.uscc) { //
leaseInfo.enterpriseName = param.name;
leaseInfo.contractStartTime = param.contractStartTime;
leaseInfo.contractEndTime = param.contractEndTime;
leaseInfo.price = param.price;//单价
leaseInfo.area = param.leasedArea;//租赁面积
leaseInfo.address = param.leaseAddress;
leaseInfo.rentPayment = [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
];
await leaseInfo.save();
} else {
let addLease = {
uscc:param.uscc,
enterpriseName:param.name,
contractStartTime:param.contractStartTime,
contractEndTime:param.contractEndTime,
price:param.price,//单价
area:param.leasedArea,//租赁面积
rentPayment : [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
],
address:param.leaseAddress,//地址
};
await leaseData.findOnceData(addLease);
}
return {isSuccess:true};
}
......@@ -79,6 +125,15 @@ export async function updateRegisterEnterprise(uscc:string, param) {
throw new BizError(ERRORENUM.不能修改过期任务数据, `修改新注册企业的表单 ${uscc} 违法操作`);
}
if (param.jiaSu == 1 || param.jiaSu == 2) {
//判断
if (param.jiaSu == 1 && !param.jiaSuZiZhi) {
throw new BizError(ERRORENUM.参数错误, "加速企业缺失加速资质");
} else if (param.jiaSu == 1 && param.jiaSuZiZhi.indexOf(configEnum.JIASUZIZHI.其他) > -1 && !param.jiaSuZiZhiDesc) {
throw new BizError(ERRORENUM.参数错误, "加速企业的加速资质选了其他但是没填写内容");
}
} else throw new BizError(ERRORENUM.参数错误, "加速企业不符合1或2", param.jiaSu);
/**修改字段 */
let changeList = checkChange(param, dataBaseInfo);
if ( !changeList.length ) throw new BizError(ERRORENUM.数据无更新, `${param.uscc}数据无更新`);
......@@ -88,6 +143,23 @@ export async function updateRegisterEnterprise(uscc:string, param) {
await dataBaseInfo.save();
let leaseInfo = await leaseData.findOnceData({uscc:param.uscc});
if (leaseInfo && leaseInfo.uscc) { //
leaseInfo.enterpriseName = param.name;
leaseInfo.contractStartTime = param.contractStartTime;
leaseInfo.contractEndTime = param.contractEndTime;
leaseInfo.price = param.price;//单价
leaseInfo.area = param.leasedArea;//租赁面积
leaseInfo.address = param.leaseAddress;
leaseInfo.rentPayment = [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
];
await leaseInfo.save();
}
return {isSuccess:true};
}
......@@ -112,6 +184,15 @@ export async function moveInEnterprise(uscc:string, param) {
let dataBaseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
if ( dataBaseInfo && dataBaseInfo.uscc && dataBaseInfo.state != configEnum.FUHUASTATE.迁出) throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在`);
if (param.jiaSu == 1 || param.jiaSu == 2) {
//判断
if (param.jiaSu == 1 && !param.jiaSuZiZhi) {
throw new BizError(ERRORENUM.参数错误, "加速企业缺失加速资质");
} else if (param.jiaSu == 1 && param.jiaSuZiZhi.indexOf(configEnum.JIASUZIZHI.其他) > -1 && !param.jiaSuZiZhiDesc) {
throw new BizError(ERRORENUM.参数错误, "加速企业的加速资质选了其他但是没填写内容");
}
} else throw new BizError(ERRORENUM.参数错误, "加速企业不符合1或2", param.jiaSu);
const TaskId = taskTool.getTaskId(uscc);
if ( dataBaseInfo && dataBaseInfo.state && dataBaseInfo.state == configEnum.FUHUASTATE.迁出) {
......@@ -145,6 +226,41 @@ export async function moveInEnterprise(uscc:string, param) {
await enterpriseData.createEnterprise(uscc, TaskId, param);
}
//2025新加内容
let leaseInfo = await leaseData.findOnceData({uscc:param});
if (leaseInfo && leaseInfo.uscc) { //
leaseInfo.enterpriseName = param.name;
leaseInfo.contractStartTime = param.contractStartTime;
leaseInfo.contractEndTime = param.contractEndTime;
leaseInfo.price = param.price;//单价
leaseInfo.area = param.leasedArea;//租赁面积
leaseInfo.address = param.leaseAddress;
leaseInfo.rentPayment = [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
];
await leaseInfo.save();
} else {
let addLease = {
uscc:param.uscc,
enterpriseName:param.name,
contractStartTime:param.contractStartTime,
contractEndTime:param.contractEndTime,
price:param.price,//单价
area:param.leasedArea,//租赁面积
rentPayment : [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
],
address:param.leaseAddress,//地址
};
await leaseData.findOnceData(addLease);
}
return {isSuccess:true};
}
......@@ -178,6 +294,16 @@ export async function updateMoveInEnterprise(uscc:string, param) {
throw new BizError(ERRORENUM.不能修改过期任务数据, `修改新注册企业的表单 ${uscc} 违法操作`);
}
if (param.jiaSu == 1 || param.jiaSu == 2) {
//判断
if (param.jiaSu == 1 && !param.jiaSuZiZhi) {
throw new BizError(ERRORENUM.参数错误, "加速企业缺失加速资质");
} else if (param.jiaSu == 1 && param.jiaSuZiZhi.indexOf(configEnum.JIASUZIZHI.其他) > -1 && !param.jiaSuZiZhiDesc) {
throw new BizError(ERRORENUM.参数错误, "加速企业的加速资质选了其他但是没填写内容");
}
} else throw new BizError(ERRORENUM.参数错误, "加速企业不符合1或2", param.jiaSu);
/**修改数据 */
let changeList = checkChange(param, dataBaseInfo);
if ( !changeList.length ) throw new BizError(ERRORENUM.数据无更新, `${param.uscc}数据无更新`);
......@@ -186,6 +312,23 @@ export async function updateMoveInEnterprise(uscc:string, param) {
});
await dataBaseInfo.save();
let leaseInfo = await leaseData.findOnceData({uscc:param.uscc});
if (leaseInfo && leaseInfo.uscc) { //
leaseInfo.enterpriseName = param.name;
leaseInfo.contractStartTime = param.contractStartTime;
leaseInfo.contractEndTime = param.contractEndTime;
leaseInfo.price = param.price;//单价
leaseInfo.area = param.leasedArea;//租赁面积
leaseInfo.address = param.leaseAddress;
leaseInfo.rentPayment = [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
];
await leaseInfo.save();
}
return {isSuccess:true};
}
......@@ -207,6 +350,15 @@ export async function getEnterpriseByDraftId(draftId:string) {
if (dataBaseInfo.isCreate) data = extractData(splitResultConfig.EnterpriseInfoConfig, dataBaseInfo, false);
else data = extractData(splitResultConfig.EnterpriseMoveInInfoConfig, dataBaseInfo, false);
let leaseInfo = await leaseData.findOnceData({uscc:dataBaseInfo.uscc});
data.price = leaseInfo.price;
data.contractStartTime = leaseInfo.contractStartTime;
data.contractEndTime = leaseInfo.contractEndTime;
let rentPaymentInfo = leaseInfo.rentPayment[0];
data.payStartTime = rentPaymentInfo.payStartTime;
data.payLong = rentPaymentInfo.payLong;
return {data};
}
......
src/biz/mobileFuHuaQi/enterprise/myEnterprise.ts
......@@ -23,6 +23,7 @@ import { findBusinessDataByUsccAndYear } from "../../../data/enterprise/quarterT
import { selectRepleishData } from "../../../data/enterprise/replenish";
import { enterpriseLabelEvent } from "../../label";
import { findFuHuaQiByUSCC } from "../../../data/fuHuaQi/fuhuaqi";
import * as leaseData from "../../../data/lease";
import { LABELEVENT } from "../../../config/enum/labelEnum";
......@@ -399,6 +400,15 @@ export async function replenishMyEnterpriseInPutInfo(fuHuaQiUscc:string, param)
let dataBaseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
if ( dataBaseInfo && dataBaseInfo.uscc && dataBaseInfo.state != configEnum.FUHUASTATE.迁出) throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在`);
if (param.jiaSu == 1 || param.jiaSu == 2) {
//判断
if (param.jiaSu == 1 && !param.jiaSuZiZhi) {
throw new BizError(ERRORENUM.参数错误, "加速企业缺失加速资质");
} else if (param.jiaSu == 1 && param.jiaSuZiZhi.indexOf(configEnum.JIASUZIZHI.其他) > -1 && !param.jiaSuZiZhiDesc) {
throw new BizError(ERRORENUM.参数错误, "加速企业的加速资质选了其他但是没填写内容");
}
} else throw new BizError(ERRORENUM.参数错误, "加速企业不符合1或2", param.jiaSu);
/**添加新注册企业标识 */
if ( dataBaseInfo && dataBaseInfo.state && dataBaseInfo.state == configEnum.FUHUASTATE.迁出) {
dataBaseInfo.fuHuaQiUscc = fuHuaQiUscc;
......@@ -436,6 +446,43 @@ export async function replenishMyEnterpriseInPutInfo(fuHuaQiUscc:string, param)
let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.入孵, fuHuaQiInfo.operationName);
//2025新加内容
let leaseInfo = await leaseData.findOnceData({uscc:param});
if (leaseInfo && leaseInfo.uscc) { //
leaseInfo.enterpriseName = param.name;
leaseInfo.contractStartTime = param.contractStartTime;
leaseInfo.contractEndTime = param.contractEndTime;
leaseInfo.price = param.price;//单价
leaseInfo.area = param.leasedArea;//租赁面积
leaseInfo.address = param.leaseAddress;
leaseInfo.rentPayment = [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
];
await leaseInfo.save();
} else {
let addLease = {
uscc:param.uscc,
enterpriseName:param.name,
contractStartTime:param.contractStartTime,
contractEndTime:param.contractEndTime,
price:param.price,//单价
area:param.leasedArea,//租赁面积
rentPayment : [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
],
address:param.leaseAddress,//地址
};
await leaseData.findOnceData(addLease);
}
return {isSuccess:true};
}
......@@ -463,6 +510,15 @@ export async function replenishMyEnterpriseCreateInfo(fuHuaQiUscc:string, param)
param.isCreate = true;//标识此次操作是否是迁入企业并不是新注册企业
param.state = configEnum.FUHUASTATE.实体孵化;
if (param.jiaSu == 1 || param.jiaSu == 2) {
//判断
if (param.jiaSu == 1 && !param.jiaSuZiZhi) {
throw new BizError(ERRORENUM.参数错误, "加速企业缺失加速资质");
} else if (param.jiaSu == 1 && param.jiaSuZiZhi.indexOf(configEnum.JIASUZIZHI.其他) > -1 && !param.jiaSuZiZhiDesc) {
throw new BizError(ERRORENUM.参数错误, "加速企业的加速资质选了其他但是没填写内容");
}
} else throw new BizError(ERRORENUM.参数错误, "加速企业不符合1或2", param.jiaSu);
await enterpriseData.replenishEnterpriseData(fuHuaQiUscc, param);
addFuHuaQiPoint(fuHuaQiUscc, FUHUAQINODEENUM.我的企业_补录企业, param.uscc, '新注册' );
......@@ -478,6 +534,42 @@ export async function replenishMyEnterpriseCreateInfo(fuHuaQiUscc:string, param)
let enterpriseInfo = await enterpriseData.findEnterpriseByUscc(param.uscc);
await enterpriseLabelEvent(enterpriseInfo, LABELEVENT.入孵, fuHuaQiInfo.operationName);
//2025新加内容
let leaseInfo = await leaseData.findOnceData({uscc:param});
if (leaseInfo && leaseInfo.uscc) { //
leaseInfo.enterpriseName = param.name;
leaseInfo.contractStartTime = param.contractStartTime;
leaseInfo.contractEndTime = param.contractEndTime;
leaseInfo.price = param.price;//单价
leaseInfo.area = param.leasedArea;//租赁面积
leaseInfo.address = param.leaseAddress;
leaseInfo.rentPayment = [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
];
await leaseInfo.save();
} else {
let addLease = {
uscc:param.uscc,
enterpriseName:param.name,
contractStartTime:param.contractStartTime,
contractEndTime:param.contractEndTime,
price:param.price,//单价
area:param.leasedArea,//租赁面积
rentPayment : [
{
payStartTime:param.payStartTime,
payLong:param.payLong
}
],
address:param.leaseAddress,//地址
};
await leaseData.findOnceData(addLease);
}
return {isSuccess:true};
}
......
src/biz/mobileFuHuaQi/visit.ts
......@@ -614,3 +614,25 @@ export async function gwhVisitLogList(year:number) {
return {dataList}
}
export async function gwhVisitHomeStatis() {
let startMs = moment().startOf("m").valueOf();
let shengYuCount = await visitData.findCountByParam({ visitTime:{"$gt":startMs}, state:VISITSTATE.走访安排});
let leiJiCount = await visitData.findCountByParam({ visitTime:{"$gt":startMs}, state:{"$ne":VISITSTATE.走访安排}});
let thisMonthCount = shengYuCount + leiJiCount;
let rate = 0;
if (leiJiCount && thisMonthCount) {
rate = Math.ceil(leiJiCount / thisMonthCount * 100)
}
let dataInfo = {
shengYuCount,
leiJiCount,
rate
};
return {dataInfo};
}
\ No newline at end of file
src/config/eccParam/fuHuaQi.ts
......@@ -99,6 +99,16 @@ export const EnterpriseParamFormConfig = {
leasedArea:"Number",//租赁面积（平方米）
mainBusiness:"String",//主营业务
draftId:"String",//草稿id
jiaSu:{type:"Number"},//加速企业 是=1 否 =2
jiaSuZiZhi:{type:"[Number]", notMustHave:true},//加速资质
jiaSuZiZhiDesc:{type:"String", notMustHave:true},//加速资质其他
leaseAddress:{type:"String"},//租赁地址
price:{type:"Number"},//单价
contractStartTime:{type:"Number"},//合同开始时间
contractEndTime:{type:"Number"},//合同结束时间
payStartTime:{type:"Number"},//租金缴纳时间
payLong:{type:"Number"},//缴纳时长
}
......@@ -121,6 +131,16 @@ export const EnterpriseInPutParamFormConfig = {
timeOfImmigration:"Number",//迁入时间
mainBusiness:"String",//主营业务
draftId:"String",//草稿id
jiaSu:{type:"Number"},//加速企业 是=1 否 =2
jiaSuZiZhi:{type:"[Number]", notMustHave:true},//加速资质
jiaSuZiZhiDesc:{type:"String", notMustHave:true},//加速资质其他
leaseAddress:{type:"String"},//租赁地址
price:{type:"Number"},//单价
contractStartTime:{type:"Number"},//合同开始时间
contractEndTime:{type:"Number"},//合同结束时间
payStartTime:{type:"Number"},//租金缴纳时间
payLong:{type:"Number"},//缴纳时长
}
......@@ -140,6 +160,16 @@ export const RegisterEnterpriseParamConfig = {
operatingAddress:{type:"Address"},//经营地址 2.1修改
leasedArea:{type:"Number"},//租赁面积（平方米）
mainBusiness:{type:"String"},//主营业务
jiaSu:{type:"Number"},//加速企业 是=1 否 =2
jiaSuZiZhi:{type:"[Number]", notMustHave:true},//加速资质
jiaSuZiZhiDesc:{type:"String", notMustHave:true},//加速资质其他
leaseAddress:{type:"String"},//租赁地址
price:{type:"Number"},//单价
contractStartTime:{type:"Number"},//合同开始时间
contractEndTime:{type:"Number"},//合同结束时间
payStartTime:{type:"Number"},//租金缴纳时间
payLong:{type:"Number"},//缴纳时长
};
......@@ -161,6 +191,16 @@ export const MoveInEnterpriseParamConfig = {
operatingAddress:"Address",//经营地址 2.1修改
leasedArea:"Number",//租赁面积（平方米）
mainBusiness:"String",//主营业务
jiaSu:{type:"Number"},//加速企业 是=1 否 =2
jiaSuZiZhi:{type:"[Number]", notMustHave:true},//加速资质
jiaSuZiZhiDesc:{type:"String", notMustHave:true},//加速资质其他
leaseAddress:{type:"String"},//租赁地址
price:{type:"Number"},//单价
contractStartTime:{type:"Number"},//合同开始时间
contractEndTime:{type:"Number"},//合同结束时间
payStartTime:{type:"Number"},//租金缴纳时间
payLong:{type:"Number"},//缴纳时长
};
......@@ -251,6 +291,16 @@ export const ReplenishMyEnterpriseInPutDataConfig = {
leasedArea:{type:"Number"},//租赁面积（平方米）
timeOfImmigration:{type:"Number"},//迁入时间
oldLogonAddress:{type:"Address"},//迁入前注册地址
jiaSu:{type:"Number"},//加速企业 是=1 否 =2
jiaSuZiZhi:{type:"[Number]", notMustHave:true},//加速资质
jiaSuZiZhiDesc:{type:"String", notMustHave:true},//加速资质其他
leaseAddress:{type:"String"},//租赁地址
price:{type:"Number"},//单价
contractStartTime:{type:"Number"},//合同开始时间
contractEndTime:{type:"Number"},//合同结束时间
payStartTime:{type:"Number"},//租金缴纳时间
payLong:{type:"Number"},//缴纳时长
}
......@@ -270,6 +320,16 @@ export const ReplenishMyEnterpriseCreateDataConfig = {
logonAddress:{type:"Address"},//注册地址
operatingAddress:{type:"Address"},//经营地址
leasedArea:{type:"Number"},//租赁面积（平方米）
jiaSu:{type:"Number"},//加速企业 是=1 否 =2
jiaSuZiZhi:{type:"[Number]", notMustHave:true},//加速资质
jiaSuZiZhiDesc:{type:"String", notMustHave:true},//加速资质其他
leaseAddress:{type:"String"},//租赁地址
price:{type:"Number"},//单价
contractStartTime:{type:"Number"},//合同开始时间
contractEndTime:{type:"Number"},//合同结束时间
payStartTime:{type:"Number"},//租金缴纳时间
payLong:{type:"Number"},//缴纳时长
}
......
src/config/enum.ts
......@@ -606,3 +606,15 @@ export enum ENTERPRISECHANGETYPE {
企业认定,
股东
}
export enum JIASUZIZHI {
区级毕业 = 1,
市级毕业,
高新技术,
专精特新,
小巨人,
融资超1000万,
连续两年营收1000万以上,
其他
}
\ No newline at end of file
src/config/splitResultConfig.ts
......@@ -51,6 +51,10 @@ export const EnterpriseInfoConfig = {
operatingAddress:{key:"经营地址"},//
leasedArea:{key:"租赁面积（平方米）"},
mainBusiness:{key:"主营业务"},//主营业务
jiaSu:{key:"是否是加速企业"},//
jiaSuZiZhi:{key:"加速资质"},//
jiaSuZiZhiDesc:{key:"选其他时"},//
leaseAddress:{key:"租赁地址"},//
};
......@@ -73,6 +77,10 @@ export const EnterpriseMoveInInfoConfig = {
timeOfImmigration:{key:"迁入时间", changeDate:true},//
oldLogonAddress:{key:"迁入前注册地址"},//
mainBusiness:{key:"主营业务"},//主营业务
jiaSu:{key:"是否是加速企业"},//
jiaSuZiZhi:{key:"加速资质"},//
jiaSuZiZhiDesc:{key:"选其他时"},//
leaseAddress:{key:"租赁地址"},//
};
......
src/data/enterprise/enterprise.ts
......@@ -140,9 +140,11 @@ const enterpriseSchema = new Schema({
oldLng:String,//经度
oldLat:String,//纬度
follow:Boolean,//是否关注
leaseInfo:{type:leaseScheme, default:{}},//租赁信息
jiaSu:{type:Boolean, default:false},//是否是加速企业
jiaSuZiZhi:{type:[Number], default:[]},//加速资质
jiaSuZiZhiDesc:String,//选其他时
leaseAddress:String,//租赁地址
});
var enterpriseModel;
......
src/routers/guanWeiHuiMobileClient/visit.ts
......@@ -15,6 +15,9 @@ export function setRouter(httpServer) {
httpServer.post('/guanweihui/visit/update/state', checkFuHuaQiToken, asyncHandler(gwh_visit_update_state));
httpServer.post('/guanweihui/visit/log/statis', checkFuHuaQiToken, asyncHandler(gwh_visit_log_statis));
httpServer.post('/guanweihui/visit/log/list', checkFuHuaQiToken, asyncHandler(gwh_visit_log_list));
//首页
httpServer.post('/guanweihui/visit/home/statis', checkFuHuaQiToken, asyncHandler(gwh_visit_home_statis));//新加
}
......@@ -81,3 +84,9 @@ async function gwh_visit_log_list(req, res) {
let userInfo = await visitBiz.gwhVisitLogList( year);
res.success(userInfo);
}
async function gwh_visit_home_statis(req, res) {
let userInfo = await visitBiz.gwhVisitHomeStatis();
res.success(userInfo);
}
\ No newline at end of file
src/routers/mobileClient/month.ts
/**
* 小程序端 孵化器入口 月度报表功能路由
* 小程序端 孵化器入口 月度报表功能路由（出租率）
*/
import * as asyncHandler from 'express-async-handler';
......
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