From b20b4387a631f6621af5b2b5563ef8a4c1ab9d47 Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 27 Apr 2026 11:07:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApprovalChangeLogController.java | 1 + .../controller/ApprovalLogController.java | 1 + .../controller/ApprovalMainController.java | 1 + .../controller/FishDraftDataController.java | 12 ++-- .../data/domain/ApprovalChangeLog.java | 12 ++++ .../yfd/platform/data/domain/ApprovalLog.java | 12 ++++ .../platform/data/domain/ApprovalMain.java | 12 ++++ .../data/domain/SysUserDataScope.java | 19 +++++++ .../data/domain/vo/FishDraftDataVO.java | 15 +++++ .../service/IApprovalChangeLogService.java | 2 + .../data/service/IApprovalLogService.java | 2 + .../data/service/IApprovalMainService.java | 4 ++ .../service/impl/ApprovalLogServiceImpl.java | 46 ++++++++++++++- .../service/impl/ApprovalMainServiceImpl.java | 52 +++++++++++++++-- .../impl/FishDraftDataServiceImpl.java | 57 ++++++++++++++++++- .../service/impl/ImportTaskServiceImpl.java | 2 +- .../impl/SysUserDataScopeServiceImpl.java | 53 ++++++++++++++++- .../yfd/platform/env/domain/SdEngInfoBH.java | 2 +- .../src/main/resources/application-devtw.yml | 3 + backend/src/main/resources/application.yml | 2 +- .../resources/mapper/env/SdRvcdDicMapper.xml | 3 +- 21 files changed, 295 insertions(+), 18 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalChangeLogController.java b/backend/src/main/java/com/yfd/platform/data/controller/ApprovalChangeLogController.java index e01f191..26e019f 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalChangeLogController.java +++ b/backend/src/main/java/com/yfd/platform/data/controller/ApprovalChangeLogController.java @@ -39,6 +39,7 @@ public class ApprovalChangeLogController { @Operation(summary = "分页查询变更记录列表(通用)") public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { Page approvalChangeLogPage = DataSourceRequestUtil.executeQuery(request, ApprovalChangeLog.class, approvalChangeLogService); + approvalChangeLogService.fillUserNames(approvalChangeLogPage.getRecords()); return ResponseResult.successData(approvalChangeLogPage); } diff --git a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalLogController.java b/backend/src/main/java/com/yfd/platform/data/controller/ApprovalLogController.java index eb0ff5f..b367361 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalLogController.java +++ b/backend/src/main/java/com/yfd/platform/data/controller/ApprovalLogController.java @@ -39,6 +39,7 @@ public class ApprovalLogController { @Operation(summary = "分页查询审批日志列表(通用)") public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { Page approvalLogPage = DataSourceRequestUtil.executeQuery(request, ApprovalLog.class, approvalLogService); + approvalLogService.fillUserNames(approvalLogPage.getRecords()); return ResponseResult.successData(approvalLogPage); } diff --git a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalMainController.java b/backend/src/main/java/com/yfd/platform/data/controller/ApprovalMainController.java index d8e8daf..d145d90 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/ApprovalMainController.java +++ b/backend/src/main/java/com/yfd/platform/data/controller/ApprovalMainController.java @@ -42,6 +42,7 @@ public class ApprovalMainController { @Operation(summary = "分页查询审批列表(通用)") public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { Page approvalMainPage = DataSourceRequestUtil.executeQuery(request, ApprovalMain.class, approvalMainService); + approvalMainService.fillUserNames(approvalMainPage.getRecords()); return ResponseResult.successData(approvalMainPage); } diff --git a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java b/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java index 7197d40..e0c90e6 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java +++ b/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java @@ -240,8 +240,11 @@ public class FishDraftDataController { request.setBizType("FISH"); FishImportResult result = fishImportService.parseAndMapZip(file, uploadUserId); - - importTaskService.updateStatus(taskId, "VALIDATED", null); + String status = "VALIDATED"; + if ("1".equals(result.getCode())) { + status="FAILED"; + } + importTaskService.updateStatus(taskId, status, null); importTaskService.updateProgress(taskId, result.getTotalCount(), result.getSuccessCount(), result.getFailedCount()); try { @@ -260,9 +263,8 @@ public class FishDraftDataController { @PostMapping("/cancelImport") @Operation(summary = "取消导入任务") - public ResponseResult cancelImport(@RequestParam String taskId, - @RequestParam String operatorId) { - boolean result = importTaskService.cancelTask(taskId, operatorId); + public ResponseResult cancelImport(@RequestParam String taskId) { + boolean result = importTaskService.cancelTask(taskId,SecurityUtils.getUserId()); return result ? ResponseResult.success("取消成功") : ResponseResult.error("取消失败"); } diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalChangeLog.java b/backend/src/main/java/com/yfd/platform/data/domain/ApprovalChangeLog.java index ddc9c05..171d46f 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalChangeLog.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/ApprovalChangeLog.java @@ -30,6 +30,12 @@ public class ApprovalChangeLog implements Serializable { */ private String approvalId; + /** + * 审批批次名称 + */ + @TableField(exist = false) + private String approvalName; + /** * 草稿数据ID */ @@ -55,6 +61,12 @@ public class ApprovalChangeLog implements Serializable { */ private String operatorId; + /** + * 操作人名称 + */ + @TableField(exist = false) + private String operatorName; + /** * 操作时间 */ diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalLog.java b/backend/src/main/java/com/yfd/platform/data/domain/ApprovalLog.java index b8d4e3e..84f4662 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalLog.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/ApprovalLog.java @@ -30,6 +30,12 @@ public class ApprovalLog implements Serializable { */ private String approvalId; + /** + * 审批批次名字 + */ + @TableField(exist = false) + private String approvalName; + /** * 操作类型（SUBMIT提交 / APPROVE通过 / REJECT驳回） */ @@ -40,6 +46,12 @@ public class ApprovalLog implements Serializable { */ private String operatorId; + /** + * 操作人名字 + */ + @TableField(exist = false) + private String operatorName; + /** * 操作时间 */ diff --git a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalMain.java b/backend/src/main/java/com/yfd/platform/data/domain/ApprovalMain.java index 9989f93..c45084c 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/ApprovalMain.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/ApprovalMain.java @@ -45,6 +45,12 @@ public class ApprovalMain implements Serializable { */ private String applyUserId; + /** + * 提交人名称 + */ + @TableField(exist = false) + private String applyUserName; + /** * 提交时间 */ @@ -60,6 +66,12 @@ public class ApprovalMain implements Serializable { */ private String approverId; + /** + * 审批人名称 + */ + @TableField(exist = false) + private String approverName; + /** * 审批完成时间 */ diff --git a/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java b/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java index 7715b94..50fadcc 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java @@ -32,6 +32,13 @@ public class SysUserDataScope implements Serializable { */ private String userId; + /** + * 用户名称 + */ + @TableField(exist = false) + private String userName; + + /** * 资源类型（BASIN / BASE /COMPANY / STATION） */ @@ -100,6 +107,12 @@ public class SysUserDataScope implements Serializable { */ private String createdBy; + /** + * 创建人名称 + */ + @TableField(exist = false) + private String createdByName; + /** * 更新时间 */ @@ -111,6 +124,12 @@ public class SysUserDataScope implements Serializable { */ private String updatedBy; + /** + * 更新人名称 + */ + @TableField(exist = false) + private String updatedByName; + /** * 备注 */ diff --git a/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java b/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java index 6e21b5c..65c0f48 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java @@ -216,4 +216,19 @@ public class FishDraftDataVO implements Serializable { * 排序字段 */ private Integer orderIndex; + + /** + * 创建人名称 + */ + private String createdByName; + + /** + * 更新人名称 + */ + private String updatedByName; + + /** + * 删除人名称 + */ + private String deletedByName; } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/data/service/IApprovalChangeLogService.java b/backend/src/main/java/com/yfd/platform/data/service/IApprovalChangeLogService.java index 66e609f..756e9fb 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IApprovalChangeLogService.java +++ b/backend/src/main/java/com/yfd/platform/data/service/IApprovalChangeLogService.java @@ -17,6 +17,8 @@ public interface IApprovalChangeLogService extends IService { */ List getByApprovalId(String approvalId); + void fillUserNames(List list); + /** * 根据草稿数据ID查询变更记录 */ diff --git a/backend/src/main/java/com/yfd/platform/data/service/IApprovalLogService.java b/backend/src/main/java/com/yfd/platform/data/service/IApprovalLogService.java index 8d01030..575273e 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IApprovalLogService.java +++ b/backend/src/main/java/com/yfd/platform/data/service/IApprovalLogService.java @@ -17,6 +17,8 @@ public interface IApprovalLogService extends IService { */ List getByApprovalId(String approvalId); + void fillUserNames(List list); + /** * 根据操作类型查询 */ diff --git a/backend/src/main/java/com/yfd/platform/data/service/IApprovalMainService.java b/backend/src/main/java/com/yfd/platform/data/service/IApprovalMainService.java index d20136b..b2ee766 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/IApprovalMainService.java +++ b/backend/src/main/java/com/yfd/platform/data/service/IApprovalMainService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.yfd.platform.data.domain.ApprovalMain; +import java.util.List; + /** *

* 审批批次主表 服务类 @@ -16,6 +18,8 @@ public interface IApprovalMainService extends IService { */ Page queryPageList(Page page, String bizType, String status); + void fillUserNames(List list); + /** * 根据审批批次号查询 */ diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalLogServiceImpl.java index d48ec47..cb49173 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalLogServiceImpl.java @@ -1,14 +1,16 @@ package com.yfd.platform.data.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.data.domain.ApprovalLog; import com.yfd.platform.data.mapper.ApprovalLogMapper; import com.yfd.platform.data.service.IApprovalLogService; +import com.yfd.platform.system.domain.SysUser; +import com.yfd.platform.system.mapper.SysUserMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; /** *

@@ -20,12 +22,50 @@ public class ApprovalLogServiceImpl extends ServiceImpl getByApprovalId(String approvalId) { return approvalLogMapper.selectByApprovalId(approvalId); } + @Override + public void fillUserNames(List list) { + if (list == null || list.isEmpty()) { + return; + } + + Set userIds = new HashSet<>(); + for (ApprovalLog vo : list) { + if (StrUtil.isNotBlank(vo.getApprovalId())) { + userIds.add(vo.getApprovalId()); + } + if (StrUtil.isNotBlank(vo.getOperatorId())) { + userIds.add(vo.getOperatorId()); + } + } + + if (userIds.isEmpty()) { + return; + } + + Map userNameMap = new HashMap<>(); + List users = sysUserMapper.selectBatchIds(userIds); + for (SysUser user : users) { + userNameMap.put(user.getId(), user.getNickname()); + } + + for (ApprovalLog vo : list) { + if (StrUtil.isNotBlank(vo.getApprovalId())) { + vo.setApprovalName(userNameMap.get(vo.getApprovalId())); + } + if (StrUtil.isNotBlank(vo.getOperatorId())) { + vo.setOperatorName(userNameMap.get(vo.getOperatorId())); + } + + } + } + @Override public List getByAction(String action) { return approvalLogMapper.selectByAction(action); diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java index 907ede4..72f3d57 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java @@ -1,19 +1,20 @@ package com.yfd.platform.data.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.data.domain.ApprovalLog; import com.yfd.platform.data.domain.ApprovalMain; -import com.yfd.platform.data.mapper.ApprovalLogMapper; import com.yfd.platform.data.mapper.ApprovalMainMapper; import com.yfd.platform.data.service.IApprovalLogService; import com.yfd.platform.data.service.IApprovalMainService; +import com.yfd.platform.system.domain.SysUser; +import com.yfd.platform.system.mapper.SysUserMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import java.util.Date; +import java.util.*; /** *

@@ -29,15 +30,58 @@ public class ApprovalMainServiceImpl extends ServiceImpl queryPageList(Page page, String bizType, String status) { - return this.page(page, this.lambdaQuery() + Page approvalMainPage = this.page(page, this.lambdaQuery() .eq(StringUtils.hasText(bizType), ApprovalMain::getBizType, bizType) .eq(StringUtils.hasText(status), ApprovalMain::getStatus, status) .orderByDesc(ApprovalMain::getCreatedAt) .getWrapper()); + fillUserNames(approvalMainPage.getRecords()); + return approvalMainPage; } + @Override + public void fillUserNames(List list) { + if (list == null || list.isEmpty()) { + return; + } + + Set userIds = new HashSet<>(); + for (ApprovalMain vo : list) { + if (StrUtil.isNotBlank(vo.getApproverId())) { + userIds.add(vo.getApproverId()); + } + if (StrUtil.isNotBlank(vo.getApplyUserId())) { + userIds.add(vo.getApplyUserId()); + } + } + + if (userIds.isEmpty()) { + return; + } + + Map userNameMap = new HashMap<>(); + List users = sysUserMapper.selectBatchIds(userIds); + for (SysUser user : users) { + userNameMap.put(user.getId(), user.getNickname()); + } + + for (ApprovalMain vo : list) { + if (StrUtil.isNotBlank(vo.getApproverId())) { + vo.setApproverName(userNameMap.get(vo.getApproverId())); + } + if (StrUtil.isNotBlank(vo.getApplyUserId())) { + vo.setApplyUserName(userNameMap.get(vo.getApplyUserId())); + } + + } + } + + @Override public ApprovalMain getByApprovalNo(String approvalNo) { return approvalMainMapper.selectByApprovalNo(approvalNo); diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java index e292482..5d07cdb 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java @@ -15,6 +15,8 @@ import com.yfd.platform.data.service.IApprovalChangeLogService; import com.yfd.platform.data.service.IApprovalLogService; import com.yfd.platform.data.service.IApprovalMainService; import com.yfd.platform.data.service.IFishDraftDataService; +import com.yfd.platform.system.domain.SysUser; +import com.yfd.platform.system.mapper.SysUserMapper; import com.yfd.platform.utils.KendoUtil; import com.yfd.platform.utils.QgcQueryWrapperUtil; import com.yfd.platform.utils.SecurityUtils; @@ -46,6 +48,9 @@ public class FishDraftDataServiceImpl extends ServiceImpl resultPage = fishDraftDataMapper.selectJoinPage( page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime); + fillUserNames(resultPage.getRecords()); return resultPage; } @@ -84,7 +90,56 @@ public class FishDraftDataServiceImpl extends ServiceImpl list = fishDraftDataMapper.selectJoinList(stcd, rstcd, baseId, direction, status, ftp, startTime, endTime); + fillUserNames(list); + return list; + } + + private void fillUserNames(List list) { + if (list == null || list.isEmpty()) { + return; + } + + Set userIds = new HashSet<>(); + for (FishDraftDataVO vo : list) { + if (StrUtil.isNotBlank(vo.getCreatedBy())) { + userIds.add(vo.getCreatedBy()); + } + if (StrUtil.isNotBlank(vo.getCreatedBy())) { + userIds.add(vo.getCreatedBy()); + } + if (StrUtil.isNotBlank(vo.getUpdatedBy())) { + userIds.add(vo.getUpdatedBy()); + } + if (StrUtil.isNotBlank(vo.getDeletedBy())) { + userIds.add(vo.getDeletedBy()); + } + } + + if (userIds.isEmpty()) { + return; + } + + Map userNameMap = new HashMap<>(); + List users = sysUserMapper.selectBatchIds(userIds); + for (SysUser user : users) { + userNameMap.put(user.getId(), user.getNickname()); + } + + for (FishDraftDataVO vo : list) { + if (StrUtil.isNotBlank(vo.getCreatedBy())) { + vo.setCreatedByName(userNameMap.get(vo.getCreatedBy())); + } + if (StrUtil.isNotBlank(vo.getUpdatedBy())) { + vo.setUpdatedByName(userNameMap.get(vo.getUpdatedBy())); + } + if (StrUtil.isNotBlank(vo.getDeletedBy())) { + vo.setDeletedByName(userNameMap.get(vo.getDeletedBy())); + } + if (StrUtil.isNotBlank(vo.getDeletedBy())) { + vo.setDeletedByName(userNameMap.get(vo.getDeletedBy())); + } + } } @Override diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java index 3d1a91a..4dfbb00 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java @@ -187,7 +187,7 @@ public class ImportTaskServiceImpl extends ServiceImpl().eq(ImportTask::getUploadUserId, uploadUserId).eq(ImportTask::getBizType, "FISH").orderByDesc(ImportTask::getCreatedAt)); + ImportTask importTask = importTaskMapper.selectLastByUserId(uploadUserId); return importTask; } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java index 7492688..006cd04 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java @@ -18,6 +18,8 @@ import com.yfd.platform.env.mapper.SdEngInfoBHMapper; import com.yfd.platform.env.mapper.SdHycdDicMapper; import com.yfd.platform.env.mapper.SdHydrobaseMapper; import com.yfd.platform.env.mapper.SdRvcdDicMapper; +import com.yfd.platform.system.domain.SysUser; +import com.yfd.platform.system.mapper.SysUserMapper; import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -44,15 +46,64 @@ public class SysUserDataScopeServiceImpl extends ServiceImpl queryPageList(Page page, String userId, String orgType, String orgId, Integer status) { - return this.page(page, this.lambdaQuery() + Page userDataScopePage = this.page(page, this.lambdaQuery() .eq(userId != null, SysUserDataScope::getUserId, userId) .eq(orgType != null && !orgType.isEmpty(), SysUserDataScope::getOrgType, orgType) .eq(orgId != null && !orgId.isEmpty(), SysUserDataScope::getOrgId, orgId) .eq(status != null, SysUserDataScope::getStatus, status) .orderByDesc(SysUserDataScope::getCreatedAt) .getWrapper()); + fillUserNames(userDataScopePage.getRecords()); + return userDataScopePage; + } + + private void fillUserNames(List list) { + if (list == null || list.isEmpty()) { + return; + } + + Set userIds = new HashSet<>(); + for (SysUserDataScope vo : list) { + if (StrUtil.isNotBlank(vo.getCreatedBy())) { + userIds.add(vo.getCreatedBy()); + } + if (StrUtil.isNotBlank(vo.getCreatedBy())) { + userIds.add(vo.getCreatedBy()); + } + if (StrUtil.isNotBlank(vo.getUpdatedBy())) { + userIds.add(vo.getUpdatedBy()); + } + if (StrUtil.isNotBlank(vo.getUserId())) { + userIds.add(vo.getUserId()); + } + } + + if (userIds.isEmpty()) { + return; + } + + Map userNameMap = new HashMap<>(); + List users = sysUserMapper.selectBatchIds(userIds); + for (SysUser user : users) { + userNameMap.put(user.getId(), user.getNickname()); + } + + for (SysUserDataScope vo : list) { + if (StrUtil.isNotBlank(vo.getCreatedBy())) { + vo.setCreatedByName(userNameMap.get(vo.getCreatedBy())); + } + if (StrUtil.isNotBlank(vo.getUpdatedBy())) { + vo.setUpdatedByName(userNameMap.get(vo.getUpdatedBy())); + } + if (StrUtil.isNotBlank(vo.getUserId())) { + vo.setUserId(userNameMap.get(vo.getUserId())); + } + } } @Override diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBH.java b/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBH.java index bb71e6b..4d258c4 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBH.java +++ b/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBH.java @@ -242,7 +242,7 @@ public class SdEngInfoBH implements Serializable { /** * 工程等别 字典编码：sd_enginfo_b_h.prgr 1=Ⅰ 2=Ⅱ 3=Ⅲ 4=Ⅳ 5=Ⅴ */ - private Integer prgr; + private String prgr; /** * 电站-主要功能 1=发电 2=防洪 3=灌溉 4=供水 5=航运 6=旅游 7=环境 8=养殖 9=其他 diff --git a/backend/src/main/resources/application-devtw.yml b/backend/src/main/resources/application-devtw.yml index 05839c9..34a784a 100644 --- a/backend/src/main/resources/application-devtw.yml +++ b/backend/src/main/resources/application-devtw.yml @@ -75,6 +75,9 @@ login: # 启动自动数据库初始化（仅 dev/server）： app: + # ZIP导入临时目录配置 + zip-import: + temp-dir: ${ZIP_IMPORT_TEMP_DIR:D:\zip_import_temp} init: enabled: false schema: classpath:db-init/sql/min-schema.sql diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 547f405..8f42778 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod + active: devtw jasypt: encryptor: diff --git a/backend/src/main/resources/mapper/env/SdRvcdDicMapper.xml b/backend/src/main/resources/mapper/env/SdRvcdDicMapper.xml index 004754f..1eaf1b7 100644 --- a/backend/src/main/resources/mapper/env/SdRvcdDicMapper.xml +++ b/backend/src/main/resources/mapper/env/SdRvcdDicMapper.xml @@ -39,7 +39,8 @@