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/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);