no message

src/biz/dw.ts

@@ -3,7 +3,7 @@ import * as configEnum from "../config/enum";
 import * as clientConfigEnum from "../config/clientEnum";
 import { extractData } from "../util/piecemeal";
 import * as splitResultConfig from "../config/splitResultConfig";
-import { selectData } from "../middleware/databaseSuccess";
+import { selectData, selectManyTableData } from "../middleware/databaseSuccess";
 import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
 import moment = require("moment");
 import * as verificationEnumTools from "../util/verificationEnum";
@@ -97,4 +97,92 @@ export async function activitiesData() {
             fileUrl:info.fileName[0] || ""
         }
     });
-}
\ No newline at end of file
+}
+
+
+export async function partymemberList() {
+    let param = {};
+
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, ["peId", "bId", "payAmount"]);
+
+    let map = {};
+    let allCount = 0;
+
+    dbList.forEach(info => {
+        let {bId} = info;
+        if (!map[bId]) map[bId] = {count:0, name:changeEnumValue(configEnum.BRANCHNAMESTR, bId), bId}
+        map[bId].count += 1;
+
+        allCount += 1;
+    });
+
+    let dataList = [{name:"牙防所党建总人数", count:allCount}];
+
+    for (let key in map) {
+        dataList.push(map[key])
+    }
+
+    return {dataList};
+}
+
+export async function partymemberTypeList(bId) {
+    let param:any = {bId};
+
+    let dbList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, ["etId", "bId"]);
+
+    let map = {};
+
+    dbList.forEach(info => {
+        let {etId} = info;
+        if (!map[etId]) map[etId] = {count:0, name:changeEnumValue(configEnum.ENTRYTYPE, etId), bId}
+        map[etId].count += 1;
+    });
+
+    let dataList = [];
+
+    for (let key in map) {
+        dataList.push(map[key])
+    }
+
+    return {dataList};
+}
+
+
+
+
+
+export async function partymemberSublist(bId:number, name:string) {
+    let branchName = verificationEnumTools.changeEnumValue(configEnum.BRANCHNAME, bId);
+    
+    let partyMemberNum = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {bId:{"%like%":bId}}, []); //党员总数
+    let partyMemberCount = {
+        key: branchName + "目前党员人数",
+        value: partyMemberNum || 0
+    };
+    let param = {bId:{"%like%":bId}}
+    if (name) param["name"] = {"%like%":name};
+    let clomun = ["pmId", "name", "etId", "partyPositionsName", "partyJoiningTime", "departmentName"];
+    let partyMemberList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党员基础信息表, param, clomun);
+
+    let nameList = [];
+    /**截取返回字段 */
+    partyMemberList.forEach( info => {
+        let changeData:any = extractData(splitResultConfig.partyMemberConfig, info);
+
+        let {color, partyPositionsNameStr} = changePartyPositionsName( JSON.parse(info.partyPositionsName), changeData.etId);
+        changeData.partyPositionsName = partyPositionsNameStr;
+        changeData.color = color;
+
+        let time = moment(new Date()).format("YYYY");
+        let partyJoiningTime = time;
+        if (info.partyJoiningTime) partyJoiningTime = moment(info.partyJoiningTime).format("YYYY")
+        changeData.partyStanding = parseInt(time) - parseInt(partyJoiningTime) + "年";
+
+        let departmentName = JSON.parse(changeData.departmentName);
+        changeData.departmentName = verificationEnumTools.changeEnumValue(configEnum.DEDPARTMENT, departmentName);
+
+        nameList.push(changeData);
+    })
+
+    return {nameList, partyMemberCount};
+}

src/biz/partyBuildingDynamic.ts

@@ -4,11 +4,8 @@
 
 import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
 import { selectData } from "../middleware/databaseSuccess";
-import { extractData } from "../util/piecemeal";
-import * as splitResultConfig from "../config/splitResultConfig";
 import moment = require("moment");
-import { ACTIVITIESTYPE, PBTYPE, UPTYPE } from "../config/enum";
-import { getFileUrl } from "../middleware/getUrl";
+import { ACTIVITIESTYPE } from "../config/enum";
 import { changeEnumValue } from "../util/verificationEnum";
 
 

src/config/enum.ts

@@ -53,6 +53,12 @@ export enum BRANCHNAME {
     牙防所第四支部
 }
 
+export enum BRANCHNAMESTR {
+    第一支部 = 1,
+    第二支部,
+    第三支部,
+    第四支部
+}
 
 /**行政职务 */
 export enum ADMINISTRATIVEPOSITION {

src/routers/applet/dw.ts

 import { eccReqParamater } from '../../util/verificationParam';
 import { checkAppletToken, checkAppletDWToken } from '../../middleware/user';
- import * as asyncHandler from 'express-async-handler';
+import * as asyncHandler from 'express-async-handler';
+import * as dwBiz from '../../biz/dw';
+
 
 export function setRouter(httpServer) {
 
@@ -12,22 +14,22 @@ export function setRouter(httpServer) {
     httpServer.post('/yfs/dw/member/partymember/list', checkAppletDWToken, asyncHandler(partymember_list));
     httpServer.post('/yfs/dw/member/partymember/list/sublist', checkAppletDWToken, asyncHandler(partymember_sublist));
     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/typelist/sublist', checkAppletDWToken, asyncHandler());
 
-    httpServer.post('/yfs/dw/applet/partyexpenses/list', checkAppletDWToken, asyncHandler());
-    httpServer.post('/yfs/dw/applet/partyexpenses/statis', checkAppletDWToken, asyncHandler());
+    // httpServer.post('/yfs/dw/applet/partyexpenses/list', checkAppletDWToken, asyncHandler());
+    // httpServer.post('/yfs/dw/applet/partyexpenses/statis', checkAppletDWToken, asyncHandler());
 
-    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/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/applet/branchsystem/detsils', checkAppletToken, asyncHandler(getBranchSystemDetsils));
-    httpServer.post('/yfs/applet/branchsystem/add', checkAppletToken, asyncHandler(addBranchSystemDetsils));
+    // httpServer.post('/yfs/applet/branchsystem/list', checkAppletToken, asyncHandler(getBranchSystem));
+    // httpServer.post('/yfs/applet/branchsystem/detsils', checkAppletToken, asyncHandler(getBranchSystemDetsils));
+    // httpServer.post('/yfs/applet/branchsystem/add', checkAppletToken, asyncHandler(addBranchSystemDetsils));
 
 
-    httpServer.post('/yfs/applet/organizationallife/list', checkAppletToken, asyncHandler(organizationalLifeList));
-    httpServer.post('/yfs/applet/organizationallife/add', checkAppletToken, asyncHandler(addDetails));
+    // httpServer.post('/yfs/applet/organizationallife/list', checkAppletToken, asyncHandler(organizationalLifeList));
+    // httpServer.post('/yfs/applet/organizationallife/add', checkAppletToken, asyncHandler(addDetails));
 }