no message

src/biz/organizationalLife.ts

@@ -2,7 +2,92 @@
  * 组织生活
  */
 
-export async function getOrgLifeList(month:number, title:string, pageNumber:number) {
+import moment = require("moment");
+import { selectData } from "../data/operationalData";
+import { BRANCHNAME, FILETYPE, OPERATIONALDATATYPE, TABLENAME, THEMETYPE } from "../config/enum/enum";
+import { changeEnumValue, eccEnumValue } from "../tools/eccEnum";
+import { datechangeToStr } from "../util/piecemeal";
+import { BizError } from "../util/bizError";
+import { ERRORENUM } from "../config/enum/errorEnum";
+
+
+
+/**
+ * 组织生活列表
+ * @param userInfo 
+ * @param month 
+ * @param title 
+ * @param pageNumber 
+ * @returns 
+ */
+export async function getOrgLifeList(userInfo, month:number, title:string, pageNumber:number) {
+    let selectParam:any = {};
+    if (userInfo.branch) {
+        selectParam.bId = {"%like%": userInfo.branch};
+    }
+    if (month) {
+        let stTime = moment(month).startOf("month").format("YYYY-MM-DD HH:mm:ss");
+        let etTime = moment(month).endOf('month').format("YYYY-MM-DD HH:mm:ss");
+        selectParam.dataMonth = {"%between%": [stTime, etTime]};
+    }
+    if (title) {
+        selectParam.theme = {"%like%":title};
+    }
+
+    let column = ["oId", "theme", "themeType", "dataMonth", "fileType", "uploadTime", "bId"];
+    let dbList = await selectData(OPERATIONALDATATYPE.分页查询, TABLENAME.组织生活表, selectParam, column, pageNumber, 10);
+    let dataCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.组织生活表, selectParam, null);
+
+    let dataList = {};
+    dbList.forEach( info => {
+        let {oId, theme, themeType, dataMonth, fileType, uploadTime, bId} = info;
+        let dataMonthStr = moment(dataMonth).format("YYYY-MM");
+        let titleTypeStr = changeEnumValue(THEMETYPE, themeType);
+        let fileTypeStr = changeEnumValue(FILETYPE, fileType);
+        let uploadTimeStr = datechangeToStr(uploadTime);
+        let branch = changeEnumValue(BRANCHNAME, JSON.parse(bId));
+
+        if (!dataList[branch]) dataList[branch] = [];
+        dataList[branch].push({
+            oId, title:theme, titleType:titleTypeStr, dataMonth:dataMonthStr, fileType:fileTypeStr, uploadTime:uploadTimeStr
+        })
+    })
+
+    return {dataList, dataCount};
+}
+
+
+
+export async function addOrgLifeInfo(userInfo, bId, title, titleType, dataMonth, uploadTime, filesNameList) {
+    let funName = "添加组织生活";
+    if (userInfo.branch == -1) {
+        throw new BizError(ERRORENUM.权限不足, `${userInfo.userId}${funName}但是制度范围不包含他所在的支部`);
+    }
+    eccEnumValue(funName, "titleType", THEMETYPE, titleType);
+
+    let addParam = {
+        theme: title,
+        themeType: titleType,
+        dataMonth: moment(dataMonth).format("YYYY-MM-DD HH:mm:ss"),
+        bId,
+
+
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-}
\ No newline at end of file

src/routers/organizationalLife.ts

+/**
+ * 组织生活
+ */
+
+import * as asyncHandler from 'express-async-handler';
+import * as organizationalLifeBiz from '../biz/organizationalLife';
+import { checkToken } from '../middleware/user';
+import { eccReqParamater } from '../tools/eccParam';
+
+export function setRouter(httpServer) {
+    httpServer.post('/yfs/admin/organizationallife/list', checkToken, asyncHandler(organizationalLifeList));
+}
+
+
+/**
+ * 组织生活列表
+ * @param req 
+ * @param res 
+ */
+async function organizationalLifeList(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = {month:'Number', title:'String', pageNumber:'Number'};
+    let { month, title, pageNumber } = eccReqParamater(reqConf, req.body, ["month", "title"]);
+    
+    let result = await organizationalLifeBiz.getOrgLifeList(userInfo, month, title, pageNumber);
+
+    res.success(result);
+}
\ No newline at end of file

src/routers/router.ts

@@ -3,6 +3,7 @@ import * as partyMemberRouter from "./partyMember";
 import * as publicRouter from "./public";
 import * as organizationRouter from "./organization";
 import * as branchSystemRouter from "./branchSystem";
+import * as organizationalLifeRouter from "./organizationalLife";
 
 
 export function setRouter(httpServer) {
@@ -11,4 +12,5 @@ export function setRouter(httpServer) {
     publicRouter.setRouter(httpServer);
     organizationRouter.setRouter(httpServer);
     branchSystemRouter.setRouter(httpServer);
+    organizationalLifeRouter.setRouter(httpServer);
 }
\ No newline at end of file