Skip to content

Y
yuyiAdminServer
Commit 7678aded by lixinming
Options

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

parents 3058730a b8ea3e20
Showing with 55 additions and 46 deletions
src/biz/admin.ts
......@@ -631,29 +631,35 @@ export async function iprList(enterpriseName, page) {
外观设计专利 : 0,
实用新型专利 : 0,
发明专利 : 0,
}
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.商标信息]) 知识产权数量.商标信息 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.商标信息].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.作品著作权]) 知识产权数量.作品著作权 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.作品著作权].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.软件著作权]) 知识产权数量.软件著作权 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.软件著作权].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.外观设计专利]) 知识产权数量.外观设计专利 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.外观设计专利].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.实用新型专利]) 知识产权数量.实用新型专利 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.实用新型专利].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.发明专利]) 知识产权数量.发明专利 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.发明专利].length;
let count = 知识产权数量.商标信息 + 知识产权数量.作品著作权 + 知识产权数量.软件著作权 + 知识产权数量.外观设计专利 + 知识产权数量.实用新型专利 + 知识产权数量.发明专利;
let addInfo = {
eId:info.eId,
enterpriseName:info.enterpriseName,
count, //知识产权总数
shangbiao:知识产权数量.商标信息,//商标信息
zuopingzhuzuo:知识产权数量.作品著作权,//作品著作权
ruanjianzhuzuo:知识产权数量.软件著作权,//软件著作权
waiguansheji:知识产权数量.外观设计专利,//外观设计专利
shiyongxinxing:知识产权数量.实用新型专利,//实用新型专利
faming:知识产权数量.发明专利,//发明专利
}
};
let count = 0;
if (Object.keys(知识产权Map).length) {
if (Object.keys(知识产权Map[info.eId]).length) {
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.商标信息]) 知识产权数量.商标信息 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.商标信息].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.作品著作权]) 知识产权数量.作品著作权 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.作品著作权].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.软件著作权]) 知识产权数量.软件著作权 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.软件著作权].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.外观设计专利]) 知识产权数量.外观设计专利 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.外观设计专利].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.实用新型专利]) 知识产权数量.实用新型专利 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.实用新型专利].length;
if (知识产权Map[info.eId][enumConfig.IPRALLTYPE.发明专利]) 知识产权数量.发明专利 = 知识产权Map[info.eId][enumConfig.IPRALLTYPE.发明专利].length;
count = 知识产权数量.商标信息 + 知识产权数量.作品著作权 + 知识产权数量.软件著作权 + 知识产权数量.外观设计专利 + 知识产权数量.实用新型专利 + 知识产权数量.发明专利;
let addInfo = {
eId:info.eId,
enterpriseName:info.enterpriseName,
count, //知识产权总数
shangbiao:知识产权数量.商标信息,//商标信息
zuopingzhuzuo:知识产权数量.作品著作权,//作品著作权
ruanjianzhuzuo:知识产权数量.软件著作权,//软件著作权
waiguansheji:知识产权数量.外观设计专利,//外观设计专利
shiyongxinxing:知识产权数量.实用新型专利,//实用新型专利
faming:知识产权数量.发明专利,//发明专利
}
resData.push(addInfo)
resData.push(addInfo)
}
}
})
let paginatedData = await paginateArray(resData, page);
......@@ -756,7 +762,7 @@ export async function getiprDetails(eId:string) {
dataList.push({
iprId:info[iprConf[0]],
iprName:info[iprConf[1]],
iprTime:info[iprConf[2]],
iprTime:moment(info[iprConf[2]]).format("YYYY-MM-DD"),
iprUrl,
timeNumber:new Date(info[iprConf[2]]).valueOf()
})
......
src/biz/fuhua.ts
......@@ -143,7 +143,7 @@ export async function getBaseData() {
* 运营推广(次数)
*/
let promotionList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.运营推广信息表,{}, ["opId","promotionType", "promotionApp", "promotionNum"]);
let promotionInfo = {"线上推广": {}, "线下推广": {}};
let promotionInfo = {"线上推广": {"视频号":0, "抖音":0, "小红书":0}, "线下推广": {"活动宣讲":0, "三方机构合作":0}};
if (promotionList.length) {
promotionList.forEach( info => {
let appStr = "";
......
src/biz/ruFu.ts
......@@ -119,6 +119,9 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
let dataList = [];
resList.forEach(info => {
let builder = "";
if (info.enterprise_leases[0].building) builder = changeEnumValue(enumConfig.BUILDING, parseInt(info.enterprise_leases[0].building));
dataList.push({
eId:info.eId,
enterpriseName:info.enterpriseName,//企业名称
......@@ -135,7 +138,7 @@ export async function settleInEnterpriseList(page:number, enterpriseName:string)
area:info.enterprise_leases[0].area,//租赁面积
// unitPrice:info.enterprise_leases[0].unitPrice,//——暂时没用
// roomNumber:info.enterprise_leases[0].roomNumber,
building: info.enterprise_leases[0].building || "",// 园区楼号
building: builder,// 园区楼号
roomNumber: info.enterprise_leases[0].roomNumber || "",// 室号
rent:info.enterprise_leases[0].rent,//月租金
logonAddress:changeAdd(JSON.parse(info.logonAddress)),//注册地址
......
src/biz/userRuFu.ts
......@@ -166,7 +166,7 @@ export async function createRuFu(uId, param) {
area: param.area || null, // 可为空
unitPrice:param.unitPrice,
// roomNumber:param.roomNumber,
building: param.building|| null, // 楼号
building: param.building || null, // 楼号
roomNumber: param.roomNumber || null,// 室号
// startTime:getMySqlMs(param.fuHuaTimeStart), //小程序和管理后台没有填写租赁时间的位置，直接使用孵化开始时间
// endTime:getMySqlMs(param.fuHuaTimeEndTime), //小程序和管理后台没有填写租赁时间的位置，直接使用孵化结束时间
......
src/config/eccParam/enterprise.ts
......@@ -51,7 +51,7 @@ export const SettleInForUpdateConfig = {
mail:{type:"String"},//邮箱
rent:{type:"Number"},//每月租金
area:{type:"Number", required: false},//面积非必填
building: { type: 'string', required: false }, // 租赁楼号非必填
building: { type: 'String', required: false }, // 租赁楼号非必填
roomNumber:{type:"String", required: false},//室号非必填
// unitPrice:{type:"Number"},//单价
// totalPrice:{type:"Number"},//总价
......@@ -81,10 +81,10 @@ export const AdminRegisterAddConfig = {
userName:{type:"String",required: true, message: '用户名不能为空'},
phone:{type:"String",required: true, message: '手机号码不能为空'},
pwd:{type:"String",required: true, message: '密码不能为空'},
mail: { 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 }, // 租赁楼号非必填
building: { type: 'String', required: false }, // 租赁楼号非必填
roomNumber:{type:"String", required: false},//室号非必填
}
......@@ -135,15 +135,15 @@ export const UserRegisterAddConfig = {
fuHuaTimeStart:{type:"Number", required: true, message: '孵化开始时间不能为空'},//孵化开始时间
fuHuaTimeEndTime:{type:"Number", required: true, message: '孵化结束时间不能为空'},//孵化结束时间
rent:{type:"Number", required: true, message: '每月租金不能为空'},//每月租金
leaseStartTime: { type: 'string', required: true, message: '租赁开始时间不能为空' },
leaseEndTime: { type: 'string', required: true, message: '租赁结束时间不能为空' },
mail: { type: 'string', required: true, message: '邮箱地址不能为空' },
leaseStartTime: { type: 'Number', required: true, message: '租赁开始时间不能为空' },
leaseEndTime: { type: 'Number', required: true, message: '租赁结束时间不能为空' },
mail: { type: 'String', required: true, message: '邮箱地址不能为空' },
// userName: { type: 'string', required: true, message: '联系人不能为空' },
// phone: { type: 'string', required: true, message: '登录手机号码不能为空' },
// pwd: { type: 'string', required: true, message: '登录密码不能为空' },
building: { type: 'string', required: false }, // 租赁楼号非必填
roomNumber: { type: 'string', required: false }, // 租赁室号非必填
area: { type: 'number', required: false }, // 租赁面积非必填
building: { type: 'String', required: false }, // 租赁楼号非必填
roomNumber: { type: 'String', required: false }, // 租赁室号非必填
area: { type: 'Number', required: false }, // 租赁面积非必填
}
/**
......
src/routers/dbinit.ts
......@@ -315,17 +315,17 @@ export async function data1210(req, res) {
// }
}
if (subList[35] || subList[36] || subList[37] || subList[38]) {
let enterprise_qualification:any = {
qId:randomId(TABLEID.企业资质),
eId,
}
if (subList[35]) enterprise_qualification.kxTime = getMySqlMs(`${ subList[35].match(/\d+/g)[0]}-01-01 00:00:00`);
if (subList[36]) enterprise_qualification.zjtxTime = getMySqlMs(`${ subList[36].match(/\d+/g)[0]}-01-01 00:00:00`);
if (subList[37]) enterprise_qualification.xjrTime = getMySqlMs(`${ subList[37].match(/\d+/g)[0]}-01-01 00:00:00`);
if (subList[38]) enterprise_qualification.gaoXinJiShuTime = getMySqlMs(`${ subList[38].match(/\d+/g)[0]}-01-01 00:00:00`);
await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业资质, enterprise_qualification, {});
}
// if (subList[35] || subList[36] || subList[37] || subList[38]) {
// let enterprise_qualification:any = {
// qId:randomId(TABLEID.企业资质),
// eId,
// }
// if (subList[35]) enterprise_qualification.kxTime = getMySqlMs(`${ subList[35].match(/\d+/g)[0]}-01-01 00:00:00`);
// if (subList[36]) enterprise_qualification.zjtxTime = getMySqlMs(`${ subList[36].match(/\d+/g)[0]}-01-01 00:00:00`);
// if (subList[37]) enterprise_qualification.xjrTime = getMySqlMs(`${ subList[37].match(/\d+/g)[0]}-01-01 00:00:00`);
// if (subList[38]) enterprise_qualification.gaoXinJiShuTime = getMySqlMs(`${ subList[38].match(/\d+/g)[0]}-01-01 00:00:00`);
// await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.企业资质, enterprise_qualification, {});
// }
}
......
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