no message

src/biz/base.ts

@@ -40,7 +40,7 @@ import { getStudent } from "./partyMember";
     let partyMemberNum = allMemberList.length;//本支部人员总数
 
     let partyNoticeParam = {bId};
-    let partyNoticeList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建通知, partyNoticeParam, []);
+    let partyNoticeList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建通知, partyNoticeParam, ["title", "content", "dataTime"]);
 
     let noticeList = [];
     partyNoticeList.forEach(info => {

src/biz/dw.ts

@@ -10,7 +10,7 @@ import * as verificationEnumTools from "../util/verificationEnum";
 import { getStudent } from "./partyMember";
 import { getRandomId, md5PwdStr } from "../tools/system";
 import { eccFormParam } from "../util/verificationParam";
-import { CreateFZDXConfig, CreateRDJJFZConfig, CreateRDSQConfig, CreateYBDYConfig, CreateZSDYConfig } from "../config/eccFormParamConfig";
+import { CreateActivityConfig, CreateDWZBZDConfig, CreateFZDXConfig, CreateRDJJFZConfig, CreateRDSQConfig, CreateYBDYConfig, CreateZBZDConfig, CreateZSDYConfig, DWCreateActivityConfig } from "../config/eccFormParamConfig";
 
 const ColorConfig = {
     1:"#C62A23",
@@ -54,7 +54,7 @@ export async function homeData() {
     let branchCount = 4;
 
     let partyNoticeParam = {};
-    let partyNoticeList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建通知, partyNoticeParam, []);
+    let partyNoticeList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建通知, partyNoticeParam, ["title", "content", "dataTime"]);
 
     let noticeList = [];
     partyNoticeList.forEach(info => {
@@ -98,14 +98,17 @@ export async function activitiesData() {
             id : info.pbId,
             fileUrl:info.fileName[0] || ""
         }
+        dynamicsList.push(addInfo);
     });
+
+    return {dynamicsList, informationList:dataList}
 }
 
 
 export async function partymemberList() {
     let param = {};
 
-    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, ["peId", "bId", "payAmount"]);
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, [ "bId"]);
 
     let map = {};
     let allCount = 0;
@@ -118,7 +121,7 @@ export async function partymemberList() {
         allCount += 1;
     });
 
-    let dataList = [{name:"牙防所党建总人数", count:allCount}];
+    let dataList = [{name:"牙防所党建总人数", count:allCount, bId:0}];
 
     for (let key in map) {
         dataList.push(map[key])
@@ -128,7 +131,8 @@ export async function partymemberList() {
 }
 
 export async function partymemberTypeList(bId) {
-    let param:any = {bId};
+    let param:any = {};
+    if (bId) param.bId = bId;
 
     let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, ["etId", "bId"]);
 
@@ -136,7 +140,7 @@ export async function partymemberTypeList(bId) {
 
     dbList.forEach(info => {
         let {etId} = info;
-        if (!map[etId]) map[etId] = {count:0, name:changeEnumValue(configEnum.ENTRYTYPE, etId), bId}
+        if (!map[etId]) map[etId] = {count:0, name:changeEnumValue(configEnum.ENTRYTYPE, etId), memberType:etId, bId}
         map[etId].count += 1;
     });
 
@@ -154,7 +158,9 @@ export async function partymemberTypeList(bId) {
 
 
 export async function partymemberSublist(bId:number, name:string, duration:number, memberType:number, departmentName:number  ) {
-    let param = {bId:{"%like%":bId}}
+    let param:any = {}
+    if(bId) param.bId = {"%like%": bId};
+    if (memberType) param.etId = {"%like%": memberType};
     if (name) param["name"] = {"%like%":name};
     let clomun = ["pmId", "name", "etId", "partyPositionsName", "partyJoiningTime", "departmentName"];
     let partyMemberList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, clomun);
@@ -173,6 +179,8 @@ export async function partymemberSublist(bId:number, name:string, duration:numbe
         if (info.partyJoiningTime) partyJoiningTime = moment(info.partyJoiningTime).format("YYYY")
         changeData.partyStanding = parseInt(time) - parseInt(partyJoiningTime) + "年";
 
+        changeData.branchName = changeEnumValue(configEnum.BRANCHNAMESTR, info.bId);
+
         let departmentName = JSON.parse(changeData.departmentName);
         changeData.departmentName = verificationEnumTools.changeEnumValue(configEnum.DEDPARTMENT, departmentName);
 
@@ -282,7 +290,7 @@ export async function partyexpensesList(payableYear, payableMonth) {
     partyExpensesList.forEach(info => {
         let {partyMember, payAmount, payType} = info;
 
-        if (!map[partyMember.bId]) map[partyMember.bId] = {name:changeEnumValue(configEnum.BRANCHNAMESTR, partyMember.bId), allCount:0, payCount:0};
+        if (!map[partyMember.bId]) map[partyMember.bId] = {name:changeEnumValue(configEnum.BRANCHNAMESTR, partyMember.bId), bId:partyMember.bId, allCount:0, payCount:0};
         map[partyMember.bId].allCount += 1;
 
         
@@ -309,7 +317,7 @@ export async function partyexpensesList(payableYear, payableMonth) {
             itemRate = Math.round(info.payCount/info.allCount *100)
         }
 
-        dataList.push({name:info.name, rate:itemRate, count:info.allCount});
+        dataList.push({name:info.name, rate:itemRate, count:info.allCount, bId:info.bId});
     }
 
   
@@ -368,10 +376,10 @@ export async function partyexpensesBranchList(bId, payType, payableYear, payable
 
 export async function partyexpensesMemberList(payType:number, bId, name:string, duration:number, departmentName:number) {
     let param:any = {payType};
-    if (bId) param.bId = bId;
+    if (bId) param.bId = {"%like%": bId};
     // if (duration) param.duration = duration;
     if (departmentName) param.departmentName = departmentName;
-    if (name) param.name = name;
+    // if (name) param.name = name;
     // if (payType) param.payType = payType;
 
     let manyTableConfig = {};
@@ -387,10 +395,236 @@ export async function partyexpensesMemberList(payType:number, bId, name:string,
             partyPositionsName:"党员",//党员类型
             payType:changeEnumValue(configEnum.PAYTYPE, info.payType),//状态
             partyJoiningTime:moment(partyMember.partyJoiningTime).format("YYYY-MM-DD"),
-            departmentName:changeEnumValue(configEnum.DEDPARTMENT , partyMember.departmentName),
+            departmentName:changeEnumValue(configEnum.DEDPARTMENT , JSON.parse(partyMember.departmentName)),
             payAmount:payAmount
         };
         dataList.push(item)
     });
     return {dataList};
-}
\ No newline at end of file
+}
+
+
+
+/**
+ * 支部制度列表
+ * @param bId 支部id
+ * @param systemTitle 制度主题 可模糊查询 
+ * @returns branchSystemList:[{"bsId":1, "systemTitle":"制度标题"}, ......]
+ */
+export async function branchSystemList(systemTitle:string) {
+    let param = { };
+    if(systemTitle) param["systemTitle"] = {"%like%": systemTitle};
+
+    let branchSystemList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.支部制度表, param, ["bsId", "systemTitle", "releaseTime"]);
+    branchSystemList = branchSystemList || [];
+    let dataList = [];
+    branchSystemList.forEach(info => {
+        dataList.push({
+            bsId:info.bsId,
+            title:info.systemTitle,
+            time:moment(info.releaseTime).format("YYYY-MM-DD")
+        });
+    });
+
+    return {dataList};
+}
+
+
+
+/**
+ * 添加制度细则
+ * @param bsId 支部制度id 
+ * @returns 
+ */
+export async function addOneBranchSystemDetsils( param) {
+  
+    eccFormParam("添加制度细则", CreateDWZBZDConfig, param);
+
+    let addInfo = {
+        systemTitle:param.title,
+        releaseTime:moment(param.releaseTime).format("YYYY-MM-DD"),
+        periodTime:moment(param.periodTime).format("YYYY-MM-DD"),
+        content:param.content,
+        bId:JSON.stringify(param.bId)
+    };
+    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.支部制度表, addInfo, {});
+    
+
+    return {isSuccess:true};
+}
+
+
+
+
+/**
+ * 获取组织生活列表
+ * @param bId 支部id
+ * @param theme 活动名称 模糊查询
+ * @param themeType 活动类型
+ * @param dataMonth 活动月份
+ * @returns organizationalLifeList[{"oId":1, "theme":"活动主题", "themeType":"活动类型", "dataMonth":"活动月份"}]
+ */
+export async function organizationalLifeList( theme:string, themeType:number) {
+    let param = { };
+    if (theme) param["theme"] = {"%like%": theme};
+    if (themeType) param["partyActivityType"] = themeType;
+
+    let clomun = ["oId", "activityStartTime", "activityEndTime", "activityAdd", "partyActivityType"];
+    let organizationalLifeDataList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.组织生活表, param, clomun);
+
+    const Now = new Date().valueOf();
+    let dataList = [];
+    organizationalLifeDataList.forEach(info => {
+        let st = new Date(info.activityStartTime).valueOf();
+        let et = new Date(info.activityEndTime).valueOf();
+        let state = "";
+        if (st < Now && et > Now) state = "正在进行";
+        else if (Now > et) state = "已结束";
+        else state = "即将开展";
+
+        let sTimeStr = moment(info.activityStartTime).format("YYYY-MM-DD HH:mm");
+        let time = `${sTimeStr}-${moment(info.activityEndTime).format("HH:mm")}`;
+
+        dataList.push({
+            oId:info.oId,
+            address:info.activityAdd,
+            time,
+            state,
+            theme:verificationEnumTools.changeEnumValue(configEnum.THEMETYPE, info.partyActivityType)
+        });
+    });
+
+    return {dataList};
+}
+
+
+export async function addOrg( param) {
+    const FuncName = "添加组织生活";
+    eccFormParam(FuncName, DWCreateActivityConfig, param);
+    verificationEnumTools.eccEnumValue(FuncName, "partyActivityType", configEnum.THEMETYPE, param.partyActivityType );
+
+    let leavePartyMember = [];
+    if (param.leavePartyMember) leavePartyMember = [param.leavePartyMember];
+
+    let addInfo = {
+        partyActivityType:param.partyActivityType,
+        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,
+        leavePartyMember:JSON.stringify(leavePartyMember),
+        participatingPartyMember:JSON.stringify(param.participatingPartyMember || []),
+    };
+    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.组织生活表, addInfo, {});
+
+    return {isSuccess:true}
+}
+
+//====================
+
+
+/**
+ * 获取党建先锋列表
+ * @param bId 弃用支部id，数据表删除该字段
+ * @param honorName 
+ * @returns 
+ */
+export async function dwPartyVanguardList(bId:number, honorName:string) {
+    
+    let param:any = {};
+    if (honorName) param.honorName = honorName;
+    let clomun = ["pvId", "honorName", "honorType", "grantingRange", "grantingUnit", "grantTime", "img", "content" ];
+
+    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);
+        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;
+
+        
+
+        changeData.grantingUnit = grantingUnitStr.replace(",", "");
+
+        dataList.push(changeData);
+    });
+
+    return {dataList};
+}
+
+
+/**
+ * 获取党建先锋荣誉详情
+ * @param pvId 
+ * @returns 
+ */
+export async function dwPartyVanguardDetsils(pvId:number) {
+    let param = {pvId};
+    let clomun = ["pvId", "honorName", "honorType", "grantingRange", "grantingUnit", "grantTime", "img", "content" ];
+    let partyVanguardData = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党建先锋表, param, clomun);
+    if (!partyVanguardData || !partyVanguardData.pvId) throw new BizError(ERRORENUM.目标数据不存在);
+
+    let dataInfo:any = extractData(splitResultConfig.partyVanguardConfig, partyVanguardData);
+    dataInfo.honorType = verificationEnumTools.changeEnumValue(configEnum.HONORTYPE, partyVanguardData.honorType);
+    dataInfo.grantingRange = verificationEnumTools.changeEnumValue(configEnum.GRANTINGRANGE, partyVanguardData.grantingRange);
+    dataInfo.grantTime = moment(partyVanguardData.grantTime).format("YYYY-MM-DD");
+    dataInfo.content = partyVanguardData.content;
+    dataInfo.img = partyVanguardData.img;
+
+    let grantingUnitStr = "";
+    partyVanguardData.grantingUnit.forEach(str => {
+        grantingUnitStr += `,${str}`;
+    });
+
+    dataInfo.grantingUnit = grantingUnitStr.replace(",", "");
+
+    return { dataInfo }
+}
+
+
+export async function addDWPartyVanguard(bId, param) {
+    const FuncName = "添加先锋";
+    eccFormParam(FuncName, CreateDJXFConfig, param);
+    verificationEnumTools.eccEnumValue(FuncName, "honorType", configEnum.HONORTYPE, param.honorType);
+    verificationEnumTools.eccEnumValue(FuncName, "grantingRange", configEnum.GRANTINGRANGE, param.grantingRange);
+
+    let addInfo = {
+        honorName:param.honorName,//  "荣誉名称1",
+        honorType:param.honorType,//  "区级",
+        grantingRange:param.grantingRange,//  "团体",
+        grantingUnit:JSON.stringify(param.grantingUnit),//  "上海市*****单位",
+        grantTime:new Date(param.grantTime),//  "2023-08-30"
+        content:param.content,//  "内容"
+        img:param.img,//  "图片
+        bId
+    };
+
+    await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.党建先锋表, addInfo, {});
+
+    return {isSuccess:true}
+}

src/config/eccFormParamConfig.ts

@@ -24,6 +24,18 @@ export const CreateActivityConfig = {
     // participationRecord:{type:"String", notMustHave:true},//活动记录
 };
 
+export const DWCreateActivityConfig = {
+    partyActivityType:{type:"Number"},//党建活动类型
+    activityStartTime:{type:"Number"},//活动开始时间
+    activityEndTime:{type:"Number"},//活动结束时间
+    activityAdd:{type:"String", notMustHave:true},//活动地点
+    activityHost:{type:"String", notMustHave:true},//活动主持人
+    activityNoteTaker:{type:"String", notMustHave:true},//活动记录人
+    // leavePartyMember:{type:"[String]", notMustHave:true},//请假党员
+    participatingPartyMember:{type:"[String]", notMustHave:true},//参与党员
+    // participationRecord:{type:"String", notMustHave:true},//活动记录
+};
+
 
 
 export const UpdateActivityConfig = {
@@ -140,6 +152,20 @@ export const CreateZBZDConfig = {
 
 
 
+/**
+ * 党委支部制度
+ */
+export const CreateDWZBZDConfig = {
+    bId:{type:"[Number]"},//生效支部
+    title:{type:"String", notMustHave:true},//制度标题
+    releaseTime:{type:"Number", notMustHave:true},//发布时间
+    periodTime:{type:"Number", notMustHave:true},//有效期
+    content:{type:"String", notMustHave:true},//内容
+}
+
+
+
+
 export const CreateDJXFConfig = {
     honorName:{type:"String"},//  "荣誉名称1",
     honorType:{type:"Number"},//  "区级",

src/config/enum.ts

@@ -289,4 +289,3 @@ export enum ACTIVITIESTYPE {
     先进典型,
 }
 
-

src/routers/applet/dw.ts

@@ -16,26 +16,25 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/dw/member/partymember/typelist', checkAppletDWToken, asyncHandler(partymember_type_list));
     // httpServer.post('/yfs/dw/member/partymember/typelist/sublist', checkAppletDWToken, asyncHandler());
     httpServer.post('/yfs/dw/member/partymember/add', checkAppletDWToken, asyncHandler(partymember_add));
-    httpServer.post('/yfs/dw/notice/list', checkAppletToken, asyncHandler(party_notice_ist));
+    httpServer.post('/yfs/dw/notice/list', checkAppletDWToken, asyncHandler(party_notice_ist));
 
     httpServer.post('/yfs/dw/applet/partyexpenses/list', checkAppletDWToken, asyncHandler(partyexpenses_list));
     httpServer.post('/yfs/dw/applet/partyexpenses/branchlist', checkAppletDWToken, asyncHandler(partyexpenses_branch_list));
     httpServer.post('/yfs/dw/applet/partyexpenses/member/paylist', checkAppletDWToken, asyncHandler(partyexpenses_pay_member_list));
     httpServer.post('/yfs/dw/applet/partyexpenses/member/notpaylist', checkAppletDWToken, asyncHandler(partyexpenses_notpay_member_list));
 
-    // httpServer.post('/yfs/dw/applet/partyexpenses/list', checkAppletDWToken, asyncHandler());
-    // httpServer.post('/yfs/dw/applet/partyexpenses/list/sublist', checkAppletDWToken, asyncHandler());
-    // httpServer.post('/yfs/dw/applet/partyexpenses/statis', checkAppletDWToken, asyncHandler());
-
-    // httpServer.post('/yfs/applet/branchsystem/list', checkAppletToken, asyncHandler(getBranchSystem));
+    httpServer.post('/yfs/dw/applet/branchsystem/list', checkAppletDWToken, asyncHandler(get_branch_system));
+    httpServer.post('/yfs/dw/applet/branchsystem/add', checkAppletDWToken, asyncHandler(add_branch_system));
     // httpServer.post('/yfs/applet/branchsystem/detsils', checkAppletToken, asyncHandler(getBranchSystemDetsils));
-    // httpServer.post('/yfs/applet/branchsystem/add', checkAppletToken, asyncHandler(addBranchSystemDetsils));
 
+    httpServer.post('/yfs/dw/applet/branchsystem/add', checkAppletDWToken, asyncHandler(add_branch_system));
 
-    // httpServer.post('/yfs/applet/organizationallife/list', checkAppletToken, asyncHandler(organizationalLifeList));
-    // httpServer.post('/yfs/applet/organizationallife/add', checkAppletToken, asyncHandler(addDetails));
+    httpServer.post('/yfs/dw/applet/organizationallife/list', checkAppletDWToken, asyncHandler(organizational_life_list));
+    httpServer.post('/yfs/dw/applet/organizationallife/add', checkAppletDWToken, asyncHandler(add_details));
 
-    
+    httpServer.post('/yfs/dw/applet/partyvanguard/list', checkAppletToken, asyncHandler(get_party_vanguard));
+    httpServer.post('/yfs/dw/applet/partyvanguard/detsils', checkAppletToken, asyncHandler(get_party_vanguard_detsils));
+    httpServer.post('/yfs/dw/applet/partyvanguard/add', checkAppletToken, asyncHandler(add_party_vanguard_detsils));
     
 }
 
@@ -73,8 +72,8 @@ async function partymember_list(req, res) {
 }
 
 async function partymember_sublist(req, res) {
-    let reqConf = {bId:'Number', name:"String", partyPositionsName:"Number", duration:"Number", memberType:"Number", departmentName:"Number"};
-    let {bId, name, duration, memberType, departmentName} = eccReqParamater(reqConf, req.body, ["name", "partyPositionsName"]);
+    let reqConf = {bId:'Number', name:"String", duration:"Number", memberType:"Number", departmentName:"Number"};
+    let {bId, name, duration, memberType, departmentName} = eccReqParamater(reqConf, req.body, ["name", "duration", "memberType", "departmentName"]);
     let activitiesInfo = await dwBiz.partymemberSublist(bId, name, duration, memberType, departmentName);
     res.success(activitiesInfo);
 }
@@ -129,17 +128,102 @@ async function partyexpenses_branch_list(req, res) {
 
 
 async function partyexpenses_pay_member_list(req, res) {
-    let reqConf = {bId:"Number", name:"String", duration:"Number", departmentName:"Number"};
-    let {bId, name, duration, departmentName} = eccReqParamater(reqConf, req.body);
+    let reqConf = {name:"String", duration:"Number", departmentName:"Number"};
+    let {bId, name, duration, departmentName} = eccReqParamater(reqConf, req.body, ["name", "duration", "departmentName"]);
 
     let activitiesInfo = await dwBiz.partyexpensesMemberList(1, bId, name, duration, departmentName);
     res.success(activitiesInfo);
 }
 
 async function partyexpenses_notpay_member_list(req, res) {
-    let reqConf = {bId:"Number", name:"String", duration:"Number", departmentName:"Number"};
-    let {bId, name, duration, departmentName} = eccReqParamater(reqConf, req.body);
+    let reqConf = { name:"String", duration:"Number", departmentName:"Number"};
+    let {bId, name, duration, departmentName} = eccReqParamater(reqConf, req.body, ["name", "duration", "departmentName"]);
 
     let activitiesInfo = await dwBiz.partyexpensesMemberList(2, bId, name, duration, departmentName);
     res.success(activitiesInfo);
 }
+
+
+async function get_branch_system(req, res) {
+    let reqConf = { systemTitle:"String"};
+    let {systemTitle} = eccReqParamater(reqConf, req.body, ["systemTitle"]);
+
+    let activitiesInfo = await dwBiz.branchSystemList(systemTitle);
+    res.success(activitiesInfo);
+}
+
+
+async function add_branch_system(req, res) {
+    let reqConf = { param:"Object"};
+    let {param} = eccReqParamater(reqConf, req.body, []);
+
+    let activitiesInfo = await dwBiz.addOneBranchSystemDetsils(param);
+    res.success(activitiesInfo);
+}
+
+
+async function organizational_life_list(req, res) {
+    let reqConf = { theme:"String", themeType:"Number"};
+    let {theme, themeType} = eccReqParamater(reqConf, req.body, []);
+
+    let activitiesInfo = await dwBiz.organizationalLifeList(theme, themeType);
+    res.success(activitiesInfo);
+}
+
+async function add_details(req, res) {
+    let reqConf = {param:"Object"};
+    let {param} = eccReqParamater(reqConf, req.body);
+    let result = await dwBiz.addOrg(param);
+    res.success(result);
+}
+
+
+ /**  
+  * 党建先锋 荣誉列表
+  * @param req 
+  * @param res 
+  */
+async function get_party_vanguard(req, res) {
+  let reqConf = { honorName:'String'};
+  let {honorName} = eccReqParamater(reqConf, req.body, ["honorName"]);
+
+  let bId = req.headers.bId;
+  let result = await dwBiz.dwPartyVanguardList(bId, honorName);
+  res.success(result);
+}
+
+
+/**
+ * 党建先锋 获取荣誉详情
+ * @param req 
+ * @param res 
+ */
+async function get_party_vanguard_detsils(req, res) {
+  let reqConf = {pvId:'Number'};
+  let {pvId} = eccReqParamater(reqConf, req.body);
+
+  let result = await dwBiz.dwPartyVanguardDetsils(pvId);
+  res.success(result);
+}
+
+
+
+
+/**
+ * 党建先锋 添加荣誉详情
+ * @param req 
+ * @param res 
+ */
+async function add_party_vanguard_detsils(req, res) {
+  let reqConf = {param:'Object'};
+  let {param} = eccReqParamater(reqConf, req.body);
+
+  let bId = req.headers.bId;
+
+  let result = await dwBiz.addDWPartyVanguard(bId, param);
+  res.success(result);
+}
+
+
+
+

src/routers/public.ts

@@ -25,9 +25,28 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/applet/public/personhonortype', asyncHandler(personhonortype));
     httpServer.post('/yfs/public/entrytype', asyncHandler(entryType));
 
-    
+    httpServer.post('/yfs/public/branchname', asyncHandler(branchname));
+    httpServer.post('/yfs/public/age', asyncHandler(age));
+}
+
+
+function age(req, res) {
+    let dataList = [];
+    dataList.push({key:"0-5年", value:1})
+    dataList.push({key:"5-10年", value:2})
+    dataList.push({key:"10-15年", value:3})
+    dataList.push({key:"15-20年", value:4})
+    dataList.push({key:"20年以上", value:5});
+
+    res.success({dataList})
 }
 
+function branchname(req, res) {
+    let dataList = getEnumList(configEnum.BRANCHNAME);
+    res.success(dataList);
+}
+
+
 function personhonortype(req, res) {
     let dataList = getEnumList(configEnum.PERSONHONORTYPE);
     res.success(dataList);