Просмотр исходного кода

2023-10-27 修改最后使用人对应的字段是操作人字段。

chaiyunlong лет назад: 2
Родитель
Сommit
9298efdc15

+ 1 - 1
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStockController.java

@@ -226,7 +226,7 @@ public class DbStockController extends AbstractController {
         DbStockVo dbStockVo = new DbStockVo();
         BeanUtils.copyProperties(dbStock, dbStockVo);
         if (dbUsageRecord != null) {
-            dbStockVo.setUser(dbUsageRecord.getCreateName());
+            dbStockVo.setUser(dbUsageRecord.getOperator());
             dbStockVo.setLastUseTime(dbUsageRecord.getCreateTime());
         }
         List<DbUsageRecord> list = dbUsageRecordService.list(new LambdaQueryWrapper<DbUsageRecord>().eq(DbUsageRecord::getStcokId, dbStock.getId()).orderByDesc(DbUsageRecord::getId));

+ 2 - 0
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/DbStockVo.java

@@ -2,6 +2,7 @@ package com.zd.airbottle.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.airbottle.domain.DbUsageRecord;
@@ -57,6 +58,7 @@ public class DbStockVo implements Serializable {
     private String user;
 
     @ApiModelProperty("最后使用时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime lastUseTime;
 
     @ApiModelProperty("使用记录")