diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsOperationLog.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsOperationLog.java index 04d9e34a..a3ca94c7 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsOperationLog.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsOperationLog.java @@ -36,4 +36,7 @@ public class MsOperationLog implements Serializable { @TableField("RECORD_ID") private String recordId; + @TableField("OPERATION_TYPE") + private String operationType; + } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java index 384e18a4..e92d5a90 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java @@ -25,6 +25,7 @@ public class EngVmsstbprptVo implements Serializable { private String rvcdFullPath; private String stcd; private String stnm; + private String rstcd; private String ennm; private String baseId; private String baseName; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java index 52b84801..54b55936 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java @@ -287,7 +287,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl details = new ArrayList<>(); @@ -323,7 +323,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl details = new ArrayList<>(); @@ -360,7 +360,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl details = new ArrayList<>(); @@ -390,11 +390,11 @@ public class MsOperationLogServiceImpl extends ServiceImpl details = new ArrayList<>(); @@ -457,7 +458,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl details = new ArrayList<>(); @@ -489,7 +490,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl codeToNameFieldMap = buildCodeToNameFieldMap(codeToNameMetaList); - MsOperationLog mainLog = buildMainLog(tableName, recordId, "新增", source); + MsOperationLog mainLog = buildMainLog(tableName, recordId, "新增", source,"01"); msOperationLogMapper.insert(mainLog); List details = new ArrayList<>(); @@ -507,7 +508,9 @@ public class MsOperationLogServiceImpl extends ServiceImpl details = new ArrayList<>(); @@ -560,7 +563,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl codeToNameFieldMap = buildCodeToNameFieldMap(codeToNameMetaList); - MsOperationLog mainLog = buildMainLog(tableName, recordId, "修改", source); + MsOperationLog mainLog = buildMainLog(tableName, recordId, "修改", source,"02"); msOperationLogMapper.insert(mainLog); List details = new ArrayList<>(); @@ -604,7 +607,7 @@ public class MsOperationLogServiceImpl extends ServiceImpl codeToNameFieldMap = buildCodeToNameFieldMap(codeToNameMetaList); - MsOperationLog mainLog = buildMainLog(tableName, recordId, "删除", source); + MsOperationLog mainLog = buildMainLog(tableName, recordId, "删除", source,"03"); msOperationLogMapper.insert(mainLog); List details = new ArrayList<>(); @@ -622,7 +625,9 @@ public class MsOperationLogServiceImpl extends ServiceImpl(); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(MsOperationLogDetail::getMainId, mainId); + wrapper.eq(MsOperationLogDetail::getMainId, mainId) + .notIn(MsOperationLogDetail::getFieldCode, + "recordUser", "recordTime", "modifyUser", "modifyTime", + "isDeleted", "deleteUser", "deleteTime"); return msOperationLogDetailMapper.selectList(wrapper); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java index 972a77e1..f956532c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java @@ -2219,13 +2219,13 @@ public class ZqMonitorServiceImpl implements ZqMonitorService { selectMap.put("rstcd", "t.RSTCD AS rstcd"); selectMap.put("ennm", "eng.ENNM AS ennm"); selectMap.put("baseId", "eng.BASE_ID AS baseId"); - selectMap.put("baseName", "hb.BASENAME AS baseName"); +// selectMap.put("baseName", "hb.BASENAME AS baseName"); selectMap.put("hbrvcd", "eng.HBRVCD AS hbrvcd"); - selectMap.put("hbrvcdName", "hbrv.HBRVNM AS hbrvcdName"); +// selectMap.put("hbrvcdName", "hbrv.HBRVNM AS hbrvcdName"); selectMap.put("rvcd", "eng.RVCD AS rvcd"); - selectMap.put("rvcdName", "rv.RVNM AS rvcdName"); +// selectMap.put("rvcdName", "rv.RVNM AS rvcdName"); selectMap.put("addvcd", "eng.ADDVCD AS addvcd"); - selectMap.put("addvcdName", "addv.ADDVNM AS addvcdName"); +// selectMap.put("addvcdName", "addv.ADDVNM AS addvcdName"); selectMap.put("fhstcd", "t.FHSTCD AS fhstcd"); selectMap.put("ispro", "t.ISPRO AS ispro"); selectMap.put("project", "t.PROJECT AS project");