From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 20 十二月 2024 09:50:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java index a801e0d..d88be28 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java @@ -25,60 +25,56 @@ @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") - @ExcelColumn(name="涓婚敭") private Integer id; @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1") - @ExcelColumn(name="鍒涘缓浜虹紪鐮�") private Integer creator; @ApiModelProperty(value = "鍒涘缓鏃堕棿") - @ExcelColumn(name="鍒涘缓鏃堕棿") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") - @ExcelColumn(name="鏇存柊浜虹紪鐮�") private Integer editor; @ApiModelProperty(value = "鏇存柊鏃堕棿") - @ExcelColumn(name="鏇存柊鏃堕棿") + @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�",index = 5, width = 18,dateFormat="yyyy-MM-dd HH:mm") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") - @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; @ApiModelProperty(value = "澶囨敞") - @ExcelColumn(name="澶囨敞") private String remark; @ApiModelProperty(value = "鏃堕棿锛堝勾鏈堬級") - @ExcelColumn(name="鏃堕棿锛堝勾鏈堬級") + @ExcelColumn(name="浣跨敤鏈堜唤",index = 2, width = 12,dateFormat="yyyy-MM") private Date timeInfo; @ApiModelProperty(value = "鎺掑簭鐮�", example = "1") - @ExcelColumn(name="鎺掑簭鐮�") private Integer sortnum; - @ApiModelProperty(value = "绫诲瀷 0鐢ㄧ數 1鐢ㄧ數 2娌硅��", example = "1") - @ExcelColumn(name="绫诲瀷 0鐢ㄧ數 1鐢ㄧ數 2娌硅��") + @ApiModelProperty(value = "绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补 3", example = "1") + @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;3=鐑熺;", width = 10,index = 0) private Integer type; @ApiModelProperty(value = "鏁伴噺 (鐢ㄧ數椤匡紝鐢ㄧ數搴︼紱 娌硅�桳锛�", example = "1") - @ExcelColumn(name="鏁伴噺 (鐢ㄧ數椤匡紝鐢ㄧ數搴︼紱 娌硅�桳锛�") + @ExcelColumn(name="鏁伴噺",index = 3, width = 10) private BigDecimal num; @ApiModelProperty(value = "璇存槑") - @ExcelColumn(name="璇存槑") + @ExcelColumn(name="璇存槑",index = 4, width = 20) private String content; @ApiModelProperty(value = "杞︾墝鍙�") - @ExcelColumn(name="杞︾墝鍙�") + @ExcelColumn(name="杞︾墝鍙�",index = 1, width = 10) private String carCode; @ApiModelProperty(value = "寮�濮嬫椂闂�") @TableField(exist = false) private Date startTime; + @ApiModelProperty(value = "骞存湀鏃堕棿") + @TableField(exist = false) + private String timeInfoStr; @ApiModelProperty(value = "寮�濮嬫椂闂�") @TableField(exist = false) private Date endTime; -- Gitblit v1.9.3