no message

.gitignore

@@ -8,3 +8,4 @@
 /files
 *test*
 *.logs
+*.zip

serverConfig.xml

@@ -5,5 +5,6 @@
         <sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
     </db>
     <imgUrl>http://123.207.147.179:40003/</imgUrl>
+    <fileIP>http://192.168.0.71:40004</fileIP>
 </config>
  
\ No newline at end of file

src/biz/base.ts

@@ -9,6 +9,7 @@ import { extractData } from "../util/piecemeal";
 import * as splitResultConfig from "../config/splitResultConfig";
 import { selectData } from "../middleware/databaseSuccess";
 import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
+import moment = require("moment");
 
 
 /**
@@ -89,14 +90,28 @@ function getPartyPositionsList(numberList) {
  */
  export async function activitiesData(bId:number) {
     let param = { bId };
-    let partyInformationList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.专题活动表, param, ["theme", "dataMonth"]);
-
+    let partyInformationList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.专题活动表, param, ["taId", "theme", "dataMonth"]);
+    let partyBuildingDynamicDataList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建动态表, param, ["pbId", "theme", "dataMonth"]);
     let dataList = [];
     partyInformationList.forEach( info => {
-        let changeData:any = extractData(splitResultConfig.partyInformationConfig, info, "YYYY-MM-DD");
+        let changeData:any = extractData(splitResultConfig.partyInformationConfig, info);
+        changeData.dataMonth =  new Date(info.dataMonth).valueOf();
+        changeData.pbType = configEnum.PBTYPE.党建资讯;
+        dataList.push(changeData);
+    })
+    partyBuildingDynamicDataList.forEach (info => {
+        let changeData:any = extractData(splitResultConfig.buildingDynamiconfig, info);
+        changeData.dataMonth =  new Date(info.dataMonth).valueOf();
+        changeData.pbType = configEnum.PBTYPE.党建动态;
         dataList.push(changeData);
     })
 
+    dataList.sort( (a, b) => { return b["dataMonth"] - a["dataMonth"]; })
+
+    dataList.forEach( info => {
+        info.dataMonth = moment(info.dataMonth).format('YYYY-MM-DD');
+    })
+
     return dataList;
 }
 

src/biz/branchSystem.ts

@@ -4,6 +4,7 @@
 
 import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
 import { ERRORENUM } from "../config/errorEnum";
+import { systemConfig } from "../config/systemConfig";
 import { selectData } from "../middleware/databaseSuccess";
 import { BizError } from "../util/bizError";
 
@@ -30,12 +31,17 @@ export async function branchSystemList(bId:number, systemTitle:string) {
  * @param bsId 支部制度id 
  * @returns branchSystemInfo:{"bsId":1, "systemTitle":"制度标题", "fileName":["制度文件1", ......]}
  */
-export async function branchSystemDetsils(bsId:number) {
+export async function branchSystemDetsils(bsId:number, token:string, userid:string) {
     let clomun = ["bsId", "systemTitle", "fileName"];
     let branchSystemInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.支部制度表, {bsId}, clomun);
     if(!branchSystemInfo || !branchSystemInfo.bsId)  throw new BizError(ERRORENUM.库中不存在对应数据, `制度细则中不存在id=${bsId}的数据`);
-    branchSystemInfo.fileName = JSON.parse(branchSystemInfo.fileName);
-
+    let fileNameInfo = JSON.parse(branchSystemInfo.fileName);
+    let fileNameList = [];
+    for(let i = 0; i < fileNameInfo.length; i++) {
+        let fileType = fileNameInfo[i].slice(0, 1);
+        fileNameList.push(`${systemConfig.fileIP}/yfs/files/${fileType}/${fileNameInfo[i]}?token=${token}&userid=${userid}`);
+    }
+    branchSystemInfo.fileName = fileNameList;
     return branchSystemInfo;
 }
 

src/biz/memberLearning.ts

@@ -9,6 +9,7 @@ import { operationalData, selectData, selectManyTableData } from "../middleware/
 import moment = require("moment");
 import * as verificationEnumTools from "../util/verificationEnum";
 import * as configEnum from "../config/enum";
+import { systemConfig } from "../config/systemConfig";
 
 
 /**
@@ -51,10 +52,22 @@ export async function memberLearningList(pmId:string, courseEntryType:number, co
             learningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {pmId, mlId}, rateColumn); 
             console.log(learningInfo);
         }
+        
+        let filename;
+        if (courseEntryType == 2) {
+            let fileNameInfo = JSON.parse(fileName);
+            filename = [];
+            for(let i = 0; i < fileNameInfo.length; i++) {
+                filename.push(`${systemConfig.fileIP}/${fileNameInfo[i]}`);
+            }
+        } else {
+            filename = JSON.parse(filename);
+        }
+        
         rateLearningList.push({
             rlId: learningInfo.rlId,
             contentTitle,
-            fileName: JSON.parse(fileName),
+            fileName: filename,
             rateOfLearning: learningInfo.rateOfLearning,
             learningCompleted: learningInfo.learningCompleted,
             coverImage,
@@ -74,7 +87,7 @@ export async function memberLearningList(pmId:string, courseEntryType:number, co
  * @returns learningPowerList:[{"pmId":"党员id", "name":"党员名称", "bId":"所属支部", "dayIntegral":得分, "dataTime":"数据月份", "ranking":排名}]
  * @returns oneselfRanking:{"pmId":"党员id", "name":"党员名称", "bId":"所属支部", "dayIntegral":得分, "dataTime":"数据月份", "ranking":排名}
  */
- export async function branchRanking(pmId, bId?) {
+export async function branchRanking(pmId, bId?) {
     let orderParam = {"%orderDesc%": "dataTime", "%limit%": 1};
     let monthData = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习强国, orderParam, ["dataTime"]);
     if (!monthData || !monthData.dataTime) return [];

src/biz/partyBuildingDynamic.ts

@@ -7,6 +7,8 @@ import { selectData } from "../middleware/databaseSuccess";
 import { extractData } from "../util/piecemeal";
 import * as splitResultConfig from "../config/splitResultConfig";
 import moment = require("moment");
+import { PBTYPE } from "../config/enum";
+import { systemConfig } from "../config/systemConfig";
 
 
 /**
@@ -23,19 +25,27 @@ export async function partyBuildingDynamicList(bId:number, theme:string, activit
     let etTime = moment(timeStr).endOf('month').format("YYYY-MM-DD HH:mm:ss");
 
     let param = {
-        bId: {"%like%": bId},
+        bId,
         dataMonth: {"%between%": [stTime, etTime]}
     }
     if(theme) param["theme"] = {"%like%":theme};
-
-    let clomun = ["pbId", "theme", "dataMonth"];
-    let partyBuildingDynamicDataList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建动态表, param, clomun);
-    
     let partyBuildingDynamicList = [];
-    partyBuildingDynamicDataList.forEach( async info => {
+
+    let partyInformationList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.专题活动表, param, ["taId", "theme", "dataMonth"]);
+    for (let i = 0; i < partyInformationList.length; i++) {
+        let info = partyInformationList[i];
+        let changeData:any = extractData(splitResultConfig.thematicActivitiesConfig, info, "YYYY-MM-DD");
+        changeData.pbType = PBTYPE.党建资讯;
+        partyBuildingDynamicList.push(changeData);
+    }
+
+    let buildingDynamicDataList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建动态表, param, ["pbId", "theme", "dataMonth"]);
+    for (let i = 0; i < buildingDynamicDataList.length; i++) {
+        let info = buildingDynamicDataList[i];
         let changeData:any = extractData(splitResultConfig.partyBuildingDynamicConfig, info, "YYYY-MM-DD");
+        changeData.pbType = PBTYPE.党建动态;
         partyBuildingDynamicList.push(changeData);
-    });
+    }
 
     return partyBuildingDynamicList;
 }
@@ -46,13 +56,19 @@ export async function partyBuildingDynamicList(bId:number, theme:string, activit
  * @param pbId 
  * @returns partyBuildingDynamicInfo:{ "theme":"党建动态主题", "dataMonth":"数据月份", "fileName":["党建动态文件名称", ......] }
  */
-export async function partyBuildingDynamicDetsils(pbId:number) {
-    let param = {pbId};
+export async function partyBuildingDynamicDetsils(pbId:number, pbType:number) {
     let clomun = ["theme", "dataMonth", "fileName"];
-    let partyBuildingDynamicInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党建动态表, param, clomun);
+    let partyBuildingDynamicInfo:any = {};
+    if (pbType == PBTYPE.党建资讯) partyBuildingDynamicInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.专题活动表, {taId: pbId}, clomun);
+    if (pbType == PBTYPE.党建动态) partyBuildingDynamicInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党建动态表, {pbId}, clomun);
 
     partyBuildingDynamicInfo.dataMonth = moment(partyBuildingDynamicInfo.dataMonth).format("YYYY-MM-DD");
-    partyBuildingDynamicInfo.fileName = JSON.parse(partyBuildingDynamicInfo.fileName);
+    let fileNameInfo = JSON.parse(partyBuildingDynamicInfo.fileName);
+    let fileName = [];
+    for(let i = 0; i < fileNameInfo.length; i++) {
+        fileName.push(`${systemConfig.fileIP}/${fileNameInfo[i]}`);
+    }
+    partyBuildingDynamicInfo.fileName = fileName;
 
     return partyBuildingDynamicInfo;
 }

src/biz/partyExpenses.ts

@@ -7,7 +7,6 @@ import { selectData } from "../middleware/databaseSuccess";
 import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
 import moment = require("moment");
 import { changeEnumValue } from "../util/verificationEnum";
-import { PARTYPOSITIONSICON } from "../config/clientEnum";
 
 
 /**
@@ -25,7 +24,7 @@ import { PARTYPOSITIONSICON } from "../config/clientEnum";
     let stTime = moment(timeStr).startOf("month").format("YYYY-MM-DD HH:mm:ss");
     let etTime = moment(timeStr).endOf('month').format("YYYY-MM-DD HH:mm:ss");
     let param = {
-        bId: {"%like%": bId},
+        bId,
         payableMonth: {"%between%": [stTime, etTime]}
     }
     if(payType) param["payType"] = payType;
@@ -38,36 +37,60 @@ import { PARTYPOSITIONSICON } from "../config/clientEnum";
         expMap[pmId] = {payType, payTime};
     });
 
+    let partyExpensesList = [];
+    
     let memberParam = { etId: 1, bId: {"%like%": bId} };
     if(name) memberParam["name"] = {"%like%": name};
-    let memberClomun = ["pmId", "name", "partyPositionsName", "departmentName", "partyJoiningTime"];
+    let memberClomun = ["pmId", "etId", "name", "partyPositionsName", "departmentName", "partyJoiningTime"];
     let partyMenberDataList = await selectData(OPERATIONALDATATYPE.查询多个 , TABLENAME.党员基础信息表, memberParam, memberClomun);
 
+    partyMenberDataList.forEach(info => {
+        let {name, etId, pmId, partyPositionsName, departmentName, partyJoiningTime} = info;
+        let expInfo = expMap[pmId];
+
+        if (expInfo) {
+            let payTime = "";
+            if(expInfo.payTime) payTime = moment(expInfo.payTime).format("YYYY-MM-DD");
+            let partyPositions = "";
+            switch(etId) {
+                case configEnum.ENTRYTYPE.正式党员:
+                    partyPositions = changeEnumValue(configEnum.PARTYPOSITIONS, JSON.parse(partyPositionsName));
+                    if (!partyPositions || partyPositions=='undefined') partyPositions = "党员";
+                break;
+                default: partyPositions = changeEnumValue(configEnum.ENTRYTYPE, etId);
+            }
+            partyExpensesList.push({
+                name,
+                payType:changeEnumValue(configEnum.PAYTYPE, expInfo.payType),
+                pmId,
+                payTime,
+                partyPositionsName: partyPositions, //党内职务
+                departmentName: changeEnumValue(configEnum.DEDPARTMENT, JSON.parse(departmentName)), //所属科室
+                partyJoiningTime: `${new Date().getFullYear() - parseInt(partyJoiningTime)}年` //党龄
+            });
+        }
+    });
+
+    let baseExpenses = await selectData(OPERATIONALDATATYPE.查询多个 , TABLENAME.党费管理表, {bId, payableMonth: {"%between%": [stTime, etTime]}}, clomun);
+
+    let baseExpMap = {};//党费缴纳记录
+    baseExpenses.forEach(info => {
+        let {pmId, payType, payTime} = info;
+        baseExpMap[pmId] = {payType, payTime};
+    });
+
+    let baseMember = await selectData(OPERATIONALDATATYPE.查询多个 , TABLENAME.党员基础信息表, {etId: 1, bId: {"%like%": bId}}, memberClomun);
+    
     let baseData = { //基础数据
-        partyCount:partyMenberDataList.length,//党员总数,
+        partyCount:baseMember.length,//党员总数,
         paid:0, // 已缴纳
         unpaid:0 // 未缴纳
     };
-
-    let partyExpensesList = [];
-    partyMenberDataList.forEach(info => {
-        let {name, pmId, partyPositionsName, departmentName, partyJoiningTime} = info;
-        let expInfo = expMap[pmId];
+    baseMember.forEach(info => {
+        let expInfo = baseExpMap[info.pmId];
         if (!expInfo) expInfo = {payType:configEnum.PAYTYPE.未缴纳, payTime:timeStr}; //对应党员没有缴纳信息，返回一条该月未缴纳数据
-
+        if (expInfo.payType == configEnum.PAYTYPE.未缴纳) baseData.unpaid += 1;
         if (expInfo.payType == configEnum.PAYTYPE.已缴纳) baseData.paid += 1;
-        else baseData.unpaid += 1;
-        let payTime = "";
-        if(expInfo.payTime) payTime = moment(expInfo.payTime).format("YYYY-MM-DD");
-        partyExpensesList.push({
-            name,
-            payType:changeEnumValue(configEnum.PAYTYPE, expInfo.payType),
-            pmId,
-            payTime,
-            partyPositionsName: changeEnumValue(PARTYPOSITIONSICON, JSON.parse(partyPositionsName)), //党内职务
-            departmentName: changeEnumValue(configEnum.DEDPARTMENT, JSON.parse(departmentName)), //所属科室
-            partyJoiningTime: `${new Date().getFullYear() - parseInt(partyJoiningTime)}年` //党龄
-        });
     });
 
     return {baseData, partyExpensesList};

src/biz/partyMember.ts

@@ -37,7 +37,8 @@ export async function partyMemberNameList(bId:number, name:string) {
             case configEnum.ENTRYTYPE.正式党员:
                 changeData.color = "#C62A23";
                 let partyPositions = JSON.parse(info.partyPositionsName);
-                changeData.partyPositionsName = verificationEnumTools.changeEnumValue(clientEnum.PARTYPOSITIONSICON, partyPositions);
+                changeData.partyPositionsName = verificationEnumTools.changeEnumValue(configEnum.PARTYPOSITIONS, partyPositions);
+                if (!changeData.partyPositionsName || changeData.partyPositionsName == "undefined") changeData.partyPositionsName = "党员";
             break;
             case configEnum.ENTRYTYPE.入党积极分子:
                 changeData.color = "#3549B0";
@@ -80,7 +81,8 @@ export async function partyMemberNameList(bId:number, name:string) {
         case configEnum.ENTRYTYPE.正式党员:
             changeData = extractData(splitResultConfig.partyMemberDetailsConfig, partyMemberList, "YYYY-MM-DD");
             changeData.color = "#C62A23";
-            if(partyMemberList.partyPositionsName) changeData.partyPositionsName = verificationEnumTools.changeEnumValue(clientEnum.PARTYPOSITIONSICON, JSON.parse(partyMemberList.partyPositionsName));
+            if(partyMemberList.partyPositionsName) changeData.partyPositionsName = verificationEnumTools.changeEnumValue(configEnum.PARTYPOSITIONS, JSON.parse(partyMemberList.partyPositionsName));
+            if(!changeData.partyPositionsName || changeData.partyPositionsName == "undefined") changeData.partyPositionsName = "党员";
         break;
         case configEnum.ENTRYTYPE.入党积极分子:
             changeData = extractData(splitResultConfig.activistDetailsConfig, partyMemberList, "YYYY-MM-DD");

src/biz/user.ts

@@ -26,7 +26,7 @@ export async function login(loginId:string, pwd:string) {
     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.党员基础信息表, updateLogin, {loginId});
 
     return {
-        userid: loginInfo.loginId,
+        userid: loginInfo.pmId,
         token: Token,
         bId: loginInfo.bId,
     };

src/config/enum.ts

@@ -236,4 +236,16 @@ export enum COURSETYPE {
     党课,
     四个意识,
     四个自信,
-}
+}
\ No newline at end of file
+
+
+export enum PBTYPE {
+    党建资讯 = 1,
+    党建动态,
+}
+
+
+
+
+
+

src/config/splitResultConfig.ts

@@ -10,10 +10,24 @@
  * 场景:     首页党建资讯列表
  */
 export const partyInformationConfig = {
-    pId:{key:"pId"},
+    taId:{key:"taId"},
     theme:{key:"资讯标题"},
     branchName:{key:"支部名称"},
-    dataMonth:{key:"资讯时间", changeDate:true}
+    dataMonth:{key:"资讯时间"},
+    pbType:{key:"资讯类型"},
+};
+
+
+/**
+ * 使用端:   小程序_党员入口
+ * 场景:     首页党建资讯列表
+ */
+export const buildingDynamiconfig = {
+    pbId:{key:"taId"},
+    theme:{key:"资讯标题"},
+    branchName:{key:"支部名称"},
+    dataMonth:{key:"资讯时间"},
+    pbType:{key:"资讯类型"},
 };
 
 
@@ -154,12 +168,25 @@ export const organlzationalLifeConfig = {
 
 /**
  * 使用端:   小程序_党员入口
+ * 场景:  党建资讯
+ */
+ export const thematicActivitiesConfig = {
+    taId:{key:"pbId"},
+    theme:{key:"活动名称"},
+    dataMonth:{key:"数据月份", changeDate:true},
+    pbType:{key:"资讯类型"},
+}
+
+
+/**
+ * 使用端:   小程序_党员入口
  * 场景:  党建动态  
  */
 export const partyBuildingDynamicConfig = {
     pbId:{key:"pbId"},
     theme:{key:"活动名称"},
-    dataMonth:{key:"数据月份", changeDate:true}
+    dataMonth:{key:"数据月份", changeDate:true},
+    pbType:{key:"资讯类型"},
 }
 
 

src/config/systemClass.ts

@@ -9,4 +9,5 @@ export class ServerConfig {
     dbPath:string;
     dbSign:string;
     imgUrl:string;
+    fileIP:string;
 }
\ No newline at end of file

src/config/systemConfig.ts

@@ -17,7 +17,7 @@ export async function initConfig() {
 		if (!configInfo || !configInfo.config) throw new BizError('xml中无配置');
 		else {
             
-            let { port, db, imgUrl } = configInfo.config;
+            let { port, db, imgUrl, fileIP } = configInfo.config;
             systemConfig.port = parseInt(port[0]);
             /**数据读写服务 */
             systemConfig.dbPath = db[0].url[0];
@@ -25,6 +25,9 @@ export async function initConfig() {
 
             /**图片地址 */
             systemConfig.imgUrl = imgUrl[0];
+
+            /**文件服务地址 */
+            systemConfig.fileIP = fileIP[0];
 		}
         
         console.log("config init success");

src/middleware/user.ts

@@ -17,7 +17,7 @@ export async function checkAppletToken(req, res, next) {
 
     if(!UserId || !ReqToken) return next(new BizError(ERRORENUM.非法登录));
 
-    let partyMemberInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员基础信息表, {loginId: UserId}, ["pmId", "bId", "loginId", "token"]);
+    let partyMemberInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员基础信息表, {pmId: UserId}, ["pmId", "bId", "loginId", "token"]);
     if (!partyMemberInfo || !partyMemberInfo.pmId) return next(new BizError(ERRORENUM.身份验证失败));
     if (!partyMemberInfo.token || partyMemberInfo.token != ReqToken) return next(new BizError(ERRORENUM.身份验证过期));
 

src/routers/applet/branchSystem.ts

@@ -35,8 +35,11 @@ async function getBranchSystem(req, res) {
 async function getBranchSystemDetsils(req, res) {
     let reqConf = {bsId: 'Number'};
     let {bsId} = eccReqParamater(reqConf, req.body);
+    
+    let token = req.headers.token;
+    let userid = req.headers.userid;
 
-    let result = await branchSystemBiz.branchSystemDetsils(bsId);
+    let result = await branchSystemBiz.branchSystemDetsils(bsId, token, userid);
     res.success(result);
 }
 

src/routers/applet/partyBuildingDynamic.ts

@@ -2,42 +2,44 @@
  * 小程序端 党员入口 党建动态路由
  */
 
- import * as partyBuildingDynamicBiz from '../../biz/partyBuildingDynamic';
- import * as asyncHandler from 'express-async-handler';
- import { eccReqParamater } from '../../util/verificationParam';
- import { checkAppletToken } from '../../middleware/user';
- 
- export function setRouter(httpServer) {
-     httpServer.post('/yfs/applet/buildingdynamic/list', checkAppletToken, asyncHandler(partyBuildingDynamicList));
-     httpServer.post('/yfs/applet/buildingdynamic/details', checkAppletToken, asyncHandler(detailsList));
- }
- 
- 
- /**
-  * 党建动态列表
-  * @param req 
-  * @param res 
-  */
- async function partyBuildingDynamicList(req, res) {
-     let reqConf = {bId:'Number', theme:'String', activityYear:'String', activityMonth:'String'};
-     let {bId, theme, activityYear, activityMonth} = eccReqParamater(reqConf, req.body, ["theme","activityYear","activityMonth"]);
- 
-     let result = await partyBuildingDynamicBiz.partyBuildingDynamicList(bId, theme, activityYear, activityMonth);
-     res.success(result);
- }
- 
- 
- /**
-  * 党建动态详情
-  * @param req 
-  * @param res 
-  */
- async function detailsList(req, res) {
-     let reqConf = {pbId: 'Number' };
-     let {pbId} = eccReqParamater(reqConf, req.body);
+import * as partyBuildingDynamicBiz from '../../biz/partyBuildingDynamic';
+import * as asyncHandler from 'express-async-handler';
+import { eccReqParamater } from '../../util/verificationParam';
+import { checkAppletToken } from '../../middleware/user';
+
+export function setRouter(httpServer) {
+    httpServer.post('/yfs/applet/buildingdynamic/list', checkAppletToken, asyncHandler(partyBuildingDynamicList));
+    httpServer.post('/yfs/applet/buildingdynamic/details', checkAppletToken, asyncHandler(detailsList));
+}
+
+
+/**
+ * 党建动态列表
+ * @param req 
+ * @param res 
+ */
+async function partyBuildingDynamicList(req, res) {
+    let reqConf = {bId:'Number', theme:'String', activityYear:'String', activityMonth:'String'};
+    let {bId, theme, activityYear, activityMonth} = eccReqParamater(reqConf, req.body, ["theme","activityYear","activityMonth"]);
+
+    let result = await partyBuildingDynamicBiz.partyBuildingDynamicList(bId, theme, activityYear, activityMonth);
+    res.success(result);
+}
+
+
+/**
+ * 党建动态详情
+ * @param req 
+ * @param res 
+ */
+async function detailsList(req, res) {
+    let reqConf = {pbId: 'Number', pbType: 'Number'};
+    let {pbId, pbType} = eccReqParamater(reqConf, req.body);
+
+    let result = await partyBuildingDynamicBiz.partyBuildingDynamicDetsils(pbId, pbType);
+    res.success(result);
+}
  
-     let result = await partyBuildingDynamicBiz.partyBuildingDynamicDetsils(pbId);
-     res.success(result);
- }
  
- 
+
\ No newline at end of file
+

src/routers/applet/partyQuality.ts

 /**
- * 小程序端 党员入口 党建先锋
+ * 小程序端 党员入口 党建质量指数 三级指标
  */
 
 import * as partyQualityBiz from '../../biz/partyQuality';
@@ -14,7 +14,7 @@ export function setRouter(httpServer) {
 
 
  /**  
-  * 党建先锋 荣誉列表
+  * 党建指标指数 三级指标列表
   * @param req 
   * @param res 
   */

src/routers/public.ts

@@ -53,7 +53,8 @@ function partyPositions(req, res) {
  * @param res 
  */
 function themeType(req, res) {
-    let dataList = getEnumList(configEnum.THEMETYPE)
+    let dataList = getEnumList(configEnum.THEMETYPE);
+    dataList.unshift({key:"全部活动", value: 0});
     res.success(dataList);
 }
 
@@ -132,6 +133,7 @@ function honorType(req, res) {
  */
 function payType(req, res) {
     let dataList = getEnumList(configEnum.PAYTYPE);
+    dataList.unshift({key:"全部", value: 0});
     res.success(dataList);
 }
 

src/tools/dataInit.ts

 import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
 import { operationalData, selectData } from "../middleware/databaseSuccess";
 import * as enums from "../config/enum";
-import * as clientEnum from "../config/clientEnum";
 import { getPwdMd5, md5PwdStr } from "./system";
 import moment = require("moment");
 
@@ -11,20 +10,17 @@ const md5 = require("md5");
 
 
 const PartyPositionsChangeConfig = {
-    "党员": clientEnum.PARTYPOSITIONSICON.党员,
-    "入党积极分子": clientEnum.PARTYPOSITIONSICON.入党积极分子,
-    "预备党员": clientEnum.PARTYPOSITIONSICON.预备党员,
-    "党总支书记": clientEnum.PARTYPOSITIONSICON.党总支书记,
-    "党总支副书记": clientEnum.PARTYPOSITIONSICON.党总支副书记,
-    "党总支宣传委员":clientEnum.PARTYPOSITIONSICON.党总支宣传委员,
-    "党总支统战委员":clientEnum.PARTYPOSITIONSICON.党总支统战委员,
-    "党总支纪检委员":clientEnum.PARTYPOSITIONSICON.党总支纪检委员,
-    "支部书记":clientEnum.PARTYPOSITIONSICON.支部书记,
-    "支部副书记":clientEnum.PARTYPOSITIONSICON.支部副书记,
-    "纪检委员":clientEnum.PARTYPOSITIONSICON.纪检委员,
-    "统战委员":clientEnum.PARTYPOSITIONSICON.统战委员,
-    "组织委员":clientEnum.PARTYPOSITIONSICON.组织委员,
-    "宣传委员":clientEnum.PARTYPOSITIONSICON.宣传委员,
+    "党总支书记": enums.PARTYPOSITIONS.党总支书记,
+    "党总支副书记": enums.PARTYPOSITIONS.党总支副书记,
+    "党总支宣传委员": enums.PARTYPOSITIONS.党总支宣传委员,
+    "党总支统战委员": enums.PARTYPOSITIONS.党总支统战委员,
+    "党总支纪检委员": enums.PARTYPOSITIONS.党总支纪检委员,
+    "支部书记": enums.PARTYPOSITIONS.支部书记,
+    "支部副书记": enums.PARTYPOSITIONS.支部副书记,
+    "纪检委员": enums.PARTYPOSITIONS.纪检委员,
+    "统战委员": enums.PARTYPOSITIONS.统战委员,
+    "组织委员": enums.PARTYPOSITIONS.组织委员,
+    "宣传委员": enums.PARTYPOSITIONS.宣传委员,
 }
 
 const BranchNameChangeConfig = {
@@ -71,6 +67,8 @@ const DepartmentConfig = {
 export async function initBasicData() {
     await initPartyMember();
     await initLearningPower();
+    await initPartyExpenses();
+    await ininThirdLevel();
     // await initOrganizationalLife();
     // await initPartyVanguard();
     // await initBranchSystem();
@@ -215,8 +213,6 @@ async function initPartyMember() {
 }
 
 
-
-
 /**
  * 学习强国初始化
  */
@@ -259,7 +255,7 @@ async function initLearningPower() {
                 let key = titleMap[i];
                 let value = item;
                 if (i == 0) {
-                    console.log(item);
+                    // console.log(item);
                     let partyMemberDate = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员基础信息表, {name:item}, ["pmId"]); //党员总数
                     if (!partyMemberDate) continue;
                     addDataInfo["pmId"] = partyMemberDate.pmId;
@@ -428,6 +424,102 @@ async function initBranchSystem() {
 }
 
 
+/**
+ * 党费初始化
+ */
+ async function initPartyExpenses() {
+    // let count = await groupFindBranchSystemCount({});
+    let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党费管理表, {}, []);
+    if (count >= 1) {
+        console.log("***** 党费管理数据 无需初始化 *****");
+        return;
+    }       
+
+    let partyMenberDataList = await selectData(OPERATIONALDATATYPE.查询多个 , TABLENAME.党员基础信息表, {etId:1}, null);
+
+    let addList = [];
+    partyMenberDataList.forEach(info => {
+        let {pmId, bId} = info;
+
+        addList.push({
+            pmId,
+            bId,
+            payType: 2,
+            payTime: null,
+            payableMonth: "2023-10-01 00:00:00",
+            payAmount: null,
+        });
+    });
+
+    // await createBranchSystem(addList);
+    let rows = await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.党费管理表, addList, {});
+    console.log(rows);
+    console.log("---> 党费信息 初始化成功");
+}
+
+
+/**
+ * 党建质量 三级指标初始化
+ */
+async function ininThirdLevel() {
+    let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党建质量三级指标, {}, []);
+    if (count >= 1) {
+        console.log("***** 三级指标数据 无需初始化 *****");
+        return;
+    }
+
+    let {sheetMap} = getExcel(path.join(__dirname.substring(0, __dirname.indexOf("out")), "res", "三级指标初始化表.xlsx"));
+    let dataList = sheetMap["三级指标"];             
+
+    let titleMap = {
+        "0": "bId",
+        "1": "primaryIndicators",
+        "2": "secondaryIndicators",
+        "3": "thirdLevelContent",
+        "4": "thirdLevelScore",
+        "5": "currentScore",
+        "6": "completionProgress",
+        "7": "weight",
+        "8": "dataYear",
+        "9": "lock",
+    };
+
+    let addList = [];
+    dataList.forEach( (subList, index) => {
+        if (!index) return; //跳过表头
+            let addDataInfo:any = {
+                bId: null,
+                primaryIndicators: null,
+                secondaryIndicators: null,
+                thirdLevelContent: null,
+                thirdLevelScore: null,
+                currentScore: 0,
+                completionProgress: 0,
+                weight: null,
+                dataYear: null,
+                lock: 0
+        }
+
+        for (let i = 0; i <= 9; i++) {
+            let item =subList[i];
+            let key = titleMap[i];
+            let value = item;
+
+            if (value) addDataInfo[key] = value;
+        }
+        addList.push(addDataInfo);
+    })
+    
+    // await createBranchSystem(addList);
+    let rows = await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.党建质量三级指标, addList, {});
+    console.log(rows);
+    console.log("---> 三级指标信息 初始化成功");
+}
+
+
+
+
+
 // /**
 //  * 党建资讯
 //  */

src/util/verificationEnum.ts

@@ -38,11 +38,11 @@ export function changeEnumValue(enumConf, value:any) {
     if ( typeof value == 'number' || typeof value == 'string' ) {
         let str = enumConf[value];
         /**特化处理 */
-        if(/_dou/.test(str)) str = str.replace(/_dou/, "，");
-        if(/_zyh/.test(str)) str = str.replace(/_zyh/, "“");
-        if(/_yyh/.test(str)) str = str.replace(/_yyh/, "”");
-        if(/_dun/.test(str)) str = str.replace(/_dun/, "、");
-        if(/_ju/.test(str)) str = str.replace(/_ju/, "。");
+        if(/_dou/.test(str)) str = str.replace(/_dou/gm, "，");
+        if(/_zyh/.test(str)) str = str.replace(/_zyh/gm, "“");
+        if(/_yyh/.test(str)) str = str.replace(/_yyh/gm, "”");
+        if(/_dun/.test(str)) str = str.replace(/_dun/gm, "、");
+        if(/_ju/.test(str)) str = str.replace(/_ju/gm, "。");
 
         return str
     }
@@ -62,4 +62,5 @@ export function changeEnumValue(enumConf, value:any) {
     });
 
     return str;
-}
+}
\ No newline at end of file
+