bug

src/biz/applet/base.ts

@@ -17,66 +17,33 @@ import { ERRORENUM } from '../../config/errorEnum';
  * 主页基础数据
  */
 export async function homeData() {
-    /**主页基础数据 */
-    let baseInfo:any = {};
-
     /**党员总数 */
     let partyMemberNum = await partyMemberData.groupFindPartyMemberCount({});
     /**党建指令指数 */
     let massIndex = 87.6;
 
-    /**党内职务人员 */
-    let branchSecretary = getPartyPositions(configEnum.PARTYPOSITIONS.支部书记);
-    let deputySecretary = getPartyPositions(configEnum.PARTYPOSITIONS.支部副书记);
-    let memberOrganization = getPartyPositions(configEnum.PARTYPOSITIONS.组织委员);
-    let memberAdvocacy = getPartyPositions(configEnum.PARTYPOSITIONS.宣传委员);
-    let disciplineInspection = getPartyPositions(configEnum.PARTYPOSITIONS.纪检委员);
-
-    baseInfo = {
-        partyMemberNum,
-        massIndex,
-        partyPositions: [
-            {
-                key: "支部书记",
-                list: branchSecretary
-            },
-            {
-                key: "支部副书记",
-                list: deputySecretary
-            },
-            {
-                key: "组织委员",
-                list: memberOrganization
-            },
-            {
-                key: "宣传委员",
-                list: memberAdvocacy
-            },
-            {
-                key: "纪检委员",
-                list: disciplineInspection
-            }
-        ]
+    /**党内职务人员 */ 
+    let partyPositions = [];
+    for (let key in configEnum.PARTYPOSITIONS) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) { //枚举key  key = string
+            const EnumValue = parseInt(configEnum.PARTYPOSITIONS[key])
+            let dataBaseList = await partyMemberData.getBaseListByPartyPositions( EnumValue );
+    
+            let nameList = [];
+            dataBaseList.forEach( info => {
+                nameList.push(info.name);
+            });
+
+            partyPositions.push({
+                key,
+                list:nameList
+            });
+
+        }
     }
 
-    return baseInfo;
-}
-
-
-/**
- * 根据党建职务查询当职人员
- * @param type 党建职务
- * @returns ["李一", "王二"] 当职人员姓名
- */
-async function getPartyPositions(type) {
-    let result:any = [];
-    let dataInfo = await partyMemberData.getBaseListByPartyPositions(type);
-    if (!dataInfo) throw new BizError(ERRORENUM.未找到数据, `查询党建职务时 ${type} 不存在`);
-    dataInfo.forEach( info => {
-        result.push(info.name);
-    })
-
-    return result;
+    return { partyMemberNum, massIndex, partyPositions };
 }
 
 
@@ -85,7 +52,7 @@ async function getPartyPositions(type) {
  * @param informationType 党建资讯类型
  * @returns 
  */
-export async function informationData(informationType) {
+export async function informationData(informationType:number) {
     let selectParam:any = {};
     if (informationType) {
         eccEnumValue("党建资讯列表查询", "资讯类型", configEnum.INFORMATIONTYPE, informationType);
@@ -94,10 +61,10 @@ export async function informationData(informationType) {
 
     /**医院文化 */
     let partyInformationInfo = await partyInformationData.findPartyInformationList(selectParam);
-    if (!partyInformationInfo) throw new BizError(ERRORENUM.未找到数据, `查询党建资讯时 ${selectParam.informationType} 不存在`);
+
     let dataList = [];
     partyInformationInfo.forEach( info => {
-        let changeData:any = extractData(splitResultConfig.partyInformationConfig, info, true);
+        let changeData:any = extractData(splitResultConfig.partyInformationConfig, info, false);
         changeData.informationType = changeEnumValue(configEnum.INFORMATIONTYPE, changeData.informationType);
 
         dataList.push(changeData);

src/biz/applet/organizationalLife/organizationalLife.ts

@@ -17,13 +17,25 @@ import * as splitResultConfig from "../../../config/splitResultConfig";
 
 /**
  * 组织生活列表
+ * todo  接口协议不对
  * @param status 活动状态 全部、正在进行、即将开展、已经开展
  * @return {allActivity, afootActivity, beginInActivity, startedActivity}
  * 返回说明 {全部活动列表, 正在进行活动列表, 即将开展活动列表, 已经开展活动列表}
  */
-export async function getOrganizationalLifeList() {
-    let organizationalLifeInfo = await organizationalLifeData.findOrganizationalLifeList({});
+export async function getOrganizationalLifeList(type) {
 
+    let selectParam = {};
+    let now = new Date().valueOf();
+    switch (type) {
+        case enum.正在进行:
+            selectParam.startTime:{"$gt"}
+    }
+
+    1000
+
+    let organizationalLifeInfo = await organizationalLifeData.findOrganizationalLifeList(selectParam);
+
+    
     /**全部活动列表 */
     let allActivity = [];
     /**正在进行活动列表 */

src/config/enum.ts

@@ -10,6 +10,7 @@ export enum PARTYPOSITIONS {
     宣传委员
 }
 
+
 /**
  * 名册录入类型
  */

src/config/errorEnum.ts

 
 export enum ERRORENUM {
     未找到数据,
-    参数错误,
-    不能重复提交任务,
-    表单校验失败,
-    该企业已存在,
-    数据无更新,
-    该孵化器月度填报已存在,
-    该企业当月数据已存在,
-    该报表需要填写本月内容后提交,
-    密码错误,
-    密码不允许有特殊字符,
-    不能重复修改密码,
-    身份验证失败,
-    非法登录,
-    身份验证过期,
-    密码长度不能超过24个字符,
-    账号不存在,
-    已入库的数据不能删除,
-    任务不存在,
-    该企业不存在,
-    该孵化器账号信息已存在,
-    密码不一致,
-    密码只能由6至18位字符和数字组成,
-    统一社会信用代码不合法,
-    统一社会信用代码重复,
-    系统错误,
-    该任务已提交,
-    无法操作其他孵化器的企业,
-    请填入其他原因,
-    账号非绑定关系,
-    code无效,
-    频繁操作请稍后再试,
-    高风险等级用户,
-    系统繁忙,
-    绑定失败,
-    发送验证码次数超限制,
-    发送验证码频率过快,
-    没有联系人,
-    号码与主体不一致,
-    验证码错误,
-    验证码失效,
-    验证码过期,
-    不能修改过期任务数据,
-    短信发送失败
 }
 
 export enum ERRORCODEENUM {
     身份验证失败 = 401,
     非法登录 = 402,
     身份验证过期 = 403,
-    code无效 = 40029,
-    频繁操作请稍后再试 = 45011,
-    高风险等级用户 = 40226,
-    系统繁忙 = 40227
 }
 
 let bizErrorMsgMap = {};

src/config/scoreConfig.ts

-export const FuHuaQiMyDataScoreConfig = {
-    incubatedAcreage:"Number",//在孵面积(㎡)
-    acreageTotal:"Number",//孵化器总面积(㎡)
-    acreagePersonalUse:"Number",//孵化器自用面积(㎡)
-    hatchingGround:"[Object]",//经备案场地
-};
-
-export const FuHuaQiBaseDataScoreConfig = {
-    name:{type:"String"},// {key:"名称"},
-    logonTime:{type:"Number"},// {key:"注册时间", changeDate:true},
-    lv:{type:"Number"},// {key:"孵化器级别"},
-    identificationTime:{type:"Number"},// {key:"认定时间", changeDate:true},
-    industry:{type:"[Number]"},// {key:"孵化领域"},
-    institutionalNature:{type:"Number"},// {key:"机构性质"},
-    operationModel:{type:"[Number]"},// {key:"运营模式"},//新加
-    foundingTeam:{type:"[Object]"},// {key:"创始团队"},//新加
-    liaison:{type:"String"},// {key:"联系人"},
-    liaisonPhone:{type:"String"},// {key:"联系电话"},
-    personInCharge:{type:"String"},// {key:"负责人"},
-    personInChargePhone:{type:"String"},// {key:"负责人联系电话"},
-}
-
-
-export const EnterpriseScoreConfig = {
-    name: "String",//企业名称
-    industry:"[Number]",//领域
-    mainBusiness:"String",//主营业务
-    logonTime:"Number",//注册时间
-    firstIncubationTime:"Number",//首次入孵时间
-    isNaturalPersonHolding:"Boolean",//是否自然人控股企业
-    logonAdd:"String",//注册地址
-    operatingAdd:"String",//经营地址
-}
\ No newline at end of file

src/config/serverConfig.ts → src/config/systemConfig.ts

@@ -2,9 +2,10 @@ const path = require('path');
 import * as fs from "fs";
 import { BizError } from "../util/bizError";
 import { analysisXml } from "../util/myXML";
-import { ServerConfig } from "../config/systemClass";
+import { ServerConfig } from "./systemClass";
 const os = require('os');
 
+/**被系统使用的配置 */
 export let systemConfig =  new ServerConfig;
 
 const ConfigName = "serverConfig.xml";

src/data/organizationalLife.ts

@@ -7,13 +7,13 @@ import { Schema } from "mongoose";
 import {yfsDB} from '../db/mongo/dbInit';
 
 const organizationalLifeSchema = new Schema({
-   _id: {type: String, index:true},
+    //todo 缺个id
    /**党建活动类型 1：日常教育培训、2：主题党日活动、3：骨干队伍培训、4：支部工作会、5：二十大精神、6：三会一课 */
    partyActivityType: Number,
    /**活动开始时间 */
-   activityStartTime: Number,
+   activityStartTime: {type:Number, index:true},
    /**活动结束时间 */
-   activityEndTime: Number,
+   activityEndTime:{type:Number, index:true},
    /**活动地点 */
    activityAdd: String,
    /**活动主持人 */

src/data/partyMember.ts

@@ -93,11 +93,12 @@ export async function groupFindPartyMemberCount(selectParam) {
 
 /**
  * 根据党内职务查询在职人员信息
- * @param partyPositions 党内职务
+ * @param partyPositions  党内职务
  * @returns 
  */
-export async function getBaseListByPartyPositions(partyPositions) {
-    return await partyMemberModel.find({partyPositions});
+export async function getBaseListByPartyPositions(partyPositions:number) {
+    //todo  sql有问题，重写一下
+    return await partyMemberModel.find({partyPositions:{"in": partyPositions }});
 }
 
 

src/db/mongo/dbInit.ts → src/db/dbInit.ts

 
 
-import { systemConfig } from "../../config/serverConfig";
-import { BizError } from "../../util/bizError";
+import { systemConfig } from "../config/systemConfig";
+import { BizError } from "../util/bizError";
 import { createDbConnect } from "./dbConnect";
 import { initTable } from "./tableInit";
 var yfsDB;

src/main.ts

-import { initConfig, systemConfig} from "./config/serverConfig";
-import { initDB } from "./db/mongo/dbInit";
+import { initConfig, systemConfig} from "./config/systemConfig";
+import { initDB } from "./db/dbInit";
 import { httpServer } from "./net/http_server";
 
 async function lanuch() {

src/util/piecemeal.ts

@@ -24,6 +24,7 @@ export function checkChange(newObj, oldObj) {
  * 根据conf截取data中的数据
  * @param conf 
  * @param data 
+ * @param isAdmin 是否是管理后台
  * @returns 
  */
 export function extractData(conf, data, isAdmin) {