no message

src/config/enum/enum.ts

@@ -11,7 +11,8 @@ export enum OPERATIONALDATATYPE {
     分页查询='/yfs/dataserver/mysql/table/find/manytopage',
     查询数据量='/yfs/dataserver/mysql/table/find/count',
     多表联查='/yfs/dataserver/mysql/table/find/aggragate',
-    多表分页='/yfs/dataserver/mysql/table/find/aggragatetopage'
+    多表分页='/yfs/dataserver/mysql/table/find/aggragatetopage',
+    多表单个='/yfs/dataserver/mysql/table/find/aggragateone'
 }
 
 

src/config/enum/errorEnum.ts

@@ -20,7 +20,12 @@ export enum ERRORENUM {
     管理员不可被删除,
     权限不足,
     目标数据不存在,
-    文件不存在
+    文件不存在,
+    只能修改已缴纳数据,
+    修改金额不能为0,
+    不能补录已经存在的数据,
+    目标数据已缴纳,
+
 }
 
 export enum ERRORCODEENUM {

src/data/operationalData.ts

@@ -87,7 +87,7 @@ export async function selectManyTableData(url, tableName, param, column,  includ
         queray.column = column;
     }
     
-    if (url == OPERATIONALDATATYPE.分页查询) {
+    if (url == OPERATIONALDATATYPE.多表分页) {
         if (!pageNumber) throw new BizError(ERRORENUM.分页请设置当前页数, `pageNumber:${pageNumber};pageSize:${pageSize}`);
         queray.pageNumber = pageNumber;
         queray.pageSize = pageSize || 10;

src/main.ts

+import { expensesList } from "./biz/partyExpenses";
+import { PAYTYPE } from "./config/enum/enum";
 import { initConfig, systemConfig} from "./config/serverConfig";
 import { httpServer } from "./net/http_server";
 
@@ -7,11 +9,14 @@ async function lanuch() {
     /**创建http服务 */
     httpServer.createServer(systemConfig.port);
 
+    await test()
     // await smsTask();
     console.log('This indicates that the server is started successfully.');
 }
 
 
-
+async function test() {
+    expensesList(PAYTYPE.未缴纳, null, "", 1);
+}
 
 lanuch();
\ No newline at end of file

src/routers/partyExpenses.ts

+import * as asyncHandler from 'express-async-handler';
+import * as partyExpensesBiz from '../biz/partyExpenses';
+import { checkToken } from '../middleware/user';
+import { eccReqParamater } from '../tools/eccParam';
+import { PAYTYPE } from '../config/enum/enum';
+
+export function setRouter(httpServer) {
+    httpServer.post('/yfs/admin/expenses/unpaid/list', checkToken, asyncHandler(unpaidList));
+    httpServer.post('/yfs/admin/expenses/unpaid/update', checkToken, asyncHandler(updateUnPaid));
+    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/paid/list', checkToken, asyncHandler(paidList));
+    httpServer.post('/yfs/admin/expenses/paid/info', checkToken, asyncHandler(paidInfo));
+    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));
+    
+}
+
+
+/**
+ * 未缴列表
+ * @param req 
+ * @param res 
+ */
+async function unpaidList(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { payableMonth:'Number', name:'String', pageNumber:"Number"};
+    let { payableMonth, name, pageNumber } = eccReqParamater(reqConf, req.body, ["name", "payableMonth"]);
+    
+    let result = await partyExpensesBiz.expensesList(PAYTYPE.未缴纳, payableMonth, name, pageNumber);
+
+    res.success(result);
+}
+
+
+/**
+ * 已缴列表
+ * @param req 
+ * @param res 
+ */
+async function paidList(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { payableMonth:'Number', name:'String', pageNumber:"Number"};
+    let { payableMonth, name, pageNumber } = eccReqParamater(reqConf, req.body, ["name", "payableMonth"]);
+    
+    let result = await partyExpensesBiz.expensesList(PAYTYPE.已缴纳, payableMonth, name, pageNumber);
+
+    res.success(result);
+}
+
+
+/**
+ * 已缴回显
+ * @param req 
+ * @param res 
+ */
+async function paidInfo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { peId:'Number' };
+    let { peId } = eccReqParamater(reqConf, req.body, []);
+    
+    let result = await partyExpensesBiz.expensesInfo(peId);
+
+    res.success(result);
+}
+
+
+/**
+ * 已缴纳 修改
+ * @param req 
+ * @param res 
+ */
+async function updatePaid(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { peId:'Number', payAmount:'Number' };
+    let { peId, payAmount } = eccReqParamater(reqConf, req.body, []);
+    
+    let result = await partyExpensesBiz.updateExpensesPayAmount(userInfo, peId, payAmount);
+
+    res.success(result);
+}
+
+
+/**
+ * 已缴纳 补充
+ * @param req 
+ * @param res 
+ */
+async function replenishPaid(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { payableMonth:'Number', payAmount:'Number', pmId:'String'};
+    let { payableMonth, payAmount, pmId } = eccReqParamater(reqConf, req.body, []);
+    
+    let result = await partyExpensesBiz.addExpensesPayToPaid(userInfo, pmId, payableMonth, payAmount);
+
+    res.success(result);
+}
+
+
+/**
+ * 已缴纳 删除
+ * @param req 
+ * @param res 
+ */
+async function delPaid(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { peId:'Number'};
+    let { peId } = eccReqParamater(reqConf, req.body, []);
+    
+    let result = await partyExpensesBiz.updateExpensesPayStatsToFalse(userInfo, peId);
+
+    res.success(result);
+}
+
+
+
+/**
+ * 未缴纳修改成已缴纳
+ * @param req 
+ * @param res 
+ */
+async function updateUnPaid(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { peId:'Number', payAmount:'Number'};
+    let { peId, payAmount } = eccReqParamater(reqConf, req.body, []);
+    
+    let result = await partyExpensesBiz.changeToPaid(userInfo, peId, payAmount);
+
+    res.success(result);
+}
+
+
+/**
+ * 批量未缴纳修改成已缴纳
+ * @param req 
+ * @param res 
+ */
+async function bulkUpdateUnPaid(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { peIdList:'[Number]', payAmount:'Number'};
+    let { peIdList, payAmount } = eccReqParamater(reqConf, req.body, []);
+    
+    let result = await partyExpensesBiz.bulkChangeToPaid(userInfo, peIdList, payAmount);
+
+    res.success(result);
+}
+
+
+
+/**
+ * 未缴纳回显
+ * @param req 
+ * @param res 
+ */
+async function unPaidInfo(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { peId:'Number'};
+    let { peId } = eccReqParamater(reqConf, req.body, []);
+    
+    let result = await partyExpensesBiz.getUnpaidInfo(userInfo, peId);
+
+    res.success(result);
+}
+
+
+/**
+ * 未缴纳删除
+ * @param req 
+ * @param res 
+ */
+async function delUnPaid(req, res) {
+    let userInfo = req.userInfo;
+
+    let reqConf = { peId:'Number'};
+    let { peId } = eccReqParamater(reqConf, req.body, []);
+    
+    let result = await partyExpensesBiz.delUnpaidInfo(userInfo, peId);
+
+    res.success(result);
+}
+

src/routers/router.ts

@@ -6,6 +6,7 @@ import * as branchSystemRouter from "./branchSystem";
 import * as organizationalLifeRouter from "./organizationalLife";
 import * as thematicActivitiesRouter from "./thematicActivities";
 import * as dynamicRouter from "./dynamic";
+import * as partyExpensesRouter from "./partyExpenses";
 
 
 export function setRouter(httpServer) {
@@ -17,4 +18,6 @@ export function setRouter(httpServer) {
     organizationalLifeRouter.setRouter(httpServer);
     thematicActivitiesRouter.setRouter(httpServer);
     dynamicRouter.setRouter(httpServer);
+    partyExpensesRouter.setRouter(httpServer);
+    
 }
\ No newline at end of file

src/util/analysisExcel.ts

@@ -38,8 +38,6 @@ export function planaryArrayBecomeOfBlockData(planaryArray) {
 }
 
 
-//===
-
 /**
  * getBlockData 数据分块 
  * @param dataList  解析出来的excel二维数组