no message

src/biz/member/apply.ts

@@ -504,7 +504,7 @@ export async function infomationChangeList({name, changeState, unitMemberType, u
         if (checkChangeUserIdList.indexOf(item.userId) == -1)  checkChangeUserIdList.push(item.userId);
     })
 
-    let dbList = await findToSortToPage(TABLEENUM.用户表, selectUserParam, ["userId", "memberType", "userId", "unitName", "infoChangeId", "uscc", "legalPerson", "unitMemberType", "yuanXiaoBanXueLeiXing"], {infoChangeMs:-1}, pageNumber, pageSize);
+    let dbList = await findToSortToPage(TABLEENUM.用户表, selectUserParam, [], {infoChangeMs:-1}, pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.用户表, selectUserParam);
     
     let dataList = [];
@@ -512,6 +512,10 @@ 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];
+        let isHistory = false;
+        let historyCount = await findCount(TABLEENUM.资料变更审批历史表, {userId:info.userId});
+        if (historyCount > 1) isHistory = true;
+
         let yuanXiaoBanXueLeiXing= logInfo.yuanXiaoBanXueLeiXing || info.yuanXiaoBanXueLeiXing;
         let item = {                               
             infoChangeOptionType:changeEnumValue(INFOCHANGEAPPLYTYPE, logInfo.infoChangeOptionType),
@@ -522,6 +526,8 @@ export async function infomationChangeList({name, changeState, unitMemberType, u
             unitMemberType:changeEnumValue(MEMBERTYPEECCENUM, logInfo.unitMemberType),
             uusinessLicenseUrl:logInfo.uusinessLicenseUrl,
             applicationForm:logInfo.applicationForm,
+            uusinessLicenseUrlChange:false,
+            applicationFormChange:false,
             yuanXiaoBanXueLeiXing:changeEnumValue(BANXUELEIXING, yuanXiaoBanXueLeiXing),
             desc:logInfo.desc,
             unitNameChange:false,
@@ -535,7 +541,8 @@ export async function infomationChangeList({name, changeState, unitMemberType, u
             legalPersonPhone:logInfo.legalPersonPhone || '',
             legalPersonMailChange:false,
             legalPersonPhoneChange:false,
-            rejectRemarks:logInfo.rejectRemarks || ""
+            rejectRemarks:logInfo.rejectRemarks || "",
+            isHistory
         };
         if (logInfo.unitName != info.unitName) item.unitNameChange = true;
         if (logInfo.uscc != info.uscc) item.usccChange = true;
@@ -544,6 +551,8 @@ export async function infomationChangeList({name, changeState, unitMemberType, u
         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 (item.infoChangeOptionType == "驳回修改") item.infoChangeOptionType = "已驳回"; // 2025.02.25【驳回修改】文字修改为【已驳回】
         dataList.push(item);
     }
@@ -902,6 +911,83 @@ export async function infomationChangeLog({infoChangeId}) {
 
 
 /**
+ * 资料变更审批历史-单字段
+ * @param param0 
+ * @returns 
+ */
+export async function infomationChangeKeyStr({infoChangeId, keyStr}) {
+    let userInfo = await findOnce(TABLEENUM.用户表, {infoChangeId}, []);
+    if (!userInfo || !userInfo.userId) {
+        throw new BizError(ERRORENUM.不存在审批历史);
+    }
+
+    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 dataList = [];
+    for (let i = 0; i < dbList.length; i++) {
+        let info = dbList[i];
+        let infoChangeOptionType = changeEnumValue(INFOCHANGEAPPLYTYPE, info.infoChangeOptionType);
+        let desc = "";
+        if (INFOCHANGEAPPLYTYPE.待审批 == info.infoChangeOptionType) {
+            infoChangeOptionType = "用户-提交";
+            desc = info.desc;
+        } else if (INFOCHANGEAPPLYTYPE.驳回修改 == info.infoChangeOptionType) {
+            desc = info.rejectRemarks;
+            infoChangeOptionType = "审核-驳回";
+        } else {
+            desc = "通过";
+            infoChangeOptionType = "审核-通过";
+        }
+        info.yuanXiaoBanXueLeiXing = changeEnumValue(BANXUELEIXING, info.yuanXiaoBanXueLeiXing);
+        
+        let updateConf = {
+            "unitName":"单位名称", 
+            "uscc":"统一信用代码", 
+            "legalPerson":"法人代表", 
+            "legalPersonPhone":"法人联系电话",
+            "legalPersonMail":"法人联系邮箱", 
+            "unitMemberType":"单位类型", 
+            "yuanXiaoBanXueLeiXing":"办学类型", 
+            "uusinessLicenseUrl":"营业执照",
+            "applicationForm":"盖章申请表"
+        };
+        let updateAddress = "";
+        let updateInfo = [];
+        let isFile = false;
+        /**修改前 */
+        let updateBeforeInfoStr = "";
+        /**修改后 */
+        let updateInfoStr = "";
+        if (info[keyStr] != userInfo[keyStr]) {
+            /**修改前 */
+            if (!userInfo[keyStr]) updateBeforeInfoStr = "";
+            else updateBeforeInfoStr = `${userInfo[keyStr]}`;
+            /**修改后 */
+            if (!info[keyStr]) updateInfoStr = "";
+            else updateInfoStr = `${info[keyStr]}`;
+            updateAddress += `${updateConf[keyStr]}、`;
+            if (keyStr == "uusinessLicenseUrl" || keyStr == "applicationForm") isFile = true;
+            
+            dataList.push({
+                time:moment(info.createTimeMs).format("YYYY-MM-DD HH:mm:SS"),
+                updateBeforeInfoStr, //修改前
+                updateInfoStr, //修改后
+                updateAddress:updateConf[keyStr], //修改位置
+                isFile //是否文件类型
+            });
+        }
+    }
+
+    return {dataList};
+}
+
+
+/**
  * 资料变更批量通过
  * @param param0 
  * @returns 

src/routers/apply/router.ts

@@ -116,6 +116,15 @@ export const Config = {
             bindBiz:applyBiz.infomationChangeLog
         },
         {
+            apiName:"资料变更审批历史单个信息",
+            subUrl:'/applydb/infomationchange/logbykeystr', 
+            param:[
+                {key:"infoChangeId", type:"String", desc:"标识"},
+                {key:"keyStr", type:"String", desc:"变更字段"},
+            ],
+            bindBiz:applyBiz.infomationChangeKeyStr
+        },
+        {
             apiName:"资料变更审批驳回",
             subUrl:'/applydb/infomationchange/out', 
             param:[