no message

serverConfig.xml

 <config>
     <port>40005</port>
     <dbPort>40002</dbPort>
-    <dbHost>localhost</dbHost>
+    <dbHost>192.168.0.71</dbHost>
     <sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
 </config>

src/biz/branchSystem.ts

@@ -159,4 +159,46 @@ export async function delBranchSystemData(userInfo, bsId:number) {
     await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.支部制度表, {}, {bsId});
     
     return {isSuccess:true};
-}
+}
\ No newline at end of file
+
+
+/**
+ * 导出支部制度信息列表
+ * @returns 
+ */
+export async function outPutBranchSystemData(title:string) {
+    let param:any = {};
+    if (title) {
+        param.systemTitle = {"%like%":title};
+    }
+    
+    let column = ["bsId", "systemTitle", "releaseTime", "isUse", "bId"];
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.支部制度表, param, column );
+    
+    let result = [["支部制度id", "制度标题", "发布时间", "是否使用", "制度有效支部范围"]];
+    dbList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.releaseTime = datechangeToStr(info.releaseTime);
+        itemInfo.bId = changeEnumValue(BRANCHNAME, info.bId);
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    return { name:"支部制度.xlsx", dataList:result };
+}
+
+
+
+
+
+
+
+
+
+

src/biz/dynamic.ts

@@ -147,3 +147,58 @@ export async function getDynamicInfo(userInfo, pbId:number) {
 
     return {orgLifeInfo};
 }
+
+
+/**
+ * 导出党建动态
+ * @param userInfo 
+ * @param month 
+ * @param title 
+ * @param branch 
+ * @returns 
+ */
+export async function outPutDynamic(userInfo, month:number, title:string, branch:number) {
+    /**组合查询条件 */
+    let selectParam:any = {};
+    if (!userInfo.isSuperAdmin ) {
+        if (userInfo.branch != branch) throw new BizError(ERRORENUM.权限不足, `${userInfo.userId}无法查看非本支部的党建动态列表`);
+        else {
+            selectParam.bId = userInfo.branch;
+        }
+    }else  selectParam.bId = branch;
+    if (month) {
+        let stTime = moment(month).startOf("month").valueOf();
+        let etTime = moment(month).endOf('month').valueOf();
+        selectParam.dataMonth = {"%between%": [getMySqlMs(stTime), getMySqlMs(etTime)]};
+    }
+    if (title) {
+        selectParam.theme = {"%like%":title};
+    }
+
+    let column = ["pbId", "theme", "dataMonth", "fileType", "uploadTime"];
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建动态表, selectParam, column );
+    let result = [["党建动态id", "活动名称", "数据月份", "资料类型", "上传时间"]];
+    
+    dbList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.dataMonth = monthDateChangeToStr(info.dataMonth);
+        itemInfo.fileType = changeEnumValue(FILETYPE, info.fileType);
+        itemInfo.uploadTime = datechangeToStr(info.uploadTime);
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    let fileName = `党建动态-${changeEnumValue(BRANCHNAME, branch)}.xlsx`;
+    return { name:fileName, dataList:result };
+}
+
+
+
+
+

src/biz/memberLearning.ts

+/**
+ * 党员学习
+ */
+
 import moment = require("moment");
 import { COURSETYPE, FILETYPE, LEARNTYPEENUM, OPERATIONALDATATYPE, TABLENAME } from "../config/enum/enum";
 import { ERRORENUM } from "../config/enum/errorEnum";
@@ -158,6 +162,25 @@ export async function updateTextLearningInfo(userInfo, mlId:number, contentTitle
         fileName:JSON.stringify(fileName)
     };
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党员学习表, updateInfo, {mlId});
+    
+    let rateLearningInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.学习进度表, {mlId}, ["rlId", "textSchedule"]);
+    if(rateLearningInfo) {
+        for (let i = 0; i < rateLearningInfo.length; i++) {
+            let rateUpdate = {
+                rateOfLearning:0,
+                learningCompleted:1
+            }
+
+            let {textSchedule, rlId} = rateLearningInfo[i];
+            let fileNum = fileName.length;
+            let thisFileRate = Math.ceil(100/fileNum); //根据学习课程的文件数量计算本次学习的进度占比
+            let textScheduleNum = 0;
+            if (textSchedule) textScheduleNum = JSON.parse(textSchedule).length;
+            rateUpdate.rateOfLearning = thisFileRate * textScheduleNum;
+
+            await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.学习进度表, rateUpdate, {rlId});//修改文字课程对应的学习进度
+        }
+    }
 
     return { isSuccess:true };
 }
@@ -251,6 +274,7 @@ export async function deleteLearning(userInfo, mlId:number ) {
     }
 
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党员学习表, {isDelete:true}, {mlId});
+    // await operationalData(OPERATIONALDATATYPE.删除, TABLENAME.学习进度表, null, {mlId}); //删除学习表课程对应进度表数据
 
     return {isSuccess:true};
 }
@@ -293,4 +317,52 @@ export async function closeLearnging(userInfo, mlId:number) {
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党员学习表, {isUse:false}, {mlId});
 
     return {isSuccess:true};
-}
+}
\ No newline at end of file
+
+
+/**
+ * 导出
+ * @param userInfo 
+ * @param contentTitle 
+ * @param courseTypeName 
+ * @param type 
+ * @returns 
+ */
+export async function outPutLearning(userInfo, contentTitle:string, courseTypeName:number, type:number) {
+    const FuncName = `党员学习列表`;
+    eccEnumValue(FuncName, "courseTypeName", COURSETYPE, courseTypeName);
+    if (!userInfo.isSuperAdmin) {
+        throw new BizError(ERRORENUM.权限不足, FuncName, `${userInfo.userId}`);
+    }
+
+    let selectParam:any = { courseEntryType:type, isDelete:false };
+    if (courseTypeName) selectParam.courseTypeName = courseTypeName;
+    if (contentTitle) selectParam.contentTitle = {"%like%":contentTitle};
+    let column = ["mlId", "contentTitle", "courseTypeName", "uploadTime", "hits", "isUse"];
+
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员学习表, selectParam, column );
+    
+    let result = [["党员学习id", "内容标题", "课程类型", "上传时间", "点击量", "是否使用"]];
+    dbList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.courseTypeName = changeEnumValue(COURSETYPE, info.courseTypeName);
+        itemInfo.uploadTime = moment(info.uploadTime).format("YYYY-MM-DD");
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    let fileName = `党员学习-${changeEnumValue(LEARNTYPEENUM, type)}.xlsx`;
+    return { name:fileName, dataList:result };
+}
+
+
+
+
+
+

src/biz/organization.ts

@@ -2,7 +2,8 @@
  * 组织架构
  */
 
-import { BRANCHNAME, OPERATIONALDATATYPE, PARTYPOSITIONS, TABLENAME } from "../config/enum/enum";
+import { BRANCHNAME, OPERATIONALDATATYPE, TABLENAME } from "../config/enum/enum";
+import { ORGANIZABRANCHNAME, ORGANIZAPARTYPOSITIONS } from "../config/enum/organizationEnum";
 import { selectData } from "../data/operationalData";
 import { changeEnumValue } from "../tools/eccEnum";
 
@@ -29,10 +30,10 @@ export async function getOrganization() {
         partyPositionsList.forEach(pId => {
             inOrdinary = false;
             let managerInfo = {
-                title:changeEnumValue(PARTYPOSITIONS, pId),
+                title:changeEnumValue(ORGANIZAPARTYPOSITIONS, pId),
                 name
             };
-            if (pId < PARTYPOSITIONS.支部书记) { /**总支干部 */
+            if (pId < ORGANIZAPARTYPOSITIONS.支部书记) { /**总支干部 */
                 organizationInfo.manager.push(managerInfo);
             } else {/**支部干部 */
                 branchMap[bId].manager.push(managerInfo);
@@ -43,6 +44,36 @@ export async function getOrganization() {
             branchMap[bId].ordinary.push(name);
         }
     });
+
+    let organizationData = {title: '党总支', manager:[], subList:[] };
+    for(let key in ORGANIZAPARTYPOSITIONS) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            organizationInfo.manager.forEach( info => {
+                if (info.title == keyStr) {
+                    organizationData.manager.push(info);
+                }
+            });
+        }
+    }
+
+    for (let k in branchMap) {
+        let branchManager = [];
+        for(let key in ORGANIZAPARTYPOSITIONS) {
+            let anyKey:any = key;
+            if (isNaN(anyKey)) {
+                let keyStr = key;
+                branchMap[k].manager.forEach( info => {
+                    if (info.title == keyStr) {
+                        branchManager.push(info);
+                    }
+                })
+            }
+        }
+        branchMap[k].manager = branchManager;
+    }
+
     
     let subList = [];
     for (let title in branchMap) {
@@ -61,8 +92,8 @@ export async function getOrganization() {
 
     subList.forEach(item => {
         let {title, ordinary, manager} = item;
-        let bName = changeEnumValue(BRANCHNAME, parseInt(title));
-        organizationInfo.subList.push({
+        let bName = changeEnumValue(ORGANIZABRANCHNAME, parseInt(title));
+        organizationData.subList.push({
             title: bName,
             ordinary,
             manager
@@ -70,5 +101,5 @@ export async function getOrganization() {
         
     })
 
-    return {organizationInfo};
+    return {organizationInfo:organizationData};
 }
\ No newline at end of file

src/biz/organizationalLife.ts

@@ -152,9 +152,57 @@ export async function getOrgLifeInfo(userInfo, oId:number) {
 }
 
 
+/**
+ * 导出组织生活
+ * @param userInfo 
+ * @param month 
+ * @param title 
+ * @param branch 
+ * @returns 
+ */
+export async function outPutOrgLifeList(userInfo, month:number, title:string, branch:number) {
+    /**组合查询条件 */
+    let selectParam:any = {};
+    if (!userInfo.isSuperAdmin ) {
+        if (userInfo.branch != branch) throw new BizError(ERRORENUM.权限不足, `${userInfo.userId}无法导出非本支部的组织生活列表`);
+        else {
+            selectParam.bId = userInfo.branch;
+        }
+    } else  selectParam.bId = branch;
+    if (month) {
+        let stTime = moment(month).startOf("month").valueOf();
+        let etTime = moment(month).endOf('month').valueOf();
+        selectParam.dataMonth = {"%between%": [getMySqlMs(stTime), getMySqlMs(etTime)]};
+    }
+    if (title) {
+        selectParam.theme = {"%like%":title};
+    }
 
+    let column = ["oId", "theme", "themeType", "dataMonth", "fileType", "uploadTime", "bId"];
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.组织生活表, selectParam, column );
+    
+    let result = [["组织生活id", "主题", "主题类型", "数据月份", "资料类型", "上传时间", "所属支部"]];
+    
+    dbList.forEach( info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.dataMonth = moment(info.dataMonth).format("YYYY-MM");
+        itemInfo.themeType = changeEnumValue(THEMETYPE, info.themeType);
+        itemInfo.fileType = changeEnumValue(FILETYPE, info.fileType);
+        itemInfo.uploadTime = datechangeToStr(info.uploadTime);
+        itemInfo.bId = changeEnumValue(BRANCHNAME, info.bId);
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    })
 
-
+    let fileName = `组织生活-${changeEnumValue(BRANCHNAME, branch)}.xlsx`;
+    return { name:fileName, dataList:result };
+}
 
 
 

src/biz/partyExpenses.ts

@@ -281,3 +281,52 @@ export async function memberList() {
 
     return {dataList};
 }
+
+
+/**
+ * 导出
+ * @param state 
+ * @param payableMonth 
+ * @param name 
+ * @returns 
+ */
+export async function outPutExpenses(state:number, payableMonth:number, name:string) {
+    const FuncName = "党费列表";
+    eccEnumValue(FuncName, 'state', PAYTYPE, state );
+    let selectParam:any = {payType:state};
+    if (payableMonth) selectParam.payableMonth = getMySqlMs(payableMonth);
+   
+    let includeConf = {};
+    let column = ["peId", "bId", "payableMonth", "payTime", "payAmount"];
+    includeConf[TABLENAME.党员基础信息表] = {colum:["name"], where:{} };
+    if (name) includeConf[TABLENAME.党员基础信息表].where["name"] = {"%like%":name};
+
+    let dbList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.党费管理表, selectParam, column, includeConf );
+
+    let result = [["党费管理id", "所属支部", "应缴月份", "缴费时间", "缴费金额", "党员名称"]];
+    dbList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.name = info.partyMember.name;
+        itemInfo.bId = changeEnumValue(BRANCHNAME, info.bId);
+        if(info.payableMonth) itemInfo.payableMonth = moment(info.payableMonth).format("YYYY-MM");
+        if(info.payTime) itemInfo.payTime = moment(info.payTime).format("YYYY-MM-DD");
+        if(!info.payAmount) itemInfo.payAmount = 0;
+        if(!info.partyMember.name) itemInfo.name = info.partyMember.name;
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        if (itemInfo['name']) subList.push(itemInfo['name']);
+        result.push(subList);
+    });
+
+    let fileName = `党费管理-${changeEnumValue(PAYTYPE, state)}.xlsx`;
+    return { name:fileName, dataList:result };
+}
+
+
+
+

src/biz/partyMember.ts

-import { CreatePartyActivistsMemberConfig, CreatePartyCandidateMemberConfig, CreatePartyFormalMemberConfig, UpdatePartyActivistsMemberConfig, UpdatePartyCandidateMemberConfig, UpdatePartyFormalMemberConfig } from "../config/eccParam/eccParamConfig";
+import { ChangePartyActivistsMemberConfig, ChangePartyCandidateMemberConfig, ChangePartyFormalMemberConfig, CreatePartyActivistsMemberConfig, CreatePartyCandidateMemberConfig, CreatePartyFormalMemberConfig, UpdatePartyActivistsMemberConfig, UpdatePartyCandidateMemberConfig, UpdatePartyFormalMemberConfig } from "../config/eccParam/eccParamConfig";
 import { ADMINISTRATIVEPOSITION, BRANCHNAME, DEDPARTMENT, DEGREE, ENTRYTYPE, OPERATIONALDATATYPE, PARTYPOSITIONS, SEX, TABLENAME } from "../config/enum/enum";
 import { selectData, operationalData } from "../data/operationalData";
 import { changeEnumValue, eccEnumValue } from "../tools/eccEnum";
@@ -412,3 +412,179 @@ export async function deleteMember(userInfo, pmId:string) {
 
     return {isSuccess:true};
 }
+
+
+/**
+ * 导出正式党员信息列表
+ * @returns {dataList:正式党员信息列表, name:"党员信息-正式党员.xlsx"}
+ */
+export async function outPutFormalMember(branch:number, name:string) {
+    let param:any = {etId:ENTRYTYPE.正式党员};
+    if (branch) param.bId = branch;
+    if (name) param.name = {"%like%":name};
+    let column = ["pmId", "name", "sex", "birthDate", "phone", "levelOfEducation", "bId", "partyJoiningTime", 
+    "administrativePositionName", "partyPositionsName", "departmentName", "isAdmin"];
+
+    let dataServerList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, column );
+    
+    let result = [["党员id", "姓名", "性别", "出生年月", "手机号码", "文化程度", "所属支部", "入党时间", "行政职务", "党内职务", "所属科室", "是否为管理员"]];
+    dataServerList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.administrativePositionName = changeEnumValue(ADMINISTRATIVEPOSITION, info.administrativePositionName);
+
+        itemInfo.partyPositionsName = changeEnumValue(PARTYPOSITIONS, info.partyPositionsName);
+        if (!itemInfo.partyPositionsName || itemInfo.partyPositionsName=='undefined') itemInfo.partyPositionsName = "党员";
+
+        itemInfo.departmentName = changeEnumValue(DEDPARTMENT, info.departmentName);
+        itemInfo.bId = changeEnumValue(BRANCHNAME, itemInfo.bId);
+        itemInfo.sex = changeEnumValue(SEX, info.sex);
+        itemInfo.levelOfEducation = changeEnumValue(DEGREE, info.levelOfEducation);
+        
+        if (info.partyJoiningTime) itemInfo.partyJoiningTime = datechangeToStr(itemInfo.partyJoiningTime);
+        if (info.birthDate) itemInfo.birthDate = datechangeToStr(itemInfo.birthDate);
+        itemInfo.isAdmin = info.isAdmin?"是":"否";
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    return { name:"党员信息-正式党员.xlsx", dataList:result };
+}
+
+/**
+ * 导出入党积极分子信息列表
+ * @returns 
+ */
+export async function outPutActivistsMember(branch:number, name:string) {
+    let param:any = {etId:ENTRYTYPE.入党积极分子};
+    if (branch) param.bId = branch;
+    if (name) param.name = {"%like%":name};
+    let column = ["pmId", "name", "birthDate", "phone", "sex", "levelOfEducation", "bId", "askForTime", "listedAsActivistsTime", 
+    "administrativePositionName", "liaison", "departmentName" ];
+    
+    let dataServerList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, column );
+
+    let result = [["入党积极分子id", "姓名", "出生年月", "手机号码", "性别", "文化程度", "所属支部", "入党申请时间", "列为积极分子时间", "行政职务", "联系人", "所属科室"]];
+
+    dataServerList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.administrativePositionName = changeEnumValue(ADMINISTRATIVEPOSITION, info.administrativePositionName);
+        itemInfo.departmentName = changeEnumValue(DEDPARTMENT, info.departmentName);
+        itemInfo.bId = changeEnumValue(BRANCHNAME, itemInfo.bId);
+        itemInfo.levelOfEducation = changeEnumValue(DEGREE, info.levelOfEducation);
+        itemInfo.sex = changeEnumValue(SEX, info.sex);
+
+        if (info.askForTime) itemInfo.askForTime = datechangeToStr(info.askForTime);
+        if (info.listedAsActivistsTime) itemInfo.listedAsActivistsTime = datechangeToStr(info.listedAsActivistsTime);
+        if (info.birthDate) itemInfo.birthDate = datechangeToStr(info.birthDate);
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    return { name:"党员信息-积极分子.xlsx", dataList:result };
+}
+
+/**
+ * 导出预备党员信息列表
+ * @returns 
+ */
+ export async function outPutCandidateMember(branch:number, name:string) {
+    let param:any = {etId:ENTRYTYPE.预备党员};
+    if (branch) param.bId = branch;
+    if (name) param.name = {"%like%":name};
+    let column = ["pmId", "name", "sex", "birthDate", "phone", "levelOfEducation", "bId", "askForTime", "administrativePositionName", 
+    "talkTime", "departmentName"];
+    
+    let dataServerList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, column );
+
+    let result = [["预备党员id", "姓名", "出生年月", "手机号码", "性别", "文化程度", "所属支部", "申请入党时间", "列为积极分子时间", "联系人", "所属科室"]];
+    dataServerList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.administrativePositionName = changeEnumValue(ADMINISTRATIVEPOSITION, info.administrativePositionName);
+        itemInfo.departmentName = changeEnumValue(DEDPARTMENT, info.departmentName);
+        itemInfo.sex = changeEnumValue(SEX, info.sex);
+        itemInfo.bId = changeEnumValue(BRANCHNAME, itemInfo.bId);
+        itemInfo.levelOfEducation = changeEnumValue(DEGREE, info.levelOfEducation);
+        
+        if (info.askForTime) itemInfo.askForTime = datechangeToStr(itemInfo.askForTime);
+        if (info.talkTime) itemInfo.talkTime = datechangeToStr(itemInfo.talkTime);
+        if (info.birthDate) itemInfo.birthDate = datechangeToStr(itemInfo.birthDate);
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    return { name:"党员信息-预备党员.xlsx", dataList:result };
+}
+
+/**
+ * 变更为正式党员状态
+ * @param pmId 
+ * @param param 
+ */
+ export async function changeFormalMember(pmId:string, param) {
+    eccFormParam(`变更为正式党员状态`, ChangePartyFormalMemberConfig, param);
+    /**校验枚举 */
+    eccEnumValue("变更为正式党员状态", "etId", ENTRYTYPE, param.etId);
+    eccEnumValue("变更为正式党员状态", "partyPositionsName", PARTYPOSITIONS, param.partyPositionsName);
+    /**多个枚举转换成json */
+    param.partyPositionsName = JSON.stringify(param.partyPositionsName);
+    /**时间戳转换成Date格式 */
+    param.partyJoiningTime = getMySqlMs(param.partyJoiningTime);
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党员基础信息表, param, {pmId});
+    
+    return {isSuccess:true};
+}
+
+/**
+ * 变更为入党积极分子状态
+ * @param pmId 
+ * @param param 
+ */
+ export async function changeAdminState(pmId:string, param) {
+    eccFormParam(`变更为入党积极分子状态`, ChangePartyActivistsMemberConfig, param);
+    /**校验枚举 */
+    eccEnumValue("变更为入党积极分子状态", "etId", ENTRYTYPE, param.etId);
+    /**时间戳转换成Date格式 */
+    param.listedAsActivistsTime = getMySqlMs(param.listedAsActivistsTime);
+    param.askForTime = getMySqlMs(param.askForTime);
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党员基础信息表, param, {pmId});
+    
+    return {isSuccess:true};
+}
+
+/**
+ * 变更为预备党员状态
+ * @param pmId 
+ * @param param 
+ */
+ export async function changeCandidateMember(pmId:string, param) {
+    eccFormParam(`变更为预备党员状态`, ChangePartyCandidateMemberConfig, param);
+    /**校验枚举 */
+    eccEnumValue("变更为预备党员状态", "etId", ENTRYTYPE, param.etId);
+    /**时间戳转换成Date格式 */
+    param.talkTime = getMySqlMs(param.talkTime);
+    param.askForTime = getMySqlMs(param.askForTime);
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党员基础信息表, param, {pmId});
+    
+    return {isSuccess:true};
+}
+
+
+

src/biz/partyQuality.ts

@@ -234,4 +234,64 @@ export async function closeQualityLock(userInfo, tlId:number) {
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党建质量, {lock:true}, {tlId});
 
     return {isSuccess:true}
-}
+}
\ No newline at end of file
+
+
+/**
+ * 导出党建质量
+ * @param userInfo 
+ * @param bId 
+ * @param first 
+ * @param second 
+ * @returns
+ */
+export async function outPutQuality(userInfo, bId:number, first:number, second:number) {
+    const FuncName = `党建质量列表`;
+    if (!userInfo.isSuperAdmin) {
+        throw new BizError(ERRORENUM.权限不足, FuncName, `${userInfo.userId}`);
+    }
+
+    eccEnumValue(FuncName, "bId", BRANCHNAME, bId);
+    let selectParam:any = {bId};
+    if (first) {
+        eccEnumValue(FuncName, "first", PRIMARYINDICATORS, first);
+        selectParam.primaryIndicators = first;
+    }
+    if (second) {
+        eccEnumValue(FuncName, "second", SECONDARYINDICATORS, second);
+        selectParam.secondaryIndicators = second;
+    }
+
+    let column = ["tlId", "primaryIndicators", "secondaryIndicators", "thirdLevelContent", "thirdLevelScore", "currentScore", "completionProgress", "lock"];
+
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量, selectParam, column );
+    
+    let result = [["id", "一级指标", "二级指标", "三级指标内容", "三级指标分值", "当前得分", "完成进度", "是否绑定数据"]];
+    dbList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.primaryIndicators = changeEnumValue(PRIMARYINDICATORS, info.primaryIndicators);
+        itemInfo.secondaryIndicators = changeEnumValue(SECONDARYINDICATORS, info.secondaryIndicators);
+        itemInfo.completionProgress = `${info.completionProgress}%`;
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    let fileName = `党建质量-${changeEnumValue(BRANCHNAME, bId)}.xlsx`;
+    return { name:fileName, dataList:result };
+}
+
+
+
+
+
+
+
+
+
+

src/biz/partyVanguard.ts

@@ -155,4 +155,50 @@ export async function closeVanguardInfo(userInfo, pvId:number) {
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党建先锋表, {isUse:false}, {pvId});
 
     return {isSuccess:true};
-}
+}
\ No newline at end of file
+
+
+/**
+ * 导出党建先锋
+ * @param userInfo 
+ * @param honorType 
+ * @param grantingRange 
+ * @param pageNumber 
+ * @returns 
+ */
+export async function outPutVanguard(userInfo, honorType:number, grantingRange:number) {
+    const FuncName = '党建先锋列表';
+    eccEnumValue(FuncName, 'honorType', HONORTYPE, honorType);
+    eccEnumValue(FuncName, 'grantingRange', GRANTINGRANGE, grantingRange);
+
+    let selectParam:any = {};
+    if (!userInfo.isSuperAdmin) selectParam.bId = userInfo.branch;
+    if (honorType) selectParam.honorType = honorType;
+    if (grantingRange) selectParam.grantingRange = grantingRange;
+
+    let column = ["pvId", "honorName", "honorType", "grantingRange", "grantingUnit", "grantTime", "isUse"];
+
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建先锋表, selectParam, column );
+    
+    let result = [["党员先锋id", "荣誉名称", "荣誉类型", "授予范围", "授予单位/个人", "授予时间", "是否使用"]];
+    dbList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.honorType = changeEnumValue(HONORTYPE, info.honorType);
+        itemInfo.grantingRange = changeEnumValue(GRANTINGRANGE, info.grantingRange);
+        itemInfo.grantTime = moment(info.grantTime).format("YYYY-MM-DD");
+        itemInfo.isUse = info.isUse?"是":"否";
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    return { name:"党员先锋.xlsx", dataList:result };
+}
+
+
+

src/biz/thematicActivities.ts

@@ -147,3 +147,66 @@ export async function getThematicActivitiesInfo(userInfo, taId:number) {
 
     return {orgLifeInfo};
 }
+
+
+/**
+ * 导出专题活动
+ * @param userInfo 
+ * @param month 
+ * @param title 
+ * @param branch 
+ * @returns 
+ */
+export async function outPutThematicActivities(userInfo, month:number, title:string, branch:number) {
+    /**组合查询条件 */
+    let selectParam:any = {};
+    if (!userInfo.isSuperAdmin ) {
+        if (userInfo.branch != branch) throw new BizError(ERRORENUM.权限不足, `${userInfo.userId}无法查看非本支部的专题活动列表`);
+        else {
+            selectParam.bId = userInfo.branch;
+        }
+    }else  selectParam.bId = branch;
+    if (month) {
+        let stTime = moment(month).startOf("month").valueOf();
+        let etTime = moment(month).endOf('month').valueOf();
+        selectParam.dataMonth = {"%between%": [getMySqlMs(stTime), getMySqlMs(etTime)]};
+    }
+    if (title) {
+        selectParam.theme = {"%like%":title};
+    }
+    
+    let column = ["taId", "theme", "dataMonth", "fileType", "uploadTime"];
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.专题活动表, selectParam, column );
+    if (!dbList || dbList.length == 0) throw new BizError(ERRORENUM.数据查询失败); 
+    let result = [["专题活动id", "主题", "数据月份", "资料类型", "上传时间"]];
+    dbList.forEach(info => {
+        let itemInfo = JSON.parse(JSON.stringify(info));
+        itemInfo.dataMonth = monthDateChangeToStr(info.dataMonth);
+        itemInfo.fileType = changeEnumValue(FILETYPE, info.fileType);
+        itemInfo.uploadTime = datechangeToStr(info.uploadTime);
+
+        let subList = [];
+        column.forEach(key => {
+            let value = itemInfo[key];
+            if (value == null || value == undefined) value = "-";
+            subList.push(value);
+        })
+        result.push(subList);
+    });
+
+    let name = `专题活动-${changeEnumValue(BRANCHNAME, branch)}.xlsx`;
+    return { name, dataList:result };
+}
+
+
+
+
+
+
+
+
+
+
+
+
+

src/config/eccParam/eccParamConfig.ts

@@ -103,6 +103,33 @@ export const CreatePartyCandidateMemberConfig = {
     departmentName:{type:"[Number]" },//所属科室表id
 }
 
+/**
+ * 正式党员[变更]
+ */
+ export const ChangePartyFormalMemberConfig = {
+    etId:{type:"Number" },//党员录入类型
+    partyJoiningTime:{type:"Number" },//入党时间
+    partyPositionsName:{type:"[Number]", notMustHave:true },//党内职务id
+}
+
+/**
+ * 入党积极分子党员[变更]
+ */
+ export const ChangePartyActivistsMemberConfig = {
+    etId:{type:"Number" },//党员录入类型
+    listedAsActivistsTime:{type:"Number" },//列入积极分子时间
+    liaison:{type:"String" },//联系人
+    askForTime:{type:"Number" },//入党申请时间
+}
+
+/**
+ * 预备党员[变更]
+ */
+ export const ChangePartyCandidateMemberConfig = {
+    etId:{type:"Number" },//党员录入类型
+    talkTime:{type:"Number" },//谈话时间
+    askForTime:{type:"Number" },//入党申请时间
+}
 
 /**
  * 添加组织生活

src/config/enum/enum.ts

@@ -85,10 +85,10 @@ export enum DEGREE {
 
 /**所属支部 */
 export enum BRANCHNAME {
-    牙防所第一支部 = 1,
-    牙防所第二支部,
-    牙防所第三支部,
-    牙防所第四支部
+    第一党支部 = 1,
+    第二党支部,
+    第三党支部,
+    第四党支部
 }
 
 

src/config/enum/organizationEnum.ts

+/**
+ * 管理后台页面展示枚举
+ */
+
+
+/**所属支部 */
+export enum ORGANIZABRANCHNAME {
+    第一党支部 = 1,
+    第二党支部,
+    第三党支部,
+    第四党支部
+}
+
+
+/**
+ * 党内职务
+ */
+ export enum ORGANIZAPARTYPOSITIONS {
+    党总支书记 = 4,
+    党总支副书记,
+    党总支宣传委员,
+    党总支统战委员,
+    党总支纪检委员,
+    支部书记=100,
+    支部副书记=101,
+    宣传委员=105,
+    统战委员=103,
+    组织委员=104,
+    纪检委员=102,
+}
+
+

src/routers/branchSystem.ts

@@ -15,6 +15,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/branchsystem/close', checkToken, asyncHandler(closeBranchSystem));
     httpServer.post('/yfs/admin/branchsystem/info', checkToken, asyncHandler(branchSystemInfo));
     httpServer.post('/yfs/admin/branchsystem/update', checkToken, asyncHandler(updateBranchSystem));
+    httpServer.post('/yfs/admin/branchsystem/output', checkToken, asyncHandler(outPutBranchSystem))
 }
 
 
@@ -135,3 +136,26 @@ async function delBranchSystem(req, res) {
 
     res.success(result);
 }
+
+
+/**
+ * 导出支部制度
+ * @param req 
+ * @param res 
+ */
+async function outPutBranchSystem(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {title:'String'};
+    let { title } = eccReqParamater(reqConf, req.body, ["title"]);
+
+    let result = await branchSystemBiz.outPutBranchSystemData(title);
+
+    res.success(result);
+}
+
+
+
+
+
+

src/routers/dynamic.ts

@@ -13,6 +13,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/dynamic/update', checkToken, asyncHandler(updateDynamic));
     httpServer.post('/yfs/admin/dynamic/del', checkToken, asyncHandler(delDynamic));
     httpServer.post('/yfs/admin/dynamic/info', checkToken, asyncHandler(dynamicInfo));
+    httpServer.post('/yfs/admin/dynamic/output', checkToken, asyncHandler(outPutDynamic));
 }
 
 
@@ -100,4 +101,21 @@ async function dynamicInfo(req, res) {
 }
 
 
+/**
+ * 导出
+ * @param req 
+ * @param res 
+ */
+async function outPutDynamic(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {month:'Number', theme:'String', branch:"Number"};
+    let { month, theme, branch } = eccReqParamater(reqConf, req.body, ["month", "theme"]);
+    
+    let result = await dynamicBiz.outPutDynamic(userInfo, month, theme, branch);
+
+    res.success(result);
+}
+
+
 

src/routers/memberLearning.ts

@@ -9,6 +9,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/learning/video/info', checkToken, asyncHandler(videoInfo));
     httpServer.post('/yfs/admin/learning/video/update', checkToken, asyncHandler(updateVideo));
     httpServer.post('/yfs/admin/learning/video/add', checkToken, asyncHandler(addVideo));
+    httpServer.post('/yfs/admin/learning/video/output', checkToken, asyncHandler(outPutVideo));
 
     httpServer.post('/yfs/admin/learning/del', checkToken, asyncHandler(delLearn));
     httpServer.post('/yfs/admin/learning/open', checkToken, asyncHandler(openLearn));
@@ -18,6 +19,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/learning/text/info', checkToken, asyncHandler(textInfo));
     httpServer.post('/yfs/admin/learning/text/update', checkToken, asyncHandler(updateText));
     httpServer.post('/yfs/admin/learning/text/add', checkToken, asyncHandler(addText));
+    httpServer.post('/yfs/admin/learning/text/output', checkToken, asyncHandler(outPutText));
 }
 
 
@@ -206,4 +208,40 @@ async function closeLearn(req, res) {
 
     res.success(result);
 }
- 
+
\ No newline at end of file
+
+/**
+ * 导出视频学习课程
+ * @param req 
+ * @param res 
+ */
+ async function outPutVideo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {contentTitle:'String', courseTypeName:'Number'};
+    let { contentTitle, courseTypeName } = eccReqParamater(reqConf, req.body, ["contentTitle", "courseTypeName"]);
+    
+    let result = await memberLearningBiz.outPutLearning(userInfo, contentTitle, courseTypeName, LEARNTYPEENUM.视频课程);
+
+    res.success(result);
+}
+
+
+/**
+ * 导出文字学习课程
+ * @param req 
+ * @param res 
+ */
+ async function outPutText(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {contentTitle:'String', courseTypeName:'Number'};
+    let { contentTitle, courseTypeName } = eccReqParamater(reqConf, req.body, ["contentTitle", "courseTypeName"]);
+    
+    let result = await memberLearningBiz.outPutLearning(userInfo, contentTitle, courseTypeName, LEARNTYPEENUM.文字课程);
+
+    res.success(result);
+}
+
+
+

src/routers/organizationalLife.ts

@@ -13,6 +13,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/organizationallife/update', checkToken, asyncHandler(updateOrganizationalLife));
     httpServer.post('/yfs/admin/organizationallife/del', checkToken, asyncHandler(delOrganizationalLife));
     httpServer.post('/yfs/admin/organizationallife/info', checkToken, asyncHandler(organizationalLifeInfo));
+    httpServer.post('/yfs/admin/organizationallife/output', checkToken, asyncHandler(outPutOrganlzationalLife));
 }
 
 
@@ -100,4 +101,15 @@ async function organizationalLifeInfo(req, res) {
 }
 
 
+async function outPutOrganlzationalLife(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {month:'Number', theme:'String', branch:"Number"};
+    let { month, theme, branch } = eccReqParamater(reqConf, req.body, ["month", "theme"]);
+    
+    let result = await organizationalLifeBiz.outPutOrgLifeList(userInfo, month, theme, branch);
+
+    res.success(result);
+}
+
 

src/routers/partyExpenses.ts

@@ -10,6 +10,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/expenses/unpaid/bulk', checkToken, asyncHandler(bulkUpdateUnPaid));
     httpServer.post('/yfs/admin/expenses/unpaid/info', checkToken, asyncHandler(unPaidInfo));
     httpServer.post('/yfs/admin/expenses/unpaid/del', checkToken, asyncHandler(delUnPaid));
+    httpServer.post('/yfs/admin/expenses/unpaid/output', checkToken, asyncHandler(outPutUnpaid));
 
     httpServer.post('/yfs/admin/expenses/paid/memberlist', checkToken, asyncHandler(memberList));
     httpServer.post('/yfs/admin/expenses/paid/list', checkToken, asyncHandler(paidList));
@@ -17,7 +18,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/expenses/paid/update', checkToken, asyncHandler(updatePaid));
     httpServer.post('/yfs/admin/expenses/paid/replenish', checkToken, asyncHandler(replenishPaid));
     httpServer.post('/yfs/admin/expenses/paid/del', checkToken, asyncHandler(delPaid));
-    
+    httpServer.post('/yfs/admin/expenses/paid/output', checkToken, asyncHandler(outPutPaid));
 }
 
 
@@ -199,4 +200,41 @@ async function memberList(req, res) {
     let result = await partyExpensesBiz.memberList();
 
     res.success(result);
-}
+}
\ No newline at end of file
+
+
+/**
+ * 导出未缴纳
+ * @param req 
+ * @param res 
+ */
+async function outPutUnpaid(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { payableMonth:'Number', name:'String'};
+    let { payableMonth, name } = eccReqParamater(reqConf, req.body, ["name", "payableMonth"]);
+    
+    let result = await partyExpensesBiz.outPutExpenses(PAYTYPE.未缴纳, payableMonth, name);
+
+    res.success(result);
+}
+
+
+/**
+ * 导出已缴纳
+ * @param req 
+ * @param res 
+ */
+async function outPutPaid(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { payableMonth:'Number', name:'String'};
+    let { payableMonth, name } = eccReqParamater(reqConf, req.body, ["name", "payableMonth"]);
+    
+    let result = await partyExpensesBiz.outPutExpenses(PAYTYPE.已缴纳, payableMonth, name);
+
+    res.success(result);
+}
+
+
+

src/routers/partyMember.ts

@@ -16,17 +16,23 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/partymember/formal/create', checkToken, asyncHandler(createFormalPartyInfo));
     httpServer.post('/yfs/admin/partymember/formal/admin/open', checkToken, asyncHandler(openAdminState));
     httpServer.post('/yfs/admin/partymember/formal/admin/close', checkToken, asyncHandler(closeAdminState));
+    httpServer.post('/yfs/admin/partymember/formal/output', checkToken, asyncHandler(outPutFormalPartyInfo));
+    httpServer.post('/yfs/admin/partymember/formal/change', checkToken, asyncHandler(changeFormalPartyInfo));
     
-
     httpServer.post('/yfs/admin/partymember/activists/list', checkToken, asyncHandler(activistsPartyList));
     httpServer.post('/yfs/admin/partymember/activists/info', checkToken, asyncHandler(activistsPartyInfo));
     httpServer.post('/yfs/admin/partymember/activists/update', checkToken, asyncHandler(updateActivistsInfo));
     httpServer.post('/yfs/admin/partymember/activists/create', checkToken, asyncHandler(createActivistsInfo));
+    httpServer.post('/yfs/admin/partymember/activists/output', checkToken, asyncHandler(outPutActivistsInfo));
+    httpServer.post('/yfs/admin/partymember/activists/change', checkToken, asyncHandler(changeActivistsInfo));
 
     httpServer.post('/yfs/admin/partymember/candidate/list', checkToken, asyncHandler(candidatePartyList));
     httpServer.post('/yfs/admin/partymember/candidate/info', checkToken, asyncHandler(candidatePartyInfo));
     httpServer.post('/yfs/admin/partymember/candidate/update', checkToken, asyncHandler(updateCandidateInfo));
     httpServer.post('/yfs/admin/partymember/candidate/create', checkToken, asyncHandler(createCandidateInfo));
+    httpServer.post('/yfs/admin/partymember/candidate/output', checkToken, asyncHandler(outPutCandidateInfo));
+    httpServer.post('/yfs/admin/partymember/candidate/change', checkToken, asyncHandler(changeCandidateInfo));
+
    
 }
 
@@ -77,7 +83,11 @@ async function updateFormalPartyInfo(req, res) {
     res.success(result);
 }
 
-
+/**
+ * 创建正式党员信息
+ * @param req 
+ * @param res 
+ */
 async function createFormalPartyInfo(req, res) {
     let userInfo = req.userInfo;
 
@@ -88,7 +98,20 @@ async function createFormalPartyInfo(req, res) {
     res.success(result);
 }
 
+/**
+ * 导出正式党员信息
+ * @param req 
+ * @param res 
+ */
+async function outPutFormalPartyInfo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {branch:'Number', name:'String'};
+    let {branch, name} = eccReqParamater(reqConf, req.body, ["branch", "name"]);
 
+    let result = await partyMemberBiz.outPutFormalMember(branch, name);
+    res.success(result);
+}
 
 
 /**
@@ -143,6 +166,21 @@ async function createActivistsInfo(req, res) {
     res.success(result);
 }
 
+/**
+ * 导出积极分子信息
+ * @param req 
+ * @param res 
+ */
+ async function outPutActivistsInfo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {branch:'Number', name:'String'};
+    let {branch, name} = eccReqParamater(reqConf, req.body, ["branch", "name"]);
+
+    let result = await partyMemberBiz.outPutActivistsMember(branch, name);
+    res.success(result);
+}
+
 
 
 /**
@@ -227,4 +265,67 @@ async function delMember(req, res) {
 
     let result = await partyMemberBiz.deleteMember(userInfo, pmId);
     res.success(result);
-}
+}
\ No newline at end of file
+
+/**
+ * 导出预备党员信息
+ * @param req 
+ * @param res 
+ */
+ async function outPutCandidateInfo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {branch:'Number', name:'String'};
+    let {branch, name} = eccReqParamater(reqConf, req.body, ["branch", "name"]);
+
+    let result = await partyMemberBiz.outPutCandidateMember(branch, name);
+    res.success(result);
+}
+
+/**
+ * 变更为正式党员状态
+ * @param req 
+ * @param res 
+ */
+ async function changeFormalPartyInfo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {pmId:'String', form:'Object'};
+    let { pmId, form } = eccReqParamater(reqConf, req.body);
+
+    let result = await partyMemberBiz.changeFormalMember(pmId, form);
+    res.success(result);
+}
+
+/**
+ * 变更为入党积极分子状态
+ * @param req 
+ * @param res 
+ */
+ async function changeActivistsInfo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {pmId:'String', form:'Object'};
+    let { pmId, form } = eccReqParamater(reqConf, req.body);
+
+    let result = await partyMemberBiz.changeAdminState(pmId, form);
+    res.success(result);
+}
+
+/**
+ * 变更为预备党员状态
+ * @param req 
+ * @param res 
+ */
+ async function changeCandidateInfo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {pmId:'String', form:'Object'};
+    let { pmId, form } = eccReqParamater(reqConf, req.body);
+
+    let result = await partyMemberBiz.changeCandidateMember(pmId, form);
+    res.success(result);
+}
+
+
+

src/routers/partyQuality.ts

@@ -14,6 +14,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/quality/del', checkToken, asyncHandler(delQuality));
     httpServer.post('/yfs/admin/quality/info', checkToken, asyncHandler(getQualityInfo));
     httpServer.post('/yfs/admin/quality/update', checkToken, asyncHandler(updateQuality));
+    httpServer.post('/yfs/admin/quality/output', checkToken, asyncHandler(outputQuality));
 
     httpServer.post('/yfs/admin/quality/scoreinfo', checkToken, asyncHandler(qualityScoreInfo));
     httpServer.post('/yfs/admin/quality/updatescore', checkToken, asyncHandler(updateQualityScoreInfo));
@@ -183,3 +184,24 @@ async function closeLock(req, res) {
 
     res.success(result);
 }
+
+
+/**
+ * 党建质量列表
+ * @param req 
+ * @param res 
+ */
+ async function outputQuality(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {bId:'Number', primaryIndicators:'Number', secondaryIndicators:'Number'};
+    let { bId, primaryIndicators, secondaryIndicators} = eccReqParamater(reqConf, req.body, ["primaryIndicators", "secondaryIndicators"]);
+    
+    let result = await partyQualityBiz.outPutQuality(userInfo, bId, primaryIndicators, secondaryIndicators);
+
+    res.success(result);
+}
+
+
+
+

src/routers/partyVanguard.ts

@@ -9,6 +9,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/vanguard/info', checkToken, asyncHandler(vanguardInfo));
     httpServer.post('/yfs/admin/vanguard/update', checkToken, asyncHandler(updateVanguard));
     httpServer.post('/yfs/admin/vanguard/del', checkToken, asyncHandler(delVanguard));
+    httpServer.post('/yfs/admin/vanguard/output', checkToken, asyncHandler(outPutVanguard));
 
     httpServer.post('/yfs/admin/vanguard/open', checkToken, asyncHandler(openVanguard));
     httpServer.post('/yfs/admin/vanguard/close', checkToken, asyncHandler(closeVanguard));
@@ -132,4 +133,20 @@ async function closeVanguard(req, res) {
 
     res.success(result);
 }
- 
+
\ No newline at end of file
+
+/**
+ * 导出党建先锋
+ * @param req 
+ * @param res 
+ */
+ async function outPutVanguard(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {honorType:'Number', grantingRange:'Number'};
+    let { honorType, grantingRange } = eccReqParamater(reqConf, req.body, ["honorType", "grantingRange"]);
+    
+    let result = await vanguardBiz.outPutVanguard(userInfo, honorType, grantingRange);
+
+    res.success(result);
+}

src/routers/thematicActivities.ts

@@ -13,6 +13,7 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/admin/thematicactivities/update', checkToken, asyncHandler(updateThematicActivities));
     httpServer.post('/yfs/admin/thematicactivities/del', checkToken, asyncHandler(delThematicActivities));
     httpServer.post('/yfs/admin/thematicactivities/info', checkToken, asyncHandler(thematicActivitiesInfo));
+    httpServer.post('/yfs/admin/thematicactivities/output', checkToken, asyncHandler(outPutThematicActivities));
 }
 
 
@@ -100,4 +101,20 @@ async function thematicActivitiesInfo(req, res) {
 }
 
 
+/**
+ * 导出
+ * @param req 
+ * @param res 
+ */
+async function outPutThematicActivities(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {month:'Number', theme:'String', branch:"Number"};
+    let { month, theme, branch } = eccReqParamater(reqConf, req.body, ["month", "theme"]);
+    
+    let result = await thematicActivitiesBiz.outPutThematicActivities(userInfo, month, theme, branch);
+
+    res.success(result);
+}
+