Commit c693375e by chenjinjing

no message

parent 445713a8
...@@ -9,7 +9,7 @@ import { ERRORENUM } from "../../config/errorEnum"; ...@@ -9,7 +9,7 @@ import { ERRORENUM } from "../../config/errorEnum";
import { addManyData, addOneData } from "../../data/add"; import { addManyData, addOneData } from "../../data/add";
import { deleteManyData } from "../../data/delete"; import { deleteManyData } from "../../data/delete";
import { TABLEENUM } from "../../data/models/model"; import { TABLEENUM } from "../../data/models/model";
import { find, findOnce, findOnceToSort } from "../../data/select"; import { find, findOnce, findOnceToSort, findToSort } from "../../data/select";
import { updateOneData } from "../../data/update"; import { updateOneData } from "../../data/update";
import { generateSystemId, getEdition, successErrorResult, successResult } from "../../tools/system"; import { generateSystemId, getEdition, successErrorResult, successResult } from "../../tools/system";
import { BizError } from "../../util/bizError"; import { BizError } from "../../util/bizError";
...@@ -612,6 +612,12 @@ export async function applyReason({applyStr, userId}) { ...@@ -612,6 +612,12 @@ export async function applyReason({applyStr, userId}) {
export async function infomationChangeUpdate({userId, unitName, uscc, legalPerson, unitMemberType, uusinessLicenseUrl, applicationForm, desc, yuanXiaoBanXueLeiXing, legalPersonMail, legalPersonPhone}) { export async function infomationChangeUpdate({userId, unitName, uscc, legalPerson, unitMemberType, uusinessLicenseUrl, applicationForm, desc, yuanXiaoBanXueLeiXing, legalPersonMail, legalPersonPhone}) {
let userInfo = await findOnce(TABLEENUM.用户表, {userId}, ["memberType"]); let userInfo = await findOnce(TABLEENUM.用户表, {userId}, ["memberType"]);
if (userInfo.memberType != MEMBERTYPE.单位会员) throw new BizError(ERRORENUM.非单位会员不可操作); if (userInfo.memberType != MEMBERTYPE.单位会员) throw new BizError(ERRORENUM.非单位会员不可操作);
let applyToSort = await findOnceToSort(TABLEENUM.资料变更审批历史表, {userId}, {createTimeMs:-1});
let infoChangeOptionType = INFOCHANGEAPPLYTYPE.待审批;
//新增了状态:驳回提交,当上次审批状态为驳回修改时,当前提交状态为驳回提交
if (applyToSort.infoChangeOptionType == INFOCHANGEAPPLYTYPE.驳回修改) infoChangeOptionType = INFOCHANGEAPPLYTYPE.驳回提交;
//添加日志 //添加日志
/**添加审批历史 */ /**添加审批历史 */
let applyInfo:any = { let applyInfo:any = {
...@@ -628,9 +634,10 @@ export async function infomationChangeUpdate({userId, unitName, uscc, legalPerso ...@@ -628,9 +634,10 @@ export async function infomationChangeUpdate({userId, unitName, uscc, legalPerso
desc, desc,
legalPersonMail, legalPersonMail,
legalPersonPhone, legalPersonPhone,
infoChangeOptionType:INFOCHANGEAPPLYTYPE.待审批, infoChangeOptionType,
createTimeMs:new Date().valueOf() createTimeMs:new Date().valueOf()
}; };
await updateOneData(TABLEENUM.用户表, {userId}, {infoChangeId:applyInfo.infoChangeId, infoChangeMs:new Date().valueOf(), infoChangeOptionType:INFOCHANGEAPPLYTYPE.待审批}); await updateOneData(TABLEENUM.用户表, {userId}, {infoChangeId:applyInfo.infoChangeId, infoChangeMs:new Date().valueOf(), infoChangeOptionType:INFOCHANGEAPPLYTYPE.待审批});
await addOneData(TABLEENUM.资料变更审批历史表, applyInfo); await addOneData(TABLEENUM.资料变更审批历史表, applyInfo);
......
...@@ -818,6 +818,7 @@ export enum INFOCHANGEAPPLYTYPE { ...@@ -818,6 +818,7 @@ export enum INFOCHANGEAPPLYTYPE {
通过 = 1, 通过 = 1,
待审批, 待审批,
驳回修改, 驳回修改,
驳回提交, //2025.02.24新增状态
} }
......
...@@ -70,7 +70,7 @@ export const Config = { ...@@ -70,7 +70,7 @@ export const Config = {
subUrl:'/applydb/infomationchange/list', subUrl:'/applydb/infomationchange/list',
param:[ param:[
{key:"name", type:"String", desc:"关键字搜索", isNull:true}, {key:"name", type:"String", desc:"关键字搜索", isNull:true},
{key:"changeState", type:"Number", desc:"筛选状态 0是全部 1是通过 2是待审批 3是驳回修改", isNull:true}, {key:"changeState", type:"Number", desc:"筛选状态 0是全部 1是通过 2是待审批 3是驳回修改 4是驳回提交", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页"}, {key:"pageNumber", type:"Number", desc:"分页"},
{key:"pageSize", type:"Number", desc:"一页显示大小"}, {key:"pageSize", type:"Number", desc:"一页显示大小"},
], ],
......
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