From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktaking.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktaking.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktaking.java
index f7e178c..ea7869f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktaking.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktaking.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -8,6 +10,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -18,7 +22,7 @@
@Data
@ApiModel("杩愮淮鐩樼偣淇℃伅琛�")
@TableName("`yw_stocktaking`")
-public class YwStocktaking {
+public class YwStocktaking extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -31,7 +35,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -61,7 +65,11 @@
@ApiModelProperty(value = "鐩樼偣鍛樼紪鐮�(鍏宠仈system_user)")
@ExcelColumn(name="鐩樼偣鍛樼紪鐮�(鍏宠仈system_user)")
- private String userId;
+ private Integer userId;
+
+ @ApiModelProperty(value = "鍚嶇О")
+ @ExcelColumn(name="鍚嶇О")
+ private String name;
@ApiModelProperty(value = "鐩樼偣鏃堕棿")
@ExcelColumn(name="鐩樼偣鏃堕棿")
@@ -71,6 +79,10 @@
@ApiModelProperty(value = "缂栧彿")
@ExcelColumn(name="缂栧彿")
private String code;
+
+ @ApiModelProperty(value = "浠撳簱缂栫爜(鍏宠仈yw_warehouse)")
+ @ExcelColumn(name="浠撳簱缂栫爜(鍏宠仈yw_warehouse)")
+ private Integer warehouseId;
@ApiModelProperty(value = "寮�濮嬪鐞嗕汉(鍏宠仈system_user)", example = "1")
@ExcelColumn(name="寮�濮嬪鐞嗕汉(鍏宠仈system_user)")
@@ -135,4 +147,35 @@
@ExcelColumn(name="鍙栨秷澶囨敞")
private String cancelInfo;
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ @TableField(exist = false)
+ private String warehouseName;
+
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String createName;
+
+ @ApiModelProperty(value = "鐩樼偣鍛樺悕绉�")
+ @TableField(exist = false)
+ private String userName;
+
+ @ApiModelProperty(value = "宸茬洏璁板綍鏁�")
+ @TableField(exist = false)
+ private Integer finishAmount;
+
+ @ApiModelProperty(value = "鏈洏璁板綍鏁�")
+ @TableField(exist = false)
+ private Integer unFinishAmount;
+
+ @ApiModelProperty(value = "鐩樼泩璁板綍鏁�")
+ @TableField(exist = false)
+ private Integer profitAmount;
+
+ @ApiModelProperty(value = "鐩樹簭璁板綍鏁�")
+ @TableField(exist = false)
+ private Integer lossAmount;
+
+ @ApiModelProperty(value = "鐩哥璁板綍鏁�")
+ @TableField(exist = false)
+ private Integer equalAmount;
}
--
Gitblit v1.9.3