Skip to content

W
wenHuaBu_adminServer
Commit 8a694af1 by lixinming
Options

no message

parent ed155042
Showing with 89 additions and 168 deletions
src/biz/member/apply.ts
......@@ -3,11 +3,11 @@
*/
import moment = require("moment");
import { BANXUELEIXING, CERTIFICATETYPE, CHANGEAPPLYTYPE, CLIENTMSGLABLE, INDIVIDUALMEMBERTYPE, INFOCHANGEAPPLYTYPE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, MSGTYPE, SEX, STATE, UNITMEMBERTYPE } from "../../config/enum";
import { BANXUELEIXING, CERTIFICATETYPE, CHANGEAPPLYTYPE, CLIENTMSGLABLE, INDIVIDUALMEMBERTYPE, INFOCHANGEAPPLYTYPE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, MSGTYPE, SEX, STATE, UNITMEMBERTYPE, ZHIWUSHENGXIAOTYPE } from "../../config/enum";
import { TABLEENUM } from "../../data/models/model";
import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort, findToSortToPage } from "../../data/select";
import { extractData } from "../../util/piecemeal";
import { changeEnumValue } from "../../util/verificationEnum";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
import { generateSystemId, generateUserId, getMenberNum, successResult } from "../../tools/system";
......@@ -96,6 +96,11 @@ export async function applyList({name, memberType, pageNumber, pageSize}) {
item.duties = item.duties || "";
item.phone = item.phone || "";
let changeCount = await findCount(TABLEENUM.理事变更审批历史表, {changeApplyType:{"$in":[CHANGEAPPLYTYPE.待审批, CHANGEAPPLYTYPE.注册信息待补充, CHANGEAPPLYTYPE.注册信息补充完成]} } );
item.haveLog = changeCount > 0;
dataList.push(item);
}
......@@ -108,7 +113,7 @@ export async function applyList({name, memberType, pageNumber, pageSize}) {
* @param id 待审核列表返回的用户id
* @returns
*/
export async function applyAdopt({id}) {
export async function applyAdopt({id, takeeffectType}) {
// let selectConf = [];
let userInfo = await findOnce(TABLEENUM.用户表, {userId:id, isAdmin:STATE.否});
if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
......@@ -122,6 +127,9 @@ export async function applyList({name, memberType, pageNumber, pageSize}) {
throw new BizError(ERRORENUM.重复提交, `${userInfo.userId}当前状态为已通过`);
}
eccEnumValue("职务审批通过", "type", ZHIWUSHENGXIAOTYPE, takeeffectType);
let thisDate = new Date();
const NowMs = thisDate.valueOf();
......@@ -148,7 +156,8 @@ export async function applyList({name, memberType, pageNumber, pageSize}) {
memberLevel:userInfo.applyMemberLevel,
applyReviewTime:NowMs,
changeApplyType:CHANGEAPPLYTYPE.通过,
lableId
lableId,
takeeffectType
};
await updateOneData(TABLEENUM.用户表, {userId:id}, updateInfo);
/**添加审批历史 */
......@@ -356,7 +365,7 @@ export async function outPutApply() {
/**
* 审核历史 success
* 职务变更 审核历史 success
* @param userId
* @returns
*/
......@@ -518,24 +527,51 @@ export async function infomationChangeList({name, changeState, unitMemberType, u
let info = dbList[i];
// let itemFileList = ["unitName","uscc", "legalPerson", "yuanXiaoBanXueLeiXing", "unitMemberType", "uusinessLicenseUrl", "applicationForm", "desc", "rejectRemarks", "infoChangeOptionType", "infoChangeId", "yuanXiaoBanXueLeiXing", "legalPersonMail", "legalPersonPhone"];
let logInfo = checkChangeMap[info.userId];
if (!logInfo) continue;
let isHistory = false;
let historyCount = await findCount(TABLEENUM.资料变更审批历史表, {userId:info.userId});
if (historyCount > 1) isHistory = true;
let yuanXiaoBanXueLeiXing= logInfo.yuanXiaoBanXueLeiXing || info.yuanXiaoBanXueLeiXing;
let yuanXiaoBanXueLeiXing = info.yuanXiaoBanXueLeiXing;
let infoChangeOptionType = "";
let unitMemberType = "";
let unitName = "";
let uscc = "";
let legalPerson = "";
let uusinessLicenseUrl = "";
let applicationForm = "";
let desc = "";
let legalPersonMail = "";
let legalPersonPhone = "";
let rejectRemarks = "";
if (logInfo) {
if (logInfo.yuanXiaoBanXueLeiXing) yuanXiaoBanXueLeiXing = logInfo.yuanXiaoBanXueLeiXing;
if (logInfo.infoChangeOptionType) infoChangeOptionType = changeEnumValue(INFOCHANGEAPPLYTYPE, logInfo.infoChangeOptionType);
if (logInfo.unitMemberType) unitMemberType = changeEnumValue(MEMBERTYPEECCENUM, logInfo.unitMemberType);
if (logInfo.uscc) uscc = logInfo.uscc;
if (logInfo.unitName) unitName = logInfo.unitName;
if (logInfo.legalPerson) legalPerson = logInfo.legalPerson;
if (logInfo.uusinessLicenseUrl) uusinessLicenseUrl = logInfo.uusinessLicenseUrl;
if (logInfo.applicationForm) applicationForm = logInfo.applicationForm;
if (logInfo.desc) desc = logInfo.desc;
if (logInfo.legalPersonMail) legalPersonMail = logInfo.legalPersonMail;
if (logInfo.legalPersonPhone) legalPersonPhone = logInfo.legalPersonPhone;
if (logInfo.rejectRemarks) rejectRemarks = logInfo.rejectRemarks;
}
let item = {
infoChangeOptionType:changeEnumValue(INFOCHANGEAPPLYTYPE, logInfo.infoChangeOptionType),
infoChangeOptionType,
infoChangeId:info.infoChangeId,
unitName:logInfo.unitName,
uscc:logInfo.uscc,
legalPerson:logInfo.legalPerson,
unitMemberType:changeEnumValue(MEMBERTYPEECCENUM, logInfo.unitMemberType),
uusinessLicenseUrl:logInfo.uusinessLicenseUrl,
applicationForm:logInfo.applicationForm,
unitName,
uscc,
legalPerson,
unitMemberType,
uusinessLicenseUrl,
applicationForm,
uusinessLicenseUrlChange:false,
applicationFormChange:false,
yuanXiaoBanXueLeiXing:changeEnumValue(BANXUELEIXING, yuanXiaoBanXueLeiXing),
desc:logInfo.desc,
desc,
unitNameChange:false,
usccChange:false,
unitMemberTypeChange:false,
......@@ -543,155 +579,26 @@ export async function infomationChangeList({name, changeState, unitMemberType, u
yuanXiaoBanXueLeiXingChange:false,
memberType:changeEnumValue(MEMBERTYPE, info.memberType),
userId:info.userId,
legalPersonMail:logInfo.legalPersonMail || '',
legalPersonPhone:logInfo.legalPersonPhone || '',
legalPersonMail,
legalPersonPhone,
legalPersonMailChange:false,
legalPersonPhoneChange:false,
rejectRemarks:logInfo.rejectRemarks || "",
rejectRemarks,
isHistory
};
if (logInfo.unitName != info.unitName) item.unitNameChange = true;
if (logInfo.uscc != info.uscc) item.usccChange = true;
if (logInfo.unitMemberType != info.unitMemberType) item.unitMemberTypeChange = true;
if (logInfo.legalPerson != info.legalPerson) item.legalPersonChange = true;
if (logInfo.yuanXiaoBanXueLeiXing != info.yuanXiaoBanXueLeiXing) item.yuanXiaoBanXueLeiXingChange = true;
if (logInfo.legalPersonMail != info.legalPersonMail) item.legalPersonMailChange = true;
if (logInfo.legalPersonPhone != info.legalPersonPhone) item.legalPersonPhoneChange = true;
if (logInfo.uusinessLicenseUrl != info.uusinessLicenseUrl) item.uusinessLicenseUrlChange = true;
if (logInfo.applicationForm != info.applicationForm) item.applicationFormChange = true;
if (logInfo.unitName && logInfo.unitName != info.unitName) item.unitNameChange = true;
if (logInfo.uscc && logInfo.uscc != info.uscc) item.usccChange = true;
if (logInfo.unitMemberType && logInfo.unitMemberType != info.unitMemberType) item.unitMemberTypeChange = true;
if (logInfo.legalPerson && logInfo.legalPerson != info.legalPerson) item.legalPersonChange = true;
if (logInfo.yuanXiaoBanXueLeiXing && logInfo.yuanXiaoBanXueLeiXing != info.yuanXiaoBanXueLeiXing) item.yuanXiaoBanXueLeiXingChange = true;
if (logInfo.legalPersonMail && logInfo.legalPersonMail != info.legalPersonMail) item.legalPersonMailChange = true;
if (logInfo.legalPersonPhone && logInfo.legalPersonPhone != info.legalPersonPhone) item.legalPersonPhoneChange = true;
if (logInfo.uusinessLicenseUrl && logInfo.uusinessLicenseUrl != info.uusinessLicenseUrl) item.uusinessLicenseUrlChange = true;
if (logInfo.applicationForm && logInfo.applicationForm != info.applicationForm) item.applicationFormChange = true;
if (item.infoChangeOptionType == "驳回修改") item.infoChangeOptionType = "已驳回"; // 2025.02.25【驳回修改】文字修改为【已驳回】
dataList.push(item);
}
// if (name || changeState || unitMemberType.length || uscc || legalPerson || legalPersonPhone || legalPersonMail) {
// selectUserParam["$or"] = [];
// }
// if (name) {
// selectParam["$or"].push({unitName:{"$regex":name}});
// }
// if (changeState) {
// selectParam["$or"].push({infoChangeOptionType:changeState});
// // selectParam.infoChangeOptionType = changeState;
// }
// if (unitMemberType.length) {
// selectParam["$or"].push({unitMemberType:{"$in":unitMemberType}});
// // selectParam.unitMemberType = {"$in":unitMemberType};
// }
// if (uscc) {
// selectParam["$or"].push({uscc});
// // selectParam.uscc = uscc;
// }
// if (legalPerson) {
// selectParam["$or"].push({legalPerson:{"$regex":legalPerson}});
// // selectParam.legalPerson = {"$regex":legalPerson};
// }
// if (legalPersonPhone) {
// selectParam["$or"].push({legalPersonPhone})
// // selectParam.legalPersonPhone = legalPersonPhone;
// }
// if (legalPersonMail) {
// selectParam["$or"].push({legalPersonMail})
// // selectParam.legalPersonMail = legalPersonMail;
// }
// let selectHistoryParam:any = {};
// let isSelectHistory = false;
// if (name) {
// selectHistoryParam.unitName = {"$regex":name};
// isSelectHistory = true;
// }
// // if (changeState) {
// // selectHistoryParam.infoChangeOptionType = changeState;
// // isSelectHistory = true;
// // }
// if (unitMemberType.length) {
// selectHistoryParam.unitMemberType = {"$in":unitMemberType};
// isSelectHistory = true;
// }
// if (uscc) {
// selectHistoryParam.uscc = uscc;
// isSelectHistory = true;
// }
// if (legalPerson) {
// selectHistoryParam.legalPerson = {"$regex":legalPerson};
// isSelectHistory = true;
// }
// if (legalPersonPhone) {
// selectHistoryParam.legalPersonPhone = legalPersonPhone;
// isSelectHistory = true;
// }
// if (legalPersonMail) {
// selectHistoryParam.legalPersonMail = legalPersonMail;
// isSelectHistory = true;
// }
let checkHistoryDataList = [];
// if (isSelectHistory) {
// checkHistoryDataList.push("0");
// let dbHistoryList = await findToSort(TABLEENUM.资料变更审批历史表, selectHistoryParam, {createTimeMs:-1}, []);
// dbHistoryList.forEach(key => {
// checkHistoryDataList.push(key.userId);
// });
// }
// if (checkHistoryDataList.length) {
// // 去除数组userId重复项
// let uniqueList = checkHistoryDataList.filter((item, index) =>
// checkHistoryDataList.indexOf(item) === index
// );
// selectParam["$or"].push({userId:{"$in":uniqueList}})
// // selectParam.userId = {"$in":uniqueList}
// }
// let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, ["userId", "memberType", "userId", "unitName", "infoChangeId", "uscc", "legalPerson", "unitMemberType", "yuanXiaoBanXueLeiXing"], {infoChangeMs:-1}, pageNumber, pageSize);
// let dataCount = await findCount(TABLEENUM.用户表, selectParam);
// let dataList = [];
// for (let i = 0; i < dbList.length; i++) {
// let info = dbList[i];
// let itemFileList = ["unitName","uscc", "legalPerson", "yuanXiaoBanXueLeiXing", "unitMemberType", "uusinessLicenseUrl", "applicationForm", "desc", "rejectRemarks", "infoChangeOptionType", "infoChangeId", "yuanXiaoBanXueLeiXing", "legalPersonMail", "legalPersonPhone"];
// let logInfo = await findOnceToSort(TABLEENUM.资料变更审批历史表, {infoChangeId:info.infoChangeId}, {createTimeMs:-1}, itemFileList);
// let yuanXiaoBanXueLeiXing= logInfo.yuanXiaoBanXueLeiXing || info.yuanXiaoBanXueLeiXing;
// let item = {
// infoChangeOptionType:changeEnumValue(INFOCHANGEAPPLYTYPE, logInfo.infoChangeOptionType),
// infoChangeId:info.infoChangeId,
// unitName:logInfo.unitName,
// uscc:logInfo.uscc,
// legalPerson:logInfo.legalPerson,
// unitMemberType:changeEnumValue(MEMBERTYPEECCENUM, logInfo.unitMemberType),
// uusinessLicenseUrl:logInfo.uusinessLicenseUrl,
// applicationForm:logInfo.applicationForm,
// yuanXiaoBanXueLeiXing:changeEnumValue(BANXUELEIXING, yuanXiaoBanXueLeiXing),
// desc:logInfo.desc,
// unitNameChange:false,
// usccChange:false,
// unitMemberTypeChange:false,
// legalPersonChange:false,
// yuanXiaoBanXueLeiXingChange:false,
// memberType:changeEnumValue(MEMBERTYPE, info.memberType),
// userId:info.userId,
// legalPersonMail:logInfo.legalPersonMail || '',
// legalPersonPhone:logInfo.legalPersonPhone || '',
// legalPersonMailChange:false,
// legalPersonPhoneChange:false,
// rejectRemarks:logInfo.rejectRemarks || ""
// };
// if (logInfo.unitName != info.unitName) item.unitNameChange = true;
// if (logInfo.uscc != info.uscc) item.usccChange = true;
// if (logInfo.unitMemberType != info.unitMemberType) item.unitMemberTypeChange = true;
// if (logInfo.legalPerson != info.legalPerson) item.legalPersonChange = true;
// if (logInfo.yuanXiaoBanXueLeiXing != info.yuanXiaoBanXueLeiXing) item.yuanXiaoBanXueLeiXingChange = true;
// if (logInfo.legalPersonMail != info.legalPersonMail) item.legalPersonMailChange = true;
// if (logInfo.legalPersonPhone != info.legalPersonPhone) item.legalPersonPhoneChange = true;
// if (item.infoChangeOptionType == "驳回修改") item.infoChangeOptionType = "已驳回"; // 2025.02.25【驳回修改】文字修改为【已驳回】
// dataList.push(item);
// }
return {dataList, dataCount};
}
......@@ -929,14 +836,19 @@ export async function infomationChangeKeyStr({infoChangeId, keyStr}) {
userInfo.yuanXiaoBanXueLeiXing = changeEnumValue(BANXUELEIXING, userInfo.yuanXiaoBanXueLeiXing);
let selectParam:any = {userId:userInfo.userId, infoChangeOptionType:INFOCHANGEAPPLYTYPE.待审批};
let fileList = [];
let dbList = await findToSort(TABLEENUM.资料变更审批历史表, selectParam, {createTimeMs:-1}, fileList);
let dbList = await findToSort(TABLEENUM.资料变更审批历史表, {userId:userInfo.userId}, {createTimeMs:-1}, fileList);
let disMap = {};
let dataList = [];
for (let i = 0; i < dbList.length; i++) {
let info = dbList[i];
if (!disMap[info.infoChangeId]) disMap[info.infoChangeId] = 1;
else continue;
let infoChangeOptionType = changeEnumValue(INFOCHANGEAPPLYTYPE, info.infoChangeOptionType);
let desc = "";
if (INFOCHANGEAPPLYTYPE.待审批 == info.infoChangeOptionType) {
......@@ -969,7 +881,7 @@ export async function infomationChangeKeyStr({infoChangeId, keyStr}) {
let updateBeforeInfoStr = "";
/**修改后 */
let updateInfoStr = "";
if (info[keyStr] != userInfo[keyStr]) {
if ( info[keyStr] && (info[keyStr] != userInfo[keyStr])) {
/**修改前 */
if (!userInfo[keyStr]) updateBeforeInfoStr = "";
else updateBeforeInfoStr = `${userInfo[keyStr]}`;
......@@ -1012,11 +924,10 @@ export async function infomationChangeManyPass({infoChangeIdList}) {
throw new BizError(ERRORENUM.不可重复提交);
}
//添加日志
let applyInfo:any = {
infoChangeId,
applyId:generateSystemId(TABLEENUM.理事变更审批历史表, onceData.userId),
applyId:generateSystemId(TABLEENUM.资料变更审批历史表, onceData.userId),
userId:onceData.userId,
unitName:onceData.unitName,
infoChangeOptionType:INFOCHANGEAPPLYTYPE.通过,
......@@ -1028,7 +939,7 @@ export async function infomationChangeManyPass({infoChangeIdList}) {
desc:onceData.desc,
createTimeMs:new Date().valueOf()
};
await addOneData(TABLEENUM.理事变更审批历史表, applyInfo);
await addOneData(TABLEENUM.资料变更审批历史表, applyInfo);
let updateInfo = {
infoChangeOptionType:INFOCHANGEAPPLYTYPE.通过,
......
src/config/enum.ts
......@@ -916,4 +916,10 @@ export enum ISRECEIVEMONEY {
/**
* 职务生效类型
*/
export enum ZHIWUSHENGXIAOTYPE {
上半年 = 1,
下半年 = 2
}
\ No newline at end of file
src/data/models/model.ts
......@@ -458,6 +458,9 @@ const ModelArray = [
applyReviewTime:'Number',//变更理事审核时间
rejectRemarks:'String',//变更理事驳回理由
applyId:{ type:'String', index:true },
takeeffectType:'Number',//生效类型 上半年/下半年 ZHIWUSHENGXIAOTYPE
infoChangeId:{type:"String", index:true},//资料更新关联id
infoChangeMs:{type:"Number"},//资料更新申请时间
infoChangeOptionType:{type:"Number"},//INFOCHANGEAPPLYTYPE
......@@ -662,6 +665,7 @@ const ModelArray = [
applyPhone:'String',//变更理事负责人电话
/**-------------------end */
applyStr:'String',//变更理事申请理由
takeeffectType:'Number',//生效类型 上半年/下半年 ZHIWUSHENGXIAOTYPE
}
},
{
......
src/main.ts
......@@ -35,8 +35,6 @@ async function lanuch() {
// await getData();
// await outPutMember();
// await test();
console.log(getEdition(2018, 1));
}
lanuch();
......
src/routers/apply/router.ts
......@@ -31,6 +31,7 @@ export const Config = {
subUrl:'/applydb/applyadopt',
param:[
{key:"id", type:"String", desc:"用户id"},
{key:"takeeffectType", type:"Number", desc:"生效类型"},
],
bindBiz:applyBiz.applyAdopt
},
......
src/routers/member/router.ts
......@@ -239,8 +239,8 @@ export const Config = {
legalPersonPhone:{type:'String', desc:'法人联系电话', notMustHave:true},
legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:true},
// unitMail:{type:'String', desc:'单位电子邮箱', notMustHave:false}, 2024.4.22日的需求 去掉
// contactPerson:{type:'String', desc:'日常联系人', notMustHave:true},
// contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:true},
contactPerson:{type:'String', desc:'日常联系人', notMustHave:true},
contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:true},
phone:{type:'String', desc:'日常联系人手机', notMustHave:true},
mail:{type:'String', desc:'日常联系人邮箱', notMustHave:true},
uusinessLicenseUrl:{type:'String', desc:'营业执照复印件', notMustHave:true},
......@@ -1318,8 +1318,8 @@ export const Config = {
legalPersonPhone:{type:'String', desc:'法人联系电话', notMustHave:false},
legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:false},
// unitMail:{type:'String', desc:'单位电子邮箱', notMustHave:false}, 2024.4.22日的需求 去掉
// contactPerson:{type:'String', desc:'日常联系人', notMustHave:false},
// contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:false},
contactPerson:{type:'String', desc:'日常联系人', notMustHave:false},
contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:false},
phone:{type:'String', desc:'日常联系人手机', notMustHave:false},
mail:{type:'String', desc:'日常联系人邮箱', notMustHave:false},
uusinessLicenseUrl:{type:'String', desc:'营业执照复印件', notMustHave:false},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment