From 0673f6fde8fd884332c404031a2ee523ec45d190 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 07 一月 2025 18:22:38 +0800
Subject: [PATCH] 客户资料 巡检任务业务

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktaking.java |   43 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 41 insertions(+), 2 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 ff2d0c3..3addc97 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")
@@ -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="鐩樼偣鏃堕棿")
@@ -139,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