Skip to content

Y
yfs_xcx_server
Commit 85028695 by lixinming
Options

no message

parent 2b703f93
Showing with 267 additions and 107 deletions
src/biz/base.ts
......@@ -104,14 +104,20 @@ function getPartyPositionsList(numberList) {
let param = { bId };
/**资讯 = 活动表 */
let partyInformationList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.专题活动表, param, ["taId", "theme", "activitesTime"]);
let partyInformationList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.专题活动表, param, ["taId", "theme", "activitesTime", "activitiesType"]);
let dataList = [];
partyInformationList.forEach( info => {
let changeData:any = extractData(splitResultConfig.partyInformationConfig, info);
let activitiesType = [];
JSON.parse(info.activitiesType).forEach(item => {
activitiesType.push(changeEnumValue( configEnum.ACTIVITIESTYPE, item));
});
changeData.time = moment(info.activitesTime).format('YYYY-MM-DD');
changeData.dateMs = new Date(info.activitesTime).valueOf();
changeData.pbType = configEnum.PBTYPE.党建资讯;
changeData.labels = ["专题活动"];
changeData.labels = activitiesType;
changeData.id = info.taId;
dataList.push(changeData);
});
......@@ -119,16 +125,18 @@ function getPartyPositionsList(numberList) {
/**动态 */
let partyBuildingDynamicDataList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建动态表, param, ["pbId", "theme", "dataMonth", "fileName"]);
let partyBuildingDynamicDataList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建动态表, param, ["pbId", "theme", "dataMonth", "fileName", "img"]);
let dynamicsList = [];
partyBuildingDynamicDataList.forEach (info => {
let addInfo = {
theme : info.theme,
id : info.pbId,
fileUrl:info.fileName[0] || ""
// fileUrl:info.fileName[0] || "",
img:info.img,
content:info.content
}
dataList.push(addInfo);
dynamicsList.push(addInfo);
});
return {dynamicsList:dynamicsList, informationList:dataList};
......@@ -231,7 +239,7 @@ export async function memberHomeData(pmId:string, bId:number) {
*/
export async function memberHomeBottomData( bId:number, activitiesType:number) {
let files = ["theme", "activitesTime", "taId", "img", "bId"];
let thematicActivitiesList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.专题活动表, {bId, activitiesType}, files );
let thematicActivitiesList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.专题活动表, {bId, activitiesType:{"%like%":activitiesType}}, files );
let dataList = [];
thematicActivitiesList.forEach(info => {
let { taId, theme, activitesTime, img } = info;
......
src/biz/dataInit.ts 0 → 100644
/**
* 初始化数据库
*/
import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
import { operationalData, selectData } from "../middleware/databaseSuccess";
export async function dataInit() {
let list = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, {bId:1, etId:1}, ["pmId"]);
for (let i= 0; i < list.length; i++) {
let info = list[i];
let itemList = [];
for (let j = 1; j <= 6; j++) {
let item = {
pmId:info.pmId,
bId:1,
payType:2,
payableMonth:j,
payableYear:2025,
payAmount:100
};
itemList.push(item);
}
await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.党费管理表, itemList, {})
}
}
\ No newline at end of file
src/biz/memberLearning.ts
......@@ -53,7 +53,7 @@ export async function memberLearningList(pmId:string, courseEntryType:number, co
mlId,
rateOfLearning:0,
learningCompleted: 1,
courseEntryType:'[]'
textSchedule:'[]'
}
await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.学习进度表, addInfo, {});
learningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {pmId, mlId}, rateColumn);
......@@ -62,7 +62,7 @@ export async function memberLearningList(pmId:string, courseEntryType:number, co
let alanysisFileName;
let successFileList = [];//已完成
if (courseEntryType == 2) {
if (courseEntryType == configEnum.COURSEENTRYTYPE.文字) {
alanysisFileName = getFileUrl(fileName, token, configEnum.UPTYPE.党员学习 , userid);
successFileList = learningInfo.textSchedule ? JSON.parse(learningInfo.textSchedule) : [];
} else {
......@@ -93,7 +93,6 @@ export async function memberLearningList(pmId:string, courseEntryType:number, co
return {rateLearningList, courseList};
}
/**
* 学习排行
* 该用户支部的排名
......@@ -159,12 +158,21 @@ export async function branchRanking(pmId, bId?) {
* @param rateOfLearning 学习进度
*/
export async function updateRateOfLearning(rlId:number, rateOfLearning:number) {
let learningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {rlId}, ["rateOfLearning", "mlId"]);
let mlInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员学习表, {mlId:learningInfo.mlId}, ["videoDuration"]);
let rate = 100;
if (mlInfo.videoDuration) {
rate = Math.ceil(rateOfLearning/mlInfo.videoDuration*100);
}
if (rate> 100) rate = 100;
let learningCompleted = 1;
if (rateOfLearning == 100) learningCompleted = 2
let learningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {rlId}, ["rateOfLearning"]);
if (learningInfo.rateOfLearning < rateOfLearning) {
let row = await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.学习进度表, {rateOfLearning, learningCompleted}, {rlId});
console.log(row);
if (rate == 100) learningCompleted = 2
if (learningInfo.rateOfLearning < rate) {
let row = await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.学习进度表, {rateOfLearning:rate, learningCompleted}, {rlId});
}
return {isSuccess:true};
......@@ -172,25 +180,31 @@ export async function updateRateOfLearning(rlId:number, rateOfLearning:number) {
export async function updateDocRateOfLearning(rlId:number, fileName:string) {
let rateLearningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {rlId}, ["pmId", "rlId", "textSchedule"]);
let rateLearningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {rlId}, ["mlId", "rlId", "textSchedule"]);
if (!rateLearningInfo || !rateLearningInfo.rlId) throw new BizError(ERRORENUM.目标数据不存在, `更新学习进度:rlid:${rlId}`);
let {pmId} = rateLearningInfo;
let learningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {pmId}, ["pmId", "mlId"]);
if (!learningInfo || !learningInfo.pmId) throw new BizError(ERRORENUM.目标数据不存在, `更新学习进度:pmId:${pmId}`);
let mlInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员学习表, {mlId:learningInfo.mlId}, ["courseEntryType"]);
if (mlInfo.courseEntryType != 2) throw new BizError(ERRORENUM.该进度不是文字学习, `${pmId}`);
// let {pmId} = rateLearningInfo;
// let learningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {pmId}, ["pmId", "mlId"]);
// if (!learningInfo || !learningInfo.pmId) throw new BizError(ERRORENUM.目标数据不存在, `更新学习进度:pmId:${pmId}`);
let mlInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员学习表, {mlId:rateLearningInfo.mlId}, ["courseEntryType", "fileName"]);
if (mlInfo.courseEntryType != configEnum.COURSEENTRYTYPE.文字) throw new BizError(ERRORENUM.该进度不是文字学习, `${rateLearningInfo.mlId}`);
let textSchedule = !rateLearningInfo.textSchedule ? [] : JSON.parse( rateLearningInfo.textSchedule);
let isUpdate = false;
if (textSchedule.indexOf(fileName) == -1) {
isUpdate = true;
textSchedule.push(fileName);
}
let check = false;
textSchedule.forEach(item => {
if (fileName.indexOf(item) > -1 ) {
check = true;
}
})
if (isUpdate) {
let row = await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.学习进度表, {textSchedule:JSON.stringify(textSchedule)}, {rlId});
console.log();
if (!check) {
textSchedule.push(fileName);
let fileNameList = JSON.parse(mlInfo.fileName);
let rate = 0;
if (fileNameList.length) {
rate = Math.ceil(textSchedule.length/fileNameList.length*100);
}
await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.学习进度表, {textSchedule:JSON.stringify(textSchedule), rateOfLearning:rate}, {rlId});
}
return {isSuccess:true};
......
src/biz/organizationalLife.ts
......@@ -43,7 +43,7 @@ export async function organizationalLifeList(bId:number, theme:string, themeType
else state = "即将开展";
let sTimeStr = moment(info.activityStartTime).format("YYYY-MM-DD HH:mm");
let time = `${sTimeStr}-${moment(info.activityEndTime).format("HH:mm")}`
let time = `${sTimeStr}-${moment(info.activityEndTime).format("HH:mm")}`;
dataList.push({
oId:info.oId,
......@@ -81,31 +81,41 @@ export async function organlzationalLifeListDetsils(oId:number, token:string, us
checkNameMap[info.pmId] = info.name;
})
let notSignedInMember = [];
let statis = { signedIn:0, notSignedIn:0 };
let participatingPartyMember = "";
let participatingPartyMemberList = [];
let participatingPartyMemberStr = "";
participatingPartyMemberIdList.forEach(item => {
participatingPartyMember += `,${checkNameMap[item]}`;
participatingPartyMemberList.push(item);
participatingPartyMemberStr += `,${checkNameMap[item]}`;
if (signedInMember.indexOf(item) > -1) {
statis.signedIn += 1;
} else {
statis.notSignedIn += 1;
notSignedInMember.push(item);
}
});
participatingPartyMember = participatingPartyMember.replace(",", "");
participatingPartyMemberStr = participatingPartyMemberStr.replace(",", "");
// let sTimeStr = moment(info.activityStartTime).format("YYYY-MM-DD HH:mm");
// let time = `${sTimeStr}-${moment(info.activityEndTime).format("HH:mm")}`
let dataInfo = {
partyActivityType:orgLifeInfo.partyActivityType,//党建活动类型
activityStartTime:new Date(orgLifeInfo.activityStartTime).valueOf(),//活动开始时间
activityEndTime:new Date(orgLifeInfo.activityEndTime).valueOf(),//活动结束时间
// activityStartTime:moment(orgLifeInfo.activityStartTime).format("YYYY-MM-DD"),//活动开始时间
// activityEndTime:moment(orgLifeInfo.activityEndTime).format("YYYY-MM-DD"),//活动结束时间
// activityTime:``
activityAdd:orgLifeInfo.activityAdd,//活动地点
activityHost:orgLifeInfo.activityHost,//活动主持人
activityNoteTaker:orgLifeInfo.activityNoteTaker,//活动记录人
leavePartyMember,//请假党员
participatingPartyMember:participatingPartyMemberList,//参与党员
participatingPartyMember:participatingPartyMemberIdList,//参与党员
participatingPartyMemberStr:participatingPartyMemberStr,//解析好的字符串
activityLog:orgLifeInfo.activityLog,
statis
statis,
signedInMember,//签到人员id列表
notSignedInMember,//未签到人员id列表
};
return {dataInfo};
......@@ -122,8 +132,8 @@ export async function addOrg(bId, param) {
let addInfo = {
bId,
partyActivityType:param.partyActivityType,
activityStartTime:moment(param.activityStartTime).format("YYYY-MM-DD"),
activityEndTime:moment(param.activityEndTime).format("YYYY-MM-DD"),
activityStartTime:moment(param.activityStartTime).format("YYYY-MM-DD HH:mm:SS"),
activityEndTime:moment(param.activityEndTime).format("YYYY-MM-DD HH:mm:SS"),
activityAdd:param.activityAdd,
activityHost:param.activityHost,
activityNoteTaker:param.activityNoteTaker,
......@@ -144,23 +154,32 @@ export async function updateOrg(oId, param) {
let activityNoteTaker = [];
if (param.activityNoteTaker) activityNoteTaker = [param.activityNoteTaker];
let leavePartyMember = [];
if (param.leavePartyMember) leavePartyMember = [param.leavePartyMember];
let updateInfo = {
partyActivityType:param.partyActivityType,
activityStartTime:moment(param.activityStartTime).format("YYYY-MM-DD"),
activityEndTime:moment(param.activityEndTime).format("YYYY-MM-DD"),
activityStartTime:moment(param.activityStartTime).format("YYYY-MM-DD HH:mm:SS"),
activityEndTime:moment(param.activityEndTime).format("YYYY-MM-DD HH:mm:SS"),
activityAdd:param.activityAdd,
activityHost:JSON.stringify(param.activityHost || []),
activityNoteTaker:JSON.stringify(activityNoteTaker),
leavePartyMember:JSON.stringify(leavePartyMember),
activityHost:param.activityHost,
activityNoteTaker:param.activityNoteTaker,
leavePartyMember:JSON.stringify(param.leavePartyMember || []),
participatingPartyMember:JSON.stringify(param.participatingPartyMember || []),
signedInMember:JSON.stringify(param.signedInMember || []),//签到人员
activityLog:param.log,//活动记录
};
await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.组织生活表, updateInfo, {oId});
await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.组织生活表, updateInfo, {oId});
return {isSuccess:true}
}
export async function delOrg(oId) {
let clomun = ["oId"];
let orgLifeInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.组织生活表, {oId}, clomun);
if (!orgLifeInfo || !orgLifeInfo.oId) throw new BizError(ERRORENUM.目标数据不存在);
await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.组织生活表, {}, {oId});
return {isSuccess:true}
}
......
src/biz/partyBuildingDynamic.ts
......@@ -13,7 +13,7 @@ import { changeEnumValue } from "../util/verificationEnum";
/**
* 获取党建动态列表
* 获取党建资讯列表
* @param bId
* @param theme 主题
* @param activityYear 年份
......@@ -52,7 +52,7 @@ export async function partyBuildingDynamicList(bId:number, activitiesType:Number
/**
* 获取党建动态详情
* 获取党建资讯详情
* @param pbId
* @returns partyBuildingDynamicInfo:{ "theme":"党建动态主题", "dataMonth":"数据月份", "fileName":["党建动态文件名称", ......] }
*/
......@@ -80,6 +80,27 @@ export async function partyBuildingDynamicDetsils(taId:number) {
}
/**
* 获取党建动态详情
* @param pbId
* @returns partyBuildingDynamicInfo:{ "theme":"党建动态主题", "dataMonth":"数据月份", "fileName":["党建动态文件名称", ......] }
*/
export async function dynamicsDetails(pbId:number) {
let files = ["pbId", "img", "theme", "content", "activitesTime"];
let partyInformation = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党建动态表, {pbId}, files);
let dataInfo:any = {};
dataInfo.pbId = partyInformation.taId;
dataInfo.theme = partyInformation.theme;
dataInfo.content = partyInformation.content;
dataInfo.activitesTime = moment(partyInformation.activitesTime).format("YYYY-MM-DD");
dataInfo.source = "牙防所党建";
dataInfo.img = partyInformation.img || "http://172.16.3.239:40004/yfs/files/4/default.png";
return {dataInfo};
}
......
src/biz/partyExpenses.ts
......@@ -66,7 +66,38 @@ import { changeEnumValue } from "../util/verificationEnum";
}
/**
*
*/
export async function selfPartyExpensesData(userid, payType) {
let param = {pmId:userid};
let partyExpensesList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党费管理表, param, ["peId", "payType", "payAmount", "payableMonth"]);
let userInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员基础信息表, param, ["partyJoiningTime"]);
let dataList = [];
let payCount = 0;
partyExpensesList.forEach(info => {
if (payType == info.payType) {
dataList.push({
month:info.payableMonth+'月',
payAmount:info.payAmount+'元',
payType:changeEnumValue(configEnum.PAYTYPE, info.payType)
});
}
if (info.payType == configEnum.PAYTYPE.已缴纳) {
payCount += info.payAmount;
}
})
let activityCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.组织生活表, {signedInMember:{"%like%":userid } }, [] );
let partyStanding = "-年";
if (partyStanding) partyStanding = Math.floor(moment().diff(userInfo.partyJoiningTime, 'years'))+'年';
return {dataList, statis:{payCount, activityCount, partyStanding}};
}
......
src/biz/partyMember.ts
......@@ -120,7 +120,13 @@ export async function partyMemberNameList(bId:number, name:string) {
changeData.position = "-";
return {dataInfo:changeData};
let middleInfo = {
"payAmountCount":100,//年度在线缴纳党费
"activityCount":0,//年度参加支部生活
"offlineCount":0,//集中培训和集体学习
"online":0//网络自学
}
return {dataInfo:changeData, middleInfo};
}
......@@ -179,8 +185,7 @@ export async function getStudent(bId:number, pmId:string) {
let memberLearningData = {rateOfLearning:0};
for (let i = 0; i < rateLearningData.length; i++) {
let rateLearning = rateLearningData[i];
let { rateOfLearning } = rateLearning;
let { rateOfLearning } = rateLearningData[i];
memberLearningData.rateOfLearning += rateOfLearning;
}
......
src/biz/partyQuality.ts
......@@ -112,7 +112,7 @@ export async function partyQualityInfo(bId:number, qualityId:number) {
let dataList = [];
for (let key in dataMap) {
let title = configEnum.SECONDARYINDICATORS[parseInt(key)];
let title = verificationEnumTools.changeEnumValue(configEnum.SECONDARYINDICATORS, parseInt(key));
dataList.push({
title,
content:dataMap[key].content,
......
src/biz/partyVanguard.ts
......@@ -28,19 +28,36 @@ export async function partyVanguardList(bId:number, honorName:string) {
let partyVanguardData = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建先锋表, param, clomun);
let allUserList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, {bId}, ["name", "pmId"])
let allUserMap = {};
allUserList.forEach(info => {
allUserMap[info.pmId] = info.name;
});
let dataList = [];
partyVanguardData.forEach( info => {
let changeData:any = extractData(splitResultConfig.partyVanguardConfig, info);
changeData.honorType = verificationEnumTools.changeEnumValue(configEnum.HONORTYPE, info.honorType);
let grantingUnitStr = "";
if (info.grantingRange == configEnum.GRANTINGRANGE.个人) {
changeData.honorType = verificationEnumTools.changeEnumValue(configEnum.PERSONHONORTYPE, info.honorType);
JSON.parse(info.grantingUnit).forEach(str => {
grantingUnitStr += `,${allUserMap[str]}`;
});
} else {
changeData.honorType = verificationEnumTools.changeEnumValue(configEnum.HONORTYPE, info.honorType);
JSON.parse(info.grantingUnit).forEach(str => {
grantingUnitStr += `,${str}`;
});
}
changeData.grantingRange = verificationEnumTools.changeEnumValue(configEnum.GRANTINGRANGE, info.grantingRange);
changeData.grantTime = moment(info.grantTime).format("YYYY-MM-DD");
changeData.content = info.content;
changeData.img = info.img;
let grantingUnitStr = "";
JSON.parse(info.grantingUnit).forEach(str => {
grantingUnitStr += `,${str}`;
});
changeData.grantingUnit = grantingUnitStr.replace(",", "");
......
src/config/enum.ts
......@@ -53,14 +53,6 @@ export enum BRANCHNAME {
牙防所第四支部
}
/**所属支部 */
export enum BRANCHNAMESTR {
第一支部 = 1,
第二支部,
第三支部,
第四支部
}
/**行政职务 */
export enum ADMINISTRATIVEPOSITION {
......@@ -176,6 +168,12 @@ export enum THEMETYPE {
}
export enum COURSEENTRYTYPE {
视频 =1,
文字 = 2
}
/**
* 党费管理---------------------------
*/
......@@ -243,8 +241,9 @@ export enum GRANTINGRANGE {
}
export enum PERSONHONORTYPE {
模范类型1 = 1,
模范类型2 = 2
优秀医生 = 1,
模范医生 = 2,
模范党员,
}
......
src/main.ts
import { dataInit } from "./biz/dataInit";
import { partyQualityList } from "./biz/partyQuality";
import { initConfig, systemConfig} from "./config/systemConfig";
import { httpServer } from "./net/http_server";
......@@ -19,8 +20,9 @@ lanuch();
async function test() {
let pwd = md5PwdStr("admin");
console.log();
let data = await partyQualityList(1);
console.log()
await dataInit()
// let pwd = md5PwdStr("admin");
// console.log();
// let data = await partyQualityList(1);
// console.log()
}
\ No newline at end of file
src/middleware/user.ts
import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
import { PARTYPOSITIONS } from "../config/enum";
import { ERRORCODEENUM, ERRORENUM } from "../config/errorEnum";
import { BizError } from "../util/bizError";
import { selectData } from "./databaseSuccess";
......@@ -28,31 +27,3 @@ export async function checkAppletToken(req, res, next) {
next();
}
export async function checkAppletDWToken(req, res, next) {
if (!req.headers) req.headers = {};
let ReqToken = req.headers.token;
let UserId = req.headers.userid;
if(!UserId || !ReqToken) return next(new BizError(ERRORENUM.非法登录));
let partyMemberInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员基础信息表, {pmId: UserId}, ["pmId", "bId", "loginId", "token", "partyPositionsName"]);
if (!partyMemberInfo || !partyMemberInfo.pmId) return next(new BizError(ERRORENUM.身份验证失败));
if (!partyMemberInfo.token || partyMemberInfo.token != ReqToken) return next(new BizError(ERRORENUM.身份验证过期));
req.headers.userid = partyMemberInfo.pmId;
req.headers.bId = partyMemberInfo.bId;
//判断是否是领导
let isZZB = false;
JSON.parse(partyMemberInfo.partyPositionsName).forEach(itemId => {
if (itemId >= PARTYPOSITIONS.党总支书记 && itemId <= PARTYPOSITIONS.党总支纪检委员) {
isZZB = true;
}
});
if (!isZZB) {
throw new BizError(ERRORENUM.权限不足);
}
next();
}
\ No newline at end of file
src/routers/applet/base.ts
......@@ -6,7 +6,7 @@
import * as baseBiz from '../../biz/base';
import * as asyncHandler from 'express-async-handler';
import { eccReqParamater } from '../../util/verificationParam';
import { checkAppletToken, checkAppletDWToken } from '../../middleware/user';
import { checkAppletToken } from '../../middleware/user';
export function setRouter(httpServer) {
httpServer.post('/yfs/applet/partymember/home', checkAppletToken, asyncHandler(homeBase));
......@@ -14,7 +14,6 @@ export function setRouter(httpServer) {
httpServer.post('/yfs/member/partymember/home', checkAppletToken, asyncHandler(member_home));
httpServer.post('/yfs/member/partymember/bottomhome', checkAppletToken, asyncHandler(member_home_bottom));
}
......
src/routers/applet/organizationalLife.ts
......@@ -14,8 +14,21 @@ export function setRouter(httpServer) {
httpServer.post('/yfs/applet/organizationallife/add', checkAppletToken, asyncHandler(addDetails));
httpServer.post('/yfs/applet/organizationallife/update', checkAppletToken, asyncHandler(updateDetails));
httpServer.post('/yfs/applet/organizationallife/memberlist', checkAppletToken, asyncHandler(memberlist));
httpServer.post('/yfs/applet/organizationallife/delete', checkAppletToken, asyncHandler(deleteDetails));
}
/**
*
* @param req
* @param res
*/
async function deleteDetails(req, res) {
let reqConf = {oId:"Number"};
let {oId} = eccReqParamater(reqConf, req.body);
let bId = req.headers.bId;
let result = await organizationalLifeBiz.delOrg(oId);
res.success(result);
}
......
src/routers/applet/partyBuildingDynamic.ts
......@@ -11,9 +11,27 @@ import { checkAppletToken } from '../../middleware/user';
export function setRouter(httpServer) {
httpServer.post('/yfs/applet/buildingdynamic/list', checkAppletToken, asyncHandler(partyBuildingDynamicList));
httpServer.post('/yfs/applet/buildingdynamic/details', checkAppletToken, asyncHandler(detailsList));
httpServer.post('/yfs/applet/dynamics/details', checkAppletToken, asyncHandler(dynamics_details));//党建动态
}
/**
* 党建动态
* @param req
* @param res
*/
async function dynamics_details(req, res) {
let reqConf = {pbId: 'Number'};
let {pbId} = eccReqParamater(reqConf, req.body);
let result = await partyBuildingDynamicBiz.dynamicsDetails(pbId);
res.success(result);
}
/**
* 党建资讯列表
* @param req
......
src/routers/applet/partyExpenses.ts
......@@ -10,7 +10,7 @@ import { checkAppletToken } from '../../middleware/user';
export function setRouter(httpServer) {
httpServer.post('/yfs/applet/partyexpenses/list', checkAppletToken, asyncHandler(getPartyExpenses));
httpServer.post('/yfs/applet/partyexpenses/selflist', checkAppletToken, asyncHandler(getSelfPartyExpenses));
}
......@@ -28,3 +28,13 @@ async function getPartyExpenses(req, res) {
res.success(result);
}
async function getSelfPartyExpenses(req, res) {
let reqConf = { payType:"Number"};
let {payType} = eccReqParamater(reqConf, req.body);
let bId = req.headers.userid;
let result = await partyExpensesBiz.selfPartyExpensesData(bId, payType);
res.success(result);
}
src/routers/applet/partyQuality.ts
......@@ -10,7 +10,7 @@ import { checkAppletToken } from '../../middleware/user';
export function setRouter(httpServer) {
httpServer.post('/yfs/applet/partyquality/list', checkAppletToken, asyncHandler(getPartyQuality));
httpServer.post('/yfs/applet/partyquality/detsils', asyncHandler(getPartyVanguardDetsils));
httpServer.post('/yfs/applet/partyquality/detsils',checkAppletToken, asyncHandler(getPartyVanguardDetsils));
}
......
src/routers/public.ts
......@@ -22,7 +22,8 @@ export function setRouter(httpServer) {
httpServer.post('/yfs/applet/public/coursetype', asyncHandler(courseType));
httpServer.post('/yfs/applet/public/activitytype', asyncHandler(activityType));
httpServer.post('/yfs/applet/public/grantingrange', asyncHandler(grantingRange));
httpServer.post('/yfs/applet/public/personhonortype', asyncHandler(personhonortype));
httpServer.post('/yfs/applet/public/personhonortype', asyncHandler(personhonortype));
httpServer.post('/yfs/public/entrytype', asyncHandler(entryType));
}
......
src/tools/dataInit.ts
......@@ -428,12 +428,13 @@ async function initBranchSystem() {
* 党费初始化
*/
async function initPartyExpenses() {
return
// let count = await groupFindBranchSystemCount({});
let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党费管理表, {}, []);
if (count >= 1) {
console.log("***** 党费管理数据 无需初始化 *****");
return;
}
}
let partyMenberDataList = await selectData(OPERATIONALDATATYPE.查询多个 , TABLENAME.党员基础信息表, {etId:1}, null);
......
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