From ff334b155cf6ca7702ef3a19f1b2650e59345d7c Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Fri, 16 Jan 2026 10:08:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=A7=91=E7=9B=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/todo/ExpenseAccountDO.java | 15 +++++++++++++++ .../facade/expenseAccount/ExpenseAccountApi.java | 7 +++++++ .../persistence/ReconciliationImpl.java | 6 +++--- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/todo/ExpenseAccountDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/todo/ExpenseAccountDO.java index b848324b0..b80ec30cd 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/todo/ExpenseAccountDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/todo/ExpenseAccountDO.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.math.BigDecimal; import io.swagger.annotations.ApiModelProperty; import com.mhd.common.core.web.domain.BaseVOEntity; +import org.springframework.format.annotation.DateTimeFormat; import java.util.List; @@ -131,4 +132,18 @@ public class ExpenseAccountDO extends BaseVOEntity{ @ApiModelProperty(name = "创建订单是否固定显示 0-否 1-是") private Integer fixedOrderDisplay; + + @ApiModelProperty(name = "创建者姓名") + private String createByName; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ApiModelProperty(value = "更新者") + private Long updateBy; + + @ApiModelProperty(name = "创建者姓名") + private String updateByName; } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java index 5a8e0a6d4..c2e7f8312 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java @@ -18,6 +18,7 @@ import com.mhd.common.core.constant.HttpStatus; import com.mhd.common.core.domain.entity.R; import com.sun.org.apache.bcel.internal.generic.NEW; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -62,6 +63,12 @@ public class ExpenseAccountApi extends BaseController{ logger.info("expenseAccountDTO 为 null，创建新对象"); } ExpenseAccountDO expenseAccountDO = expenseAccountAssembler.toDO(expenseAccountDTO); + if(StringUtils.isBlank(expenseAccountDTO.getCreateByName())){ + expenseAccountDO.setCreateByName(null); + } + if(StringUtils.isBlank(expenseAccountDTO.getUpdateByName())){ + expenseAccountDO.setUpdateByName(null); + } logger.info("转换后的 ExpenseAccountDO：{}", expenseAccountDO); startPage(); logger.info("分页参数已设置"); diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index ead9f275c..57f10c907 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -112,7 +112,7 @@ public class ReconciliationImpl extends ServiceImpl