no message

src/biz/applet/partyMember/organizationalLife.ts

@@ -24,53 +24,35 @@ moment.suppressDeprecationWarnings = true;
  * @return data
  * 返回说明 根据传入的活动状态返回不同的列表
  */
-export async function getOrganizationalLifeList(type:number, name:number) {
-    let allmoveAbout = []; //全部活动列表
-    let moveAboutList = [];
-
-    let data = [];
+export async function getOrganizationalLifeList(type:number, partyActivityType:number) {
+    /**将枚举值转为枚举文本 */
+    let partyActivityTypeStr = verificationEnumTools.changeEnumValue(configEnum.TYPE, type);
 
     const NowMs = new Date().valueOf();
+    /**拼接查询参数 */
     let selectParam = {};
     if (type != configEnum.TYPE.全部) {
         if (type == configEnum.TYPE.即将开展) selectParam = {"activityStartTime":{"$gt":NowMs }};
-        else if (type == configEnum.TYPE.已经开展) selectParam = {"activityEndTime":{"$lt":NowMs }}; 
+        else if (type == configEnum.TYPE.已经开展) selectParam = {"activityEndTime":{"$lt":NowMs }};
+        else selectParam = {"$and":[ {"activityStartTime":{"$lt":NowMs }}, {"activityEndTime":{"$gt":NowMs}} ]}
+    } else partyActivityTypeStr = "";
+    if (partyActivityType) {
+        selectParam["partyActivityType"] = partyActivityType;
     }
 
-    switch (type) {
-        case configEnum.TYPE.正在进行:
-            moveAboutList = await organizationalLifeData.findAfootActivityList(name);
-        break;
-        case configEnum.TYPE.即将开展:
-            moveAboutList = await organizationalLifeData.findBeginInActivityList(name);
-        break;
-        case configEnum.TYPE.已经开展:
-            moveAboutList = await organizationalLifeData.findStartedActivityList(name);
-        break;
-        default:
-            allmoveAbout = await organizationalLifeData.findOrganizationalLifeList({partyActivityType:name});
-            allmoveAbout.forEach(info => {
-                let activityStatus = getActivityStatus(info.activityStartTime, info.activityEndTime);
-                data.push({
-                    id: info.id,
-                    partyActivityType: verificationEnumTools.changeEnumValue(configEnum.ACTIVITYTYPE, info.partyActivityType),
-                    activityStartTime: moment(info.activityStartTime).format("YYYY.MM.DD HH:mm"),
-                    activityEndTime: moment(info.activityEndTime).format("YYYY.MM.DD HH:mm"),
-                    activityAdd: info.activityAdd,
-                    activityStatus
-                });
-            })
-        break;
-    }
+    let dbList = await organizationalLifeData.findOrganizationalLifeList(selectParam);
 
-    moveAboutList.forEach( info => {
-        let changeData:any = extractData(splitResultConfig.moveAboutInfoConfig, info, false);
+    /**格式化结果 */
+    let data = [];
+    dbList.forEach(info => {
+        let changeData:any = extractData(splitResultConfig.moveAboutInfoConfig, info, true);
         changeData.partyActivityType = verificationEnumTools.changeEnumValue(configEnum.ACTIVITYTYPE, info.partyActivityType);
-        changeData.activityStartTime = moment(info.activityStartTime).format("YYYY.MM.DD HH:mm"); 
-        changeData.activityEndTime = moment(info.activityEndTime).format("YYYY.MM.DD HH:mm");
-        changeData.activityStatus = getActivityStatus(info.activityStartTime, info.activityEndTime);
+
+        if (!partyActivityTypeStr) changeData.activityStatus = getActivityStatus(info.activityStartTime, info.activityEndTime);
+        else changeData.activityStatus = partyActivityTypeStr;
+
         data.push(changeData);
-    })
+    });
     
     return data;
 }
@@ -99,36 +81,15 @@ export async function createOrganizationalLife(param) {
  */
 export async function getOrganizationalLifeById(oId:number) {
     let activityInfo = await organizationalLifeData.findEventDetails(oId);
-    let changeData:any = {};
-    let leavePartyMember = [];
-    let participatingPartyMember = [];
 
     /**截取返回字段 */
-    changeData = extractData(splitResultConfig.activityInfoConfig, activityInfo, false);
+    let changeData:any = extractData(splitResultConfig.activityInfoConfig, activityInfo, false);
     changeData.partyActivityType = verificationEnumTools.changeEnumValue(configEnum.ACTIVITYTYPE, activityInfo.partyActivityType);
     changeData.activityStartTime = moment(activityInfo.activityStartTime).format("YYYY.MM.DD HH:mm"); 
     changeData.activityEndTime = moment(activityInfo.activityEndTime).format("YYYY.MM.DD HH:mm"); 
-
-    //请假党员
-    for (let i = 0; i < activityInfo.leavePartyMember.length; i++) {
-        let nameData = await partyMemberData.getNameById(activityInfo.leavePartyMember[i]);
-        nameData.forEach( nameInfo => {
-            leavePartyMember.push(nameInfo.name);
-        })
-    };
-
-    //参与党员
-    for (let i = 0; i < activityInfo.participatingPartyMember.length; i++) {
-        let name = await partyMemberData.getNameById(activityInfo.participatingPartyMember[i]);
-        name.forEach( nameInfo => {
-            participatingPartyMember.push(nameInfo.name);
-        })
-    };
+    //todo  参与人员和请假人员要 存名称
     changeData.activityStatus = getActivityStatus(activityInfo.activityStartTime, activityInfo.activityEndTime);
 
-    changeData.leavePartyMember = leavePartyMember;
-    changeData.participatingPartyMember = participatingPartyMember;
-
     
     return changeData;
 }
@@ -164,7 +125,8 @@ export async function updateOrganizationalLife(oId:number, param) {
 
 /**
  * 创建/修改组织生活选择党员
- * @param type 1：党员干部、2：入党积极分子、3：预备党员、4：全部党员 用于选项卡切换类型 
+ * todo 在使用枚举的情况下 参数中不能出现枚举以外的值
+ * @param type 
  * @param name 党员姓名  用于输入党员姓名查询
  * @returns 根据传入的type返回不同党员信息
  */
@@ -172,7 +134,7 @@ export async function getPartyMemberNameList(type:number, name:string) {
     let selectParam:any = {};
     let partyMemberList;
 
-    if (type != 4) {
+    if (type != 4) {//todo  不规范
         selectParam.entryType = type;
         if(name != null) {
             selectParam.name = name;

src/config/clientEnum.ts

+let config = {}//配置
+
+/**
+ * 党内职务 Party positions
+ */
+export enum PARTYPOSITIONS {
+    全部 = 1,
+    支部书记,
+    支部副书记,
+    纪检委员,
+    组织委员,
+    宣传委员,
+    党员,
+    入党积极分子,
+    预备党员,
+}
\ No newline at end of file

src/config/enum.ts

+export  let clientEnumConfig = {
+}
+
 
 /**
  * 党内职务 Party positions

src/util/piecemeal.ts

@@ -32,7 +32,7 @@ export function extractData(conf, data, isAdmin) {
     for (let key in conf) {
         let confInfo = conf[key];
         if (confInfo.changeDate) {
-            if (isAdmin) result[key] = data[key] ? moment(data[key]).format("YYYY-MM-DD") : '-';
+            if (isAdmin) result[key] = data[key] ? moment(data[key]).format("YYYY-MM-DD HH:mm") : '-';
             else result[key] = data[key] || 0;
         }else {
             result[key] = data[key];

src/util/verificationParam.ts

@@ -145,6 +145,7 @@ import { BizError } from "./bizError";
  * @param skipKeys []不必填的字段
  */
 export function eccReqParamater(conf:object, param, skipKeys?) {
+
     skipKeys = skipKeys || [];
     for (let key in conf) {
         let type = conf[key];
@@ -153,7 +154,7 @@ export function eccReqParamater(conf:object, param, skipKeys?) {
         let isError = false; //校验是否异常
         let errorStr = "";//异常说明
 
-        if ( (typeof value != 'boolean') && !value ) {
+        if ( (type != 'Boolean') && !value ) {
             if (skipKeys.indexOf(key) < 0 ) {
                 isError = true;
                 errorStr = `缺少 ${key} 字段`;