Skip to content

W
wenHuaBu_adminServer
Commit db4a75d8 by lixinming
Options

no message

parent 218abffc
Showing with 110 additions and 111 deletions
src/biz/member/member.ts
......@@ -78,7 +78,7 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
*/
const UnitBasicConfig = ["userId", "unitName", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", "contactPerson", "contactPersonDuties", "contactPersonPhone",
"uusinessLicenseUrl", "addres", "sheng", "shi", "qu"];
"uusinessLicenseUrl", "addres", "sheng", "shi", "qu", "applicationForm"];
const UnitConfig = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua",
"yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua",
"jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"];
......
src/biz/officialWebsite.ts
......@@ -434,17 +434,16 @@ export async function zhuTiJiaoYu() {
/**
* 学习园地视频资料
* 学习园地视频图片
* @param param0
* @returns
*/
export async function xueXiYuanDiShiPin({type}) {
export async function xueXiYuanDiShiPin({}) {
let dataList = [];
let spDBList = await find(TABLEENUM.视频管理, {videoType:type, display:STATE.是});
spDBList.forEach(info => {
let addInfo:any = extractData(info, ["id", "title", "videoUrl", "videoTime", "coverUrl"]);
addInfo.videoTime = moment(addInfo.videoTime).format("YYYY-MM-DD");
let wzDBList = await find(TABLEENUM.文字资料, {});
wzDBList.forEach(info => {
let addInfo:any = extractData(info, ["id", "title", "rank", "type", "imgUrl", "coverUrl"]);
addInfo.updateTime = moment(addInfo.updateTime).format("YYYY-MM-DD");
dataList.push(addInfo);
});
......@@ -456,13 +455,13 @@ export async function xueXiYuanDiShiPin({type}) {
* @param param0
* @returns
*/
export async function xueXiYuanDiWenZi({type}) {
export async function xueXiYuanDiWenZi({}) {
let dataList = [];
let wzDBList = await find(TABLEENUM.文字资料, {type});
let findParam = {articleType:{"$in":[ARTICLEPOSITION.学习园地_文字资料]}, display:STATE.是};
let wzDBList = await findToSortToPage(TABLEENUM.文章管理, findParam, ["id", "title", "articleTime"], {articleTime:-1}, 1);
wzDBList.forEach(info => {
let addInfo:any = extractData(info, ["title", "rank", "imgUrl", "articleUrl", "updateTime"]);
addInfo.id = info.articleTitle
addInfo.updateTime = moment(addInfo.updateTime).format("YYYY-MM-DD");
let addInfo:any = extractData(info, ["id", "title", "articleTime"]);
addInfo.articleTime = moment(addInfo.articleTime).format("YYYY-MM-DD");
dataList.push(addInfo);
});
......@@ -487,24 +486,14 @@ export async function dangJianZiYuan({first, secondary, three, pageNumber}) {
dataList.push({id, title, desc, articleTime:moment(articleTime).format("YYYY-MM-DD"), imgUrl});
});
} else {//学习园地
if (secondary == PARTYBUILDSUBTYPEENUM.文字资料) {
let wzDBList = await findToPage(TABLEENUM.文字资料, {type:three}, [ "title", "rank", "imgUrl", "articleUrl", "updateTime"], pageNumber);
dataCount = await findCount(TABLEENUM.文字资料, {type:three});
wzDBList.forEach(info => {
let addInfo:any = extractData(info, ["title", "rank", "imgUrl", "articleUrl", "updateTime"]);
addInfo.updateTime = moment(addInfo.updateTime).format("YYYY-MM-DD");
dataList.push(addInfo);
});
} else {
let spDBList = await findToPage(TABLEENUM.视频管理, {videoType:three, display:STATE.是}, ["title", "videoUrl", "videoTime"], pageNumber);
dataCount = await findCount(TABLEENUM.视频管理, {videoType:three, display:STATE.是});
spDBList.forEach(info => {
let addInfo:any = extractData(info, ["title", "videoUrl", "videoTime"]);
addInfo.videoTime = moment(addInfo.videoTime).format("YYYY-MM-DD");
dataList.push(addInfo);
});
}
let findParam = {articleType:{"$in":[secondary]}, display:STATE.是};
let dataBaseList = await findToSortToPage(TABLEENUM.文章管理, findParam, ["id", "title", "desc", "articleTime", "imgUrl"], {articleTime:-1}, pageNumber);
dataCount = await findCount(TABLEENUM.文章管理, findParam);
dataBaseList.forEach(item => {
let {title, desc, articleTime, imgUrl, id} = item;
dataList.push({id, title, desc, articleTime:moment(articleTime).format("YYYY-MM-DD"), imgUrl});
});
}
return {dataList, dataCount};
......@@ -526,13 +515,8 @@ export async function dangJianZiYuanMuLu({}) {
value:PARTYBUILDTYPEENUM.学习园地,
subList:[
{
name:"视频资料",
value:PARTYBUILDSUBTYPEENUM.视频资料,
subList:[]
},
{
name:"文字资料",
value:PARTYBUILDSUBTYPEENUM.文字资料,
value:ARTICLEPOSITION.学习园地_文字资料,
subList:[]
}
]
......@@ -547,19 +531,7 @@ export async function dangJianZiYuanMuLu({}) {
subList:[]
});
}
for (let key in DANGJIANVIDEO) {
let anyKey:any = key;
if (isNaN(anyKey)) {
let keyStr = key;
let value = DANGJIANVIDEO[key];
dataList[1].subList[0].subList.push({name:keyStr, value});
}
}
let wenZiDBList = await find(TABLEENUM.党建, {type:PARTYBUILDTYPEENUM.学习园地, subType:PARTYBUILDSUBTYPEENUM.文字资料});
wenZiDBList.forEach(info => {
let {id, name} = info;
dataList[1].subList[1].subList.push({name, value:id});
});
return {dataList};
}
......@@ -571,22 +543,32 @@ export async function dangJianZiYuanMuLu({}) {
*/
export async function tongZhiGongGao({type, pageNumber}) {
eccEnumValue("通知公告", "类型", TONGZHIGONGGAO, type);
let tableName;
switch (type) {
case TONGZHIGONGGAO.会议通知: tableName = TABLEENUM.会议通知; break;
case TONGZHIGONGGAO.活动通知: tableName = TABLEENUM.活动通知; break;
case TONGZHIGONGGAO.项目公告: tableName = TABLEENUM.项目公告; break;
}
// let tableName;
// switch (type) {
// case TONGZHIGONGGAO.会议通知: tableName = TABLEENUM.会议通知; break;
// case TONGZHIGONGGAO.活动通知: tableName = TABLEENUM.活动通知; break;
// case TONGZHIGONGGAO.项目公告: tableName = TABLEENUM.项目公告; break;
// }
// let dbList = await findToPage(tableName, {push:STATE.是}, ["id", "name", "st", "addrest", "members", "desc"], pageNumber);
// let dataCount = await findCount(tableName, {push:STATE.是});
// let dataList = [];
// dbList.forEach(info => {
// let item:any = extractData(info, ["id", "name", "addrest"]);
// item.time = moment(info.st).format("YYYY-MM-DD");
// item.desc = info.desc || "";
// item.members = changeEnumValue(CODPARTICIPANT, info.members);
// dataList.push(item);
// });
let findParam = {articleType:{"$in":[type]}, display:STATE.是};
let dataBaseList = await findToSortToPage(TABLEENUM.文章管理, findParam, ["id", "title", "desc", "imgUrl", "articleTime" ], {articleTime:-1}, pageNumber);
let dataCount = await findCount(TABLEENUM.文章管理, findParam);
let dbList = await findToPage(tableName, {push:STATE.是}, ["id", "name", "st", "addrest", "members", "desc"], pageNumber);
let dataCount = await findCount(tableName, {push:STATE.是});
let dataList = [];
dbList.forEach(info => {
let item:any = extractData(info, ["id", "name", "addrest"]);
item.time = moment(info.st).format("YYYY-MM-DD");
item.desc = info.desc || "";
item.members = changeEnumValue(CODPARTICIPANT, info.members);
dataList.push(item);
dataBaseList.forEach(info => {
let { id, title, desc, imgUrl, articleTime } = info;
dataList.push({
id, title, desc, imgUrl, articleTime:moment(articleTime).format("YYYY-MM-DD")
});
});
return { dataList, dataCount};
......@@ -595,20 +577,24 @@ export async function tongZhiGongGao({type, pageNumber}) {
export async function tongZhiGongGaoInfo({id, type}) {
eccEnumValue("通知公告", "类型", TONGZHIGONGGAO, type);
let tableName;
switch (type) {
case TONGZHIGONGGAO.会议通知: tableName = TABLEENUM.会议通知; break;
case TONGZHIGONGGAO.活动通知: tableName = TABLEENUM.活动通知; break;
case TONGZHIGONGGAO.项目公告: tableName = TABLEENUM.项目公告; break;
}
let dbData = await findOnce(tableName, {id, push:STATE.是}, ["id", "name", "st", "addrest", "members", "desc"]);
if (!dbData || !dbData.id) throw new BizError(ERRORENUM.目标数据不存在);
let dataInfo:any = extractData(dbData, ["name", "addrest"]);
dataInfo.time = moment(dbData.st).format("YYYY-MM-DD");
dataInfo.desc = dbData.desc || "";
dataInfo.members = changeEnumValue(CODPARTICIPANT, dbData.members);
// let tableName;
// switch (type) {
// case TONGZHIGONGGAO.会议通知: tableName = TABLEENUM.会议通知; break;
// case TONGZHIGONGGAO.活动通知: tableName = TABLEENUM.活动通知; break;
// case TONGZHIGONGGAO.项目公告: tableName = TABLEENUM.项目公告; break;
// }
// let dbData = await findOnce(tableName, {id, push:STATE.是}, ["id", "name", "st", "addrest", "members", "desc"]);
// if (!dbData || !dbData.id) throw new BizError(ERRORENUM.目标数据不存在);
// let dataInfo:any = extractData(dbData, ["name", "addrest"]);
// dataInfo.time = moment(dbData.st).format("YYYY-MM-DD");
// dataInfo.desc = dbData.desc || "";
// dataInfo.members = changeEnumValue(CODPARTICIPANT, dbData.members);
return {dataInfo};
let findParam = {id, articleType:{"$in":[type]}, display:STATE.是};
let dataBaseInfo = await findOnce(TABLEENUM.文章管理, findParam, ["id", "title", "desc", "imgUrl", "articleTime" ]);
dataBaseInfo.articleTime = moment(dataBaseInfo.articleTime).format("YYYY-MM-DD");
return {dataInfo:dataBaseInfo};
}
......@@ -648,15 +634,27 @@ export async function fenZhiJiGou() {
export async function fenHuiDongTai({agencyId, pageNumber}) {
let selectParam:any = {};
let nameMap = {};
if (agencyId) {
let jigoiuInfo = await findOnce(TABLEENUM.机构管理, {id:agencyId});
if (!jigoiuInfo || !jigoiuInfo.id) throw new BizError(ERRORENUM.找不到该机构);
nameMap[agencyId] = jigoiuInfo.name;
} else {
let jigoiuList = await find(TABLEENUM.机构管理, {}, ["id", "name"]);
jigoiuList.forEach(info => {
nameMap[info.id] = info.name;
});
}
let selectParam:any = {isUse:STATE.是};
if (agencyId) selectParam.agencyId = agencyId;
let jiGouList = await findToPage(TABLEENUM.工作动态, selectParam, ["id", "title", "activityTime", "imgUrl"], pageNumber);
let jiGouList = await findToPage(TABLEENUM.工作动态, selectParam, ["id", "title", "activityTime", "imgUrl", "agencyId"], pageNumber);
let dataCount = await findCount(TABLEENUM.工作动态, selectParam);
let dataList = [];
jiGouList.forEach(info => {
let {id, title, activityTime, imgUrl} = info;
dataList.push({id, title, activityTime:moment(activityTime).format("YYYY-MM-DD"), imgUrl});
let {id, title, activityTime, imgUrl } = info;
dataList.push({id, title, activityTime:moment(activityTime).format("YYYY-MM-DD"), imgUrl, name:nameMap[info.agencyId]});
});
return { dataList, dataCount }
......@@ -675,8 +673,8 @@ export async function fenHuiInfo({id}) {
}
export async function fenHuiDongTaiInfo({id}) {
let dongTaiInfo = await findOnce(TABLEENUM.工作动态, {id, isUse:true}, ["id", "title", "activityTime", "imgUrl", "desc"]);
if (!dongTaiInfo || !dongTaiInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
let dongTaiInfo = await findOnce(TABLEENUM.工作动态, {id, isUse:STATE.是}, ["id", "title", "activityTime", "imgUrl", "desc"]);
if (!dongTaiInfo || !dongTaiInfo.id) throw new BizError(ERRORENUM.该动态未开放);
let dataInfo:any = extractData(dongTaiInfo, ["title", "activityTime", "imgUrl", "desc"]);
dataInfo.activityTime= moment(dataInfo.activityTime).format("YYYY-MM-DD");
return {dataInfo}
......
src/biz/portal/dangJianGonZuo/wenZiZiLiao.ts
......@@ -21,25 +21,25 @@ import { eccReqParamater } from "../../../util/verificationParam";
* @returns
*/
export async function list({userId, type}) {
eccEnumValue("图片视频列表", "类型", VIDEOANDIMGTYPEENUM, type);
let dbList = await find(TABLEENUM.文字资料, {type});
if (type) eccEnumValue("图片视频列表", "类型", VIDEOANDIMGTYPEENUM, type);
let dbList = await find(TABLEENUM.文字资料, {});
let dataList = [];
if ( !dbList || !dbList.length) {
let addList = [];
for (let i = 1; i <= 8; i++) {
let id = generateSystemId(TABLEENUM.文字资料, userId);
addList.push({id, rank:i, title:'', type:0, imgUrl:"", coverUrl:"" });
dataList.push({id, rank:i, title:'', type:0, imgUrl:"", coverUrl:"" });
addList.push({id, rank:i, title:'', type:1, imgUrl:"", coverUrl:"" });
dataList.push({id, rank:i, title:'', type:1, imgUrl:"", coverUrl:"" });
}
await addManyData(TABLEENUM.文字资料, addList);
}
dataList.sort((a:any, b:any) => {return a.rank - b.rank });
for (let i =0; i < dbList.length; i++) {
let info= dbList[i];
let item:any = extractData(info, [ "id", "title", "rank", "type", "imgUrl", "coverUrl" ]);
dataList.push(item);
if (type && item.type == type) dataList.push(item);
}
return {dataList};
......@@ -49,17 +49,16 @@ export async function list({userId, type}) {
/**
* 预览
*/
export async function preview({userId, type}) {
eccEnumValue("图片视频列表", "类型", VIDEOANDIMGTYPEENUM, type);
let dbList = await find(TABLEENUM.文字资料, {type});
export async function preview({userId}) {
let dbList = await find(TABLEENUM.文字资料, {});
let dataList = [];
if (!dbList || !dbList.length) {
let addList = [];
for (let i = 1; i <= 8; i++) {
let id = generateSystemId(TABLEENUM.文字资料, userId);
addList.push({id, rank:i, title:'', type:0, imgUrl:"", coverUrl:"" });
dataList.push({id, rank:i, title:'', type:0, imgUrl:"", coverUrl:"" });
addList.push({id, rank:i, title:'', type:1, imgUrl:"", coverUrl:"" });
dataList.push({id, rank:i, title:'', type:1, imgUrl:"", coverUrl:"" });
}
await addManyData(TABLEENUM.文字资料, addList);
}
......@@ -100,7 +99,7 @@ export async function del({userId, id}) {
let dataInfo = await findOnce(TABLEENUM.文字资料, {id});
if (!dataInfo || !dataInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
await updateOneData(TABLEENUM.文字资料, {id}, {title:'', imgUrl:'', position:0, articleTitle:'', articleUrl:'', updateTime:0});
await updateOneData(TABLEENUM.文字资料, {id}, {title:"", imgUrl:"", type:1, coverUrl:"", updateTime:new Date().valueOf()});
return successResult();
}
......
src/biz/portal/fenZhiJiGou/jiGouGuanLi.ts
......@@ -4,7 +4,7 @@
*/
import { ERRORENUM } from "../../../config/errorEnum";
import { addOneData } from "../../../data/add";
import { deleteOneData } from "../../../data/delete";
import { deleteManyData, deleteOneData } from "../../../data/delete";
import { TABLEENUM } from "../../../data/models/model";
import { find, findCount, findOnce, findToPage } from "../../../data/select";
import { updateOneData } from "../../../data/update";
......@@ -56,6 +56,8 @@ export async function del({userId, id}) {
let dataInfo = await findOnce(TABLEENUM.机构管理, {id});
if (!dataInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
await deleteOneData(TABLEENUM.机构管理, {id});
await deleteManyData(TABLEENUM.工作动态, {agencyId:id});
await deleteManyData(TABLEENUM.委员名单, {agencyId:id});
return successResult();
}
......
src/biz/register.ts
......@@ -235,7 +235,7 @@ export async function unitMemberRegister3({application, id}) {
remarks = "重新提交";
}
await updateOneData(TABLEENUM.用户表, {userId:id}, {userRegisterState, application, registerFlow:REGISTERFLOW.完成第三步});
await updateOneData(TABLEENUM.用户表, {userId:id}, {userRegisterState, applicationForm:application, registerFlow:REGISTERFLOW.完成第三步});
/**提交审批历史信息 */
let addApprovalHistory = {
......
src/config/enum.ts
......@@ -56,7 +56,7 @@ export enum VIDEOANDIMGTYPEENUM {
* 通知公告
*/
export enum TONGZHIGONGGAO {
会议通知 = 1,
会议通知 = 9,
活动通知,
项目公告
}
......@@ -141,7 +141,10 @@ export enum ARTICLEPOSITION {
品牌项目_hgh社会服务,
品牌项目_hgh学术研究,
品牌项目_hgh展演竞赛,
学习园地_文字资料
学习园地_文字资料,
通知公告_hgh会议通知,
通知公告_hgh活动通知,
通知公告_hgh项目公告
// 党建工作_hgh主题教育
}
......
src/config/errorEnum.ts
......@@ -50,7 +50,9 @@ export enum ERRORENUM {
手机号不正确,
短信验证码发送失败,
该手机号已被注册,
不存在该手机号的账号
不存在该手机号的账号,
该动态未开放,
找不到该机构
}
export enum ERRORCODEENUM {
......
src/routers/officalWebsite/router.ts
......@@ -129,19 +129,15 @@ export const Config = {
bindBiz:officialWebsiteBiz.zhuTiJiaoYu
},
{
apiName:"学习园地-视频资料",
apiName:"学习园地-视频图片",
subUrl:'/xuexiyuandishipin',
param:[
{key:"type", type:"Number", desc:"类型"}
],
param:[],
bindBiz:officialWebsiteBiz.xueXiYuanDiShiPin
},
{
apiName:"学习园地-文字资料",
subUrl:'/xuexiyuandiwenzi',
param:[
{key:"type", type:"Number", desc:"类型"}
],
param:[],
bindBiz:officialWebsiteBiz.xueXiYuanDiWenZi
},
{
......
src/routers/portal/router.ts
......@@ -920,7 +920,6 @@ export const Config = {
apiName:"预览",
subUrl:'/dangjiangonzuo/wenziziliao/preview',
param:[
{key:"type", type:"Number", desc:"类型"}
],
bindBiz:wenZiZiLiaoBiz.preview
},
......@@ -932,7 +931,7 @@ export const Config = {
{key:"title", type:"String", desc:"展示标题"},
{key:"imgUrl", type:"String", desc:"图片or视频地址"},
{key:"type", type:"Number", desc:"类型 参考公用接口videoimgtype"},
{key:"coverUrl", type:"Number", desc:"视频封面地址 当类型为图片时可以不传", notMustHave:true},
{key:"coverUrl", type:"String", desc:"视频封面地址 当类型为图片时可以不传", isNull:true},
],
bindBiz:wenZiZiLiaoBiz.update
},
......
src/routers/router.ts
......@@ -23,10 +23,10 @@ const Look = false;//true更新文档
export async function setRouter(httpServer){
if (Look) {
await getDoc();
// await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
// await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
// await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
// await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
// await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
// await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
}
......
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