diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java index a1696b68..0faae642 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java @@ -41,6 +41,7 @@ public class SdFpssBH implements Serializable { /** * 数据时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; /** @@ -103,6 +104,7 @@ public class SdFpssBH implements Serializable { /** * 数据接入时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; /** @@ -121,31 +123,37 @@ public class SdFpssBH implements Serializable { /** * 规划设计日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date stdsdt; /** * 计划开工日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date pststdt; /** * 计划完工日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date pesstdt; /** * 开工日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date swdt; /** * 建成日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date jcdt; /** * 退役/拆除日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date wddt; /** @@ -425,6 +433,7 @@ public class SdFpssBH implements Serializable { /** * 数据来源时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date vlsrTm; /** diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java index 6583e97e..8cd8695e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.common.exception.BizException; +import com.yfd.platform.common.utils.UserNameFillHelper; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.qgc_sys.threedRoam.domain.MsThreedRoamMEntity; import com.yfd.platform.qgc_sys.threedRoam.dto.MsThreedRoamBVO; @@ -35,10 +36,14 @@ public class MsThreedRoamMController { @Resource private IMsThreedRoamMService msThreedRoamMService; + @Resource + private UserNameFillHelper userNameFillHelper; + @PostMapping("/GetKendoListCust") @Operation(summary = "条件过滤数据列表") public ResponseResult getKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { DataSourceResult result = msThreedRoamMService.getKendoListCustReturn(dataSourceRequest); + userNameFillHelper.fillUserNames(result.getData()); return ResponseResult.successData(result); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java index 28c28121..526a5180 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java @@ -1,6 +1,8 @@ package com.yfd.platform.qgc_sys.threedRoam.domain; import com.baomidou.mybatisplus.annotation.*; +import com.yfd.platform.annotation.UserIdField; +import com.yfd.platform.annotation.UserNameField; import lombok.Data; import java.io.Serializable; @@ -34,8 +36,13 @@ public class MsThreedRoamMEntity implements Serializable { private String remark; @TableField(value = "RECORD_USER",fill = FieldFill.INSERT) + @UserIdField private String recordUser; + @TableField(exist = false) + @UserNameField + private String recordUserName; + @TableField(value = "RECORD_TIME",fill = FieldFill.INSERT) private Date recordTime;