wms / sanyizhongka · Commits

Commit 365097de9bbe0a9fdceaebdd6cdbaf43c76df834

Authored by 游杰
2 parents 956b1e2c 8706eb20

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

Inline Side-by-side
Showing 5 changed files with 54 additions and 18 deletions
src/main/java/com/huaheng/framework/config/MyMetaObjectHandler.java 0 → 100644
  View file @365097d
  1 +package com.huaheng.framework.config;
  2 +
  3 +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
  4 +import com.huaheng.common.utils.security.ShiroUtils;
  5 +import lombok.extern.slf4j.Slf4j;
  6 +import org.apache.ibatis.reflection.MetaObject;
  7 +import org.springframework.stereotype.Component;
  8 +
  9 +import java.util.Date;
  10 +
  11 +/**
  12 + * Created by Enzo Cotter on 2020/7/7.
  13 + */
  14 +@Slf4j
  15 +@Component
  16 +public class MyMetaObjectHandler implements MetaObjectHandler{
  17 + /**
  18 + * 插入元对象字段填充（用于插入时对公共字段的填充）
  19 + *
  20 + * @param metaObject 元对象
  21 + */
  22 + @Override
  23 + public void insertFill(MetaObject metaObject) {
  24 + log.info("start insert fill ....");
  25 + this.setFieldValByName("created", new Date(), metaObject);
  26 + this.setFieldValByName("createdBy", ShiroUtils.getLoginName(), metaObject);
  27 + this.setFieldValByName("lastUpdated", new Date(), metaObject);
  28 + this.setFieldValByName("lastUpdatedBy", ShiroUtils.getLoginName(), metaObject);
  29 + }
  30 +
  31 + /**
  32 + * 更新元对象字段填充（用于更新时对公共字段的填充）
  33 + *
  34 + * @param metaObject 元对象
  35 + */
  36 + @Override
  37 + public void updateFill(MetaObject metaObject) {
  38 + this.setFieldValByName("lastUpdated", new Date(), metaObject);
  39 + this.setFieldValByName("lastUpdatedBy", ShiroUtils.getLoginName(), metaObject);
  40 + }
  41 +}
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java
  View file @365097d
1 1 package com.huaheng.pc.receipt.receiptContainerHeader.domain;
2 2  
3   -import com.baomidou.mybatisplus.annotation.IdType;
4   -import com.baomidou.mybatisplus.annotation.TableField;
5   -import com.baomidou.mybatisplus.annotation.TableId;
6   -import com.baomidou.mybatisplus.annotation.TableName;
  3 +import com.baomidou.mybatisplus.annotation.*;
7 4 import io.swagger.annotations.ApiModel;
8 5 import io.swagger.annotations.ApiModelProperty;
9 6 import lombok.Data;
... ... @@ -109,28 +106,28 @@ public class ReceiptContainerHeader implements Serializable {
109 106 /**
110 107 * 创建时间
111 108 */
112   - @TableField(value = "created")
  109 + @TableField(value = "created", fill = FieldFill.INSERT)
113 110 @ApiModelProperty(value="创建时间")
114 111 private Date created;
115 112  
116 113 /**
117 114 * 创建用户
118 115 */
119   - @TableField(value = "createdBy")
  116 + @TableField(value = "createdBy", fill = FieldFill.INSERT)
120 117 @ApiModelProperty(value="创建用户")
121 118 private String createdBy;
122 119  
123 120 /**
124 121 * 创建时间
125 122 */
126   - @TableField(value = "lastUpdated")
  123 + @TableField(value = "lastUpdated", fill = FieldFill.INSERT_UPDATE)
127 124 @ApiModelProperty(value="创建时间")
128 125 private Date lastUpdated;
129 126  
130 127 /**
131 128 * 更新用户
132 129 */
133   - @TableField(value = "lastUpdatedBy")
  130 + @TableField(value = "lastUpdatedBy", fill = FieldFill.INSERT_UPDATE)
134 131 @ApiModelProperty(value="更新用户")
135 132 private String lastUpdatedBy;
136 133  
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
  View file @365097d
... ... @@ -244,28 +244,28 @@ public class ReceiptDetail implements Serializable {
244 244 /**
245 245 * 创建时间
246 246 */
247   - @TableField(value = "created")
  247 + @TableField(value = "created", fill = FieldFill.INSERT)
248 248 @ApiModelProperty(value = "创建时间")
249 249 private Date created;
250 250  
251 251 /**
252 252 * 创建用户
253 253 */
254   - @TableField(value = "createdBy")
  254 + @TableField(value = "createdBy", fill = FieldFill.INSERT)
255 255 @ApiModelProperty(value = "创建用户")
256 256 private String createdBy;
257 257  
258 258 /**
259 259 * 创建时间
260 260 */
261   - @TableField(value = "lastUpdated")
  261 + @TableField(value = "lastUpdated", fill = FieldFill.INSERT_UPDATE)
262 262 @ApiModelProperty(value = "创建时间")
263 263 private Date lastUpdated;
264 264  
265 265 /**
266 266 * 更新用户
267 267 */
268   - @TableField(value = "lastUpdatedBy")
  268 + @TableField(value = "lastUpdatedBy" , fill = FieldFill.INSERT_UPDATE)
269 269 @ApiModelProperty(value = "更新用户")
270 270 private String lastUpdatedBy;
271 271  
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
  View file @365097d
... ... @@ -197,28 +197,28 @@ public class ReceiptHeader implements Serializable {
197 197 /**
198 198 * 创建时间
199 199 */
200   - @TableField(value = "created")
  200 + @TableField(value = "created", fill = FieldFill.INSERT)
201 201 @ApiModelProperty(value="创建时间")
202 202 private Date created;
203 203  
204 204 /**
205 205 * 创建用户
206 206 */
207   - @TableField(value = "createdBy")
  207 + @TableField(value = "createdBy", fill = FieldFill.INSERT)
208 208 @ApiModelProperty(value="创建用户")
209 209 private String createdBy;
210 210  
211 211 /**
212 212 * 创建时间
213 213 */
214   - @TableField(value = "lastUpdated")
  214 + @TableField(value = "lastUpdated", fill = FieldFill.INSERT_UPDATE)
215 215 @ApiModelProperty(value="创建时间")
216 216 private Date lastUpdated;
217 217  
218 218 /**
219 219 * 更新用户
220 220 */
221   - @TableField(value = "lastUpdatedBy")
  221 + @TableField(value = "lastUpdatedBy", fill = FieldFill.INSERT_UPDATE)
222 222 @ApiModelProperty(value="更新用户")
223 223 private String lastUpdatedBy;
224 224  
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @365097d
... ... @@ -77,8 +77,6 @@ public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, Recei
77 77 receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
78 78 receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
79 79 receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
80   - receiptHeader.setCreatedBy(ShiroUtils.getLoginName());
81   - receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
82 80 return AjaxResult.toAjax(this.save(receiptHeader));
83 81 }
84 82  
... ...