Skip to content

Y
yuyiAdminServer
Commit 9c107d2e by Zllgogo
Options

no message

parent c215d6a4
Showing with 63 additions and 85 deletions
src/biz/admin.ts
......@@ -566,7 +566,7 @@ export async function iprList(enterpriseName, page) {
uscc,
enterpriseName,
count:0,
softwareCopyrightCount: 0,
softwareCopyrightCount: 0,//软件著作权
inventionPatentCount: 0,
overseasPatentCount: 0,
plantVarietyCount: 0,
......@@ -577,15 +577,17 @@ export async function iprList(enterpriseName, page) {
if (item.number) {
addItem.count += item.number;
}
if (item.iprType === enumConfig.IPROPERTYTYPE.软件著作个数) {
if (item.iprType === enumConfig.IPRALLTYPE.软件著作权) {
addItem.softwareCopyrightCount += item.number;
} else if (item.iprType === enumConfig.IPROPERTYTYPE.发明专利个数){
}else if (item.iprType === enumConfig.IPRALLTYPE.发明专利){
addItem.inventionPatentCount += item.number;
} else if (item.iprType === enumConfig.IPROPERTYTYPE.海外专利个数){
} else if (item.iprType === enumConfig.IPRALLTYPE.海外专利){
addItem.overseasPatentCount += item.number;
} else if (item.iprType === enumConfig.IPROPERTYTYPE.植物新品种个数){
} else if (item.iprType === enumConfig.IPRALLTYPE.植物新品种){
addItem.plantVarietyCount += item.number;
} else if (item.iprType === enumConfig.IPROPERTYTYPE.集成电路布图个数){
} else if (item.iprType === enumConfig.IPRALLTYPE.集成电路布图){
addItem.icLayoutCount += item.number;
}
}
......@@ -626,11 +628,18 @@ export async function getiprDetails(eId: string) {
let iprTypeInfo = {};
let fileConfig = {};
fileConfig[enumConfig.IPRALLTYPE.软件著作权] = "softwareCopyright";
fileConfig[enumConfig.IPRALLTYPE.发明专利] = "inventionPatent";
fileConfig[enumConfig.IPRALLTYPE.海外专利] = "overseasPatent";
fileConfig[enumConfig.IPRALLTYPE.植物新品种] = "plantVariety";
fileConfig[enumConfig.IPRALLTYPE.集成电路布图] = "icLayout";
resInfo[0].enterprise_iprs.forEach(info => {
let {iprName, year, iprUrl} = info;
let iprType = changeEnumValue(enumConfig.INTELLECTUALPROPERTYRIGHT, info.iprType);
let {iprName, year, iprUrl, iprType} = info;
let typeStr = fileConfig[iprType];
let yearStr = moment(year).format("YYYY");
if(!iprTypeInfo[iprType]) iprTypeInfo[iprType] = [];
if(!iprTypeInfo[typeStr]) iprTypeInfo[typeStr] = [];
let iprUrlStr = [];
//遍历iprUrl
if (iprUrl) {
......@@ -639,7 +648,7 @@ export async function getiprDetails(eId: string) {
iprUrlStr.push(`${systemConfig.imgFileUrl}${iprUrlArr[i]}`);
}
}
iprTypeInfo[iprType].push([
iprTypeInfo[typeStr].push([
{
key:"著作名称",
value: iprName
......
src/biz/fuhua.ts
......@@ -4,7 +4,7 @@
import moment = require("moment");
import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
import { FUHUASTATE, INCOME, INDUSTRY } from "../config/enum/enum";
import { FUHUASTATE, INCOME, INDUSTRY, STATE } from "../config/enum/enum";
import { operationalData, selectData, selectManyTableData } from "../data/operationalData";
import { getMySqlMs, randomId } from "../tools/system";
import { changeEnumValue } from "../util/verificationEnum";
......@@ -36,7 +36,6 @@ export async function getBaseData() {
"总资产投入金额": 0,
"引入机构数量": 0,
"引入机构投资": 0,
"企业数量": "",//新增
},
fuhuaPinfen:0, //孵化器评分 没有该字段
fuhuaInfo:{ //孵化器信息
......@@ -44,25 +43,22 @@ export async function getBaseData() {
};
let filesList = ["eId", "enterpriseName", "uscc", "logonTime"];
let selectParam = {};
let selectParam = {state:STATE.是};
/**在孵企业 当前时间小于孵化结束时间 */
let araeParam = {column:["area", "unitPrice", "roomNumber", "rent"], where:{} };
let zaifuTableInfo:any = {};
zaifuTableInfo[TABLENAME.租赁信息] = araeParam;
zaifuTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{endTime:{"%lt%":nowTime}, state:{"%notIn%":FUHUASTATE.迁出}} };
let zaifuList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, {}, {});
zaifuTableInfo[TABLENAME.企业孵化信息] = {column:["state", "startTime", "endTime"], where:{state:{"%ne%":FUHUASTATE.迁出}} };
let zaifuResList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, ["eId"], zaifuTableInfo );
if (zaifuResList) baseData.fuhuaData["在孵企业"] = zaifuList.length;
if (zaifuResList) baseData.fuhuaData["在孵企业"] = zaifuResList.length;
zaifuResList.forEach( info => {
info.enterprise_leases.forEach( lease => {
baseData.fuhuaData["在孵面积"] += parseFloat(lease.area);
})
})
// baseData.fuhuaData["在孵面积占比"] = ((baseData.fuhuaData["在孵面积(㎡)"] / baseData.fuhuaData["总面积(㎡)"])*100).toFixed(2) + "%";
/**企业数量 */
baseData.fuhuaData["企业数量"] = zaifuList.length;
/**迁出企业 */
let qianchuList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.企业孵化信息, {state:FUHUASTATE.迁出}, {});
......@@ -480,7 +476,8 @@ export async function updateRuFu(eId:string, param) {
export async function getYuYiFuHua() {
let yuyiInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.羽翼孵化器信息, {uscc:"91310115069312504K"}, []);
let dataInfo:any = extractData(YuYiBaseDataConfig, yuyiInfo);
//兼容一下唯一一个number
dataInfo.enterpriseNum = dataInfo.enterpriseNum || 0;
return {dataInfo};
}
......
src/biz/ruFu.ts
......@@ -138,6 +138,7 @@ export async function settleInEnterpriseOut(eId:string) {
}
if (resInfo.state) throw new BizError(ERRORENUM.该企业已通过审核);
await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.企业用户表, {}, {eId});//
await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.企业孵化信息, {}, {eId});
await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.租赁信息, {}, {eId});
await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.企业基础信息表, {}, {eId});
......
src/biz/zaiFu.ts
......@@ -14,7 +14,7 @@ import { getMySqlMs } from "../tools/system";
export async function enterpriseList(entepriseName:string, page:number) {
let selectParam:any = {};
let selectParam:any = {state:1};
if (entepriseName) {
selectParam.enterpriseName = {"%like%":entepriseName}
}
......
src/config/eccParam/enterprise.ts
......@@ -108,11 +108,12 @@ export const YuYiBaseDataUpdateConfig = {
totalArea:{type:"String"},//总面积
zaifuArea:{type:"String"},//在孵面积
ziyonArea:{type:"String"},//自用面积
parkArea:{key:"园区面积"},//新增
industrialScale:{key:"产业规模"},
totalAssetInvestmentAmount:{key:"总资产投入金额"},
numberOfInstitutionsIntroduced:{key:"引入机构数量"},
introduceInstitutionalInvestment:{key:"引入机构投资"}
parkArea:{type:"String"},//新增
industrialScale:{type:"String"},
enterpriseNum:{type:"Number"},
totalAssetInvestmentAmount:{type:"String"},
numberOfInstitutionsIntroduced:{type:"String"},
introduceInstitutionalInvestment:{type:"String"}
}
......
src/config/enum/enum.ts
......@@ -183,68 +183,39 @@ export enum QUARTER {
/**
* 知识产权类型
* 知识产权 全类型
*/
export enum INTELLECTUALPROPERTYRIGHT {
软件著作 = 1,
发明专利,
海外专利,
植物新品种,
集成电路布图,
export enum IPRALLTYPE {
软件著作权 = 1,
专利 = 100,
发明专利 = 101,
海外专利 = 102,
其他 = 200,
植物新品种 = 201,
集成电路布图 =202
}
/**
* 知识产权类型 前端用
*/
export enum IPRTYPECLIENT {
其他 = 0,
// 软件著作 = 1,
export enum IPRTYPE {
软件著作权 = 1,
发明专利,
海外专利,
专利
专利 = 100,
其他 = 200
}
/**
* 知识产权类型其他 前端用
*/
export enum IPRTYPECLIENTQT {
植物新品种 = 4,
集成电路布图
}
/**
 * 知识产权类型专利 前端用
 */
export enum IPRTYPECLIENTZL {
发明专利 = 2,
海外专利,
}
/**
* 知识产权及专利
*/
export enum IPROPERTYTYPE {
软件著作个数 = 1,
发明专利个数,
海外专利个数,
植物新品种个数,
集成电路布图个数
植物新品种 = 201,
集成电路布图 =202
}
/**
* 前端用
* 知识产权类型专利 前端用
*/
export enum INTELLECTUALPROPERTYRIGHT {
softwareCopyright = 1,
inventionPatent,
overseasPatent,
plantVariety,
icLayout
export enum IPRTYPECLIENTZL {
发明专利 = 101,
海外专利 = 102,
}
......
src/config/splitResult/enterprise.ts
......@@ -35,6 +35,7 @@ export const YuYiBaseDataConfig = {
zaifuArea:{key:"在孵面积"},
ziyonArea:{key:"自用面积"},
parkArea:{key:"园区面积"},//新增
enterpriseNum:{key:"企业数量"},
industrialScale:{key:"产业规模"},
totalAssetInvestmentAmount:{key:"总资产投入金额"},
numberOfInstitutionsIntroduced:{key:"引入机构数量"},
......
src/routers/fuhua.ts
......@@ -6,15 +6,15 @@ import * as fuhuaBiz from '../biz/fuhua';
export function setRouter(httpServer) {
// httpServer.post('/admin/fuhua/base', checkUser, asyncHandler(baseData));
httpServer.post('/admin/fuhua/base', asyncHandler(baseData));//
httpServer.post('/admin/fuhua/operate', asyncHandler(operateData));
httpServer.post('/admin/fuhua/risk', asyncHandler(riskData));
httpServer.post('/admin/fuhua/worth', asyncHandler(worthDate));
httpServer.post('/admin/fuhua/rufu/add', asyncHandler(addRuFu));
httpServer.post('/admin/fuhua/rufu/info', asyncHandler(getRuFu));
httpServer.post('/admin/fuhua/rufu/update', asyncHandler(updateRuFu));//
httpServer.post('/admin/fuhua/yuyi/info', asyncHandler(yuYiRuFu));
httpServer.post('/admin/fuhua/yuyi/update', asyncHandler(updateYuYi));
httpServer.post('/admin/fuhua/base', checkUser, asyncHandler(baseData));//
httpServer.post('/admin/fuhua/operate', checkUser, asyncHandler(operateData));
httpServer.post('/admin/fuhua/risk', checkUser, asyncHandler(riskData));
httpServer.post('/admin/fuhua/worth', checkUser, asyncHandler(worthDate));
httpServer.post('/admin/fuhua/rufu/add', checkUser, asyncHandler(addRuFu));
httpServer.post('/admin/fuhua/rufu/info', checkUser, asyncHandler(getRuFu));
httpServer.post('/admin/fuhua/rufu/update', checkUser, asyncHandler(updateRuFu));//
httpServer.post('/admin/fuhua/yuyi/info', checkUser, asyncHandler(yuYiRuFu));
httpServer.post('/admin/fuhua/yuyi/update', checkUser, asyncHandler(updateYuYi));
}
......
src/routers/public.ts
......@@ -22,9 +22,7 @@ const config = {
"/public/output/enterprisefinancing":outputEnumConfig.ENTERPRISEFINANCING,
"/public/output/enterprisetalent":outputEnumConfig.ENTERPRISETALENT,
"/public/output/enterpriseservice":outputEnumConfig.ENTERPRISESERVICE,
"/public/output/ipropertytype":enumConfig.IPROPERTYTYPE,//知识产权及专利类型
"/public/intellectualpropertyright":enumConfig.INTELLECTUALPROPERTYRIGHT,// 新增知识产权类型
"/public/iprtypeclient":enumConfig.IPRTYPECLIENT,// 新增知识产权类型
"/public/iprtypeclientqt":enumConfig.IPRTYPECLIENTQT,// 新增知识产权类型
"/public/iprtypeclientzl":enumConfig.IPRTYPECLIENTZL,// 新增知识产权专利
......
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