Skip to content

李苗 / Vion-DevOps

Go to a project
Commit c41fc881 by HlQ
Options

[chg] 统一日期时间的输出格式

1 parent dbaf1ce6
Inline Side-by-side
Showing 68 changed files with 40 additions and 251 deletions
src/main/java/vion/config/JacksonConfig.java 0 → 100644
package vion.config;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.time.format.DateTimeFormatter;
/**
* @author vion
* @date 2024/9/18
*/
@Configuration
public class JacksonConfig {
private static final String dateTimeFormat = "yyyy-MM-dd HH:mm:ss";
private static final String timeFormat = "HH:mm:ss";
@Bean
public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
return builder -> {
builder.serializers(new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(dateTimeFormat)));
builder.serializers(new LocalTimeSerializer(DateTimeFormatter.ofPattern(timeFormat)));
};
}
}
src/main/java/vion/controller/RUserRoleController.java
package vion.controller; package vion.controller;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.hutool.core.lang.Opt;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.hutool.core.lang.Opt;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
......
src/main/java/vion/dto/ContractPaymentDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -30,7 +29,6 @@ public class ContractPaymentDTO { ...@@ -30,7 +29,6 @@ public class ContractPaymentDTO {
/** /**
* 节点日期，指合同到这一阶段时的时间 * 节点日期，指合同到这一阶段时的时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate nodeDate; private LocalDate nodeDate;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/dto/DeliverLogDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -37,7 +36,6 @@ public class DeliverLogDTO extends BaseDTO { ...@@ -37,7 +36,6 @@ public class DeliverLogDTO extends BaseDTO {
/** /**
* 日志日期 * 日志日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate logDate; private LocalDate logDate;
......
src/main/java/vion/dto/DeliveryRecordDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -51,14 +50,12 @@ public class DeliveryRecordDTO extends BaseDTO { ...@@ -51,14 +50,12 @@ public class DeliveryRecordDTO extends BaseDTO {
/** /**
* 发货日期 * 发货日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate shipDate; private LocalDate shipDate;
/** /**
* 到货签收日期 * 到货签收日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate signDate; private LocalDate signDate;
......
src/main/java/vion/dto/FormDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -40,7 +39,6 @@ public class FormDTO extends BaseDTO { ...@@ -40,7 +39,6 @@ public class FormDTO extends BaseDTO {
/** /**
* 签字时间 * 签字时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime signTime; private LocalDateTime signTime;
/** /**
......
src/main/java/vion/dto/InspectDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -23,7 +22,6 @@ public class InspectDTO extends BaseDTO { ...@@ -23,7 +22,6 @@ public class InspectDTO extends BaseDTO {
/** /**
* 巡检时间 * 巡检时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate inspectDate; private LocalDate inspectDate;
/** /**
...@@ -46,13 +44,11 @@ public class InspectDTO extends BaseDTO { ...@@ -46,13 +44,11 @@ public class InspectDTO extends BaseDTO {
/** /**
* 完成时间 * 完成时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate finishDate; private LocalDate finishDate;
/** /**
* 审核时间 * 审核时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate auditDate; private LocalDate auditDate;
/** /**
......
src/main/java/vion/dto/InvoiceDTO.java
package vion.dto; package vion.dto;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -23,7 +22,6 @@ public class InvoiceDTO extends BaseDTO { ...@@ -23,7 +22,6 @@ public class InvoiceDTO extends BaseDTO {
/** /**
* 开票时间 * 开票时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate invoicingTime; private LocalDate invoicingTime;
/** /**
......
src/main/java/vion/dto/PaymentDTO.java
package vion.dto; package vion.dto;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -30,7 +29,6 @@ public class PaymentDTO extends BaseDTO { ...@@ -30,7 +29,6 @@ public class PaymentDTO extends BaseDTO {
/** /**
* 收款时间 * 收款时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate collectionTime; private LocalDate collectionTime;
/** /**
......
src/main/java/vion/dto/RepairRecDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -86,7 +85,6 @@ public class RepairRecDTO extends BaseDTO { ...@@ -86,7 +85,6 @@ public class RepairRecDTO extends BaseDTO {
/** /**
* 发货日期 * 发货日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate shipDate; private LocalDate shipDate;
......
src/main/java/vion/dto/ServiceOrderDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -32,7 +31,6 @@ public class ServiceOrderDTO extends BaseDTO { ...@@ -32,7 +31,6 @@ public class ServiceOrderDTO extends BaseDTO {
/** /**
* 报修时间 * 报修时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime submitTime; private LocalDateTime submitTime;
/** /**
...@@ -98,13 +96,11 @@ public class ServiceOrderDTO extends BaseDTO { ...@@ -98,13 +96,11 @@ public class ServiceOrderDTO extends BaseDTO {
/** /**
* 签字时间 * 签字时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime signTime; private LocalDateTime signTime;
/** /**
* 完成时间 * 完成时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime finishTime; private LocalDateTime finishTime;
/** /**
* 项目id * 项目id
......
src/main/java/vion/dto/SparePartDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -81,7 +80,6 @@ public class SparePartDTO extends BaseDTO { ...@@ -81,7 +80,6 @@ public class SparePartDTO extends BaseDTO {
/** /**
* 发货日期 * 发货日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate shipDate; private LocalDate shipDate;
......
src/main/java/vion/dto/StoreDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -69,7 +68,6 @@ public class StoreDTO extends BaseDTO { ...@@ -69,7 +68,6 @@ public class StoreDTO extends BaseDTO {
* 立项日期 * 立项日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate estDate; private LocalDate estDate;
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate estDateStart; private LocalDate estDateStart;
...@@ -98,7 +96,6 @@ public class StoreDTO extends BaseDTO { ...@@ -98,7 +96,6 @@ public class StoreDTO extends BaseDTO {
/** /**
* 预计完成日期 * 预计完成日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate finishDate; private LocalDate finishDate;
/** /**
* 完成百分比 * 完成百分比
...@@ -127,7 +124,6 @@ public class StoreDTO extends BaseDTO { ...@@ -127,7 +124,6 @@ public class StoreDTO extends BaseDTO {
/** /**
* 计划完成日期 * 计划完成日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate planFinishDate; private LocalDate planFinishDate;
/** /**
* 项目规模 * 项目规模
......
src/main/java/vion/dto/TaskDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -22,7 +21,6 @@ public class TaskDTO extends BaseDTO { ...@@ -22,7 +21,6 @@ public class TaskDTO extends BaseDTO {
* 报修日期 * 报修日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime repairTime; private LocalDateTime repairTime;
/** /**
* 故障类型 * 故障类型
...@@ -48,7 +46,6 @@ public class TaskDTO extends BaseDTO { ...@@ -48,7 +46,6 @@ public class TaskDTO extends BaseDTO {
* 解决日期 * 解决日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate solveDate; private LocalDate solveDate;
/** /**
* 故障原因 * 故障原因
...@@ -75,7 +72,6 @@ public class TaskDTO extends BaseDTO { ...@@ -75,7 +72,6 @@ public class TaskDTO extends BaseDTO {
* 截止日期 * 截止日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate expDate; private LocalDate expDate;
/** /**
......
src/main/java/vion/dto/TaskTempDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -20,7 +19,6 @@ public class TaskTempDTO extends BaseDTO { ...@@ -20,7 +19,6 @@ public class TaskTempDTO extends BaseDTO {
/** /**
* 报修日期 * 报修日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime repairTime; private LocalDateTime repairTime;
/** /**
......
src/main/java/vion/dto/UserDTO.java
package vion.dto; package vion.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -17,10 +16,7 @@ public class UserDTO extends BaseDTO { ...@@ -17,10 +16,7 @@ public class UserDTO extends BaseDTO {
private String username; private String username;
private String phone; private String phone;
private Long deptId; private Long deptId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
private String remark; private String remark;
/** /**
......
src/main/java/vion/model/Account.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime;
@Getter @Getter
@Setter @Setter
...@@ -28,18 +29,25 @@ public class Account extends BaseDTO { ...@@ -28,18 +29,25 @@ public class Account extends BaseDTO {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
@TableField(exist = false)
private LocalDateTime dt;
@TableField(exist = false)
private LocalDate d;
@TableField(exist = false)
private LocalTime t;
} }
src/main/java/vion/model/ContractLog.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -47,10 +46,8 @@ public class ContractLog { ...@@ -47,10 +46,8 @@ public class ContractLog {
* 确认日期 * 确认日期
*/ */
@TableField(value = "rec_time") @TableField(value = "rec_time")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate recTime; private LocalDate recTime;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/Dept.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -17,10 +16,8 @@ public class Dept { ...@@ -17,10 +16,8 @@ public class Dept {
private String deptName; private String deptName;
private Long parentId; private Long parentId;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/DeviceLog.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -39,6 +38,5 @@ public class DeviceLog { ...@@ -39,6 +38,5 @@ public class DeviceLog {
private String content; private String content;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/Dictionary.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -28,13 +27,11 @@ public class Dictionary { ...@@ -28,13 +27,11 @@ public class Dictionary {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
src/main/java/vion/model/DictionaryType.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -28,13 +27,11 @@ public class DictionaryType { ...@@ -28,13 +27,11 @@ public class DictionaryType {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
src/main/java/vion/model/FaultLog.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -40,7 +39,6 @@ public class FaultLog { ...@@ -40,7 +39,6 @@ public class FaultLog {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 备注 * 备注
......
src/main/java/vion/model/RContractProduct.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -92,10 +91,8 @@ public class RContractProduct { ...@@ -92,10 +91,8 @@ public class RContractProduct {
private BigDecimal totalPrice; private BigDecimal totalPrice;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RContractStore.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -52,13 +51,11 @@ public class RContractStore { ...@@ -52,13 +51,11 @@ public class RContractStore {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RContractUser.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
...@@ -54,10 +53,8 @@ public class RContractUser extends BaseDTO { ...@@ -54,10 +53,8 @@ public class RContractUser extends BaseDTO {
* 录入日期 * 录入日期
*/ */
@TableField(value = "enter_date") @TableField(value = "enter_date")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate enterDate; private LocalDate enterDate;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RPointDevice.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -31,10 +30,8 @@ public class RPointDevice { ...@@ -31,10 +30,8 @@ public class RPointDevice {
private String deviceNo; private String deviceNo;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RPointWx.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -37,10 +36,8 @@ public class RPointWx { ...@@ -37,10 +36,8 @@ public class RPointWx {
private String openid; private String openid;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RRepairDevice.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
...@@ -135,10 +134,8 @@ public class RRepairDevice extends BaseDTO { ...@@ -135,10 +134,8 @@ public class RRepairDevice extends BaseDTO {
private String remark; private String remark;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RRoleResource.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -40,13 +39,11 @@ public class RRoleResource { ...@@ -40,13 +39,11 @@ public class RRoleResource {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RStoreConfederate.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
...@@ -46,13 +45,11 @@ public class RStoreConfederate extends BaseDTO { ...@@ -46,13 +45,11 @@ public class RStoreConfederate extends BaseDTO {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RStoreTag.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -31,10 +30,8 @@ public class RStoreTag { ...@@ -31,10 +30,8 @@ public class RStoreTag {
private Long tagId; private Long tagId;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RStoreUser.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -42,12 +41,10 @@ public class RStoreUser { ...@@ -42,12 +41,10 @@ public class RStoreUser {
private Integer isMain; private Integer isMain;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@OrderBy @OrderBy
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
@TableField(exist = false) @TableField(exist = false)
......
src/main/java/vion/model/RUserRole.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -40,13 +39,11 @@ public class RUserRole { ...@@ -40,13 +39,11 @@ public class RUserRole {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/RejectInfo.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
...@@ -38,10 +37,8 @@ public class RejectInfo extends BaseDTO { ...@@ -38,10 +37,8 @@ public class RejectInfo extends BaseDTO {
private String content; private String content;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/Resource.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -78,14 +77,12 @@ public class Resource { ...@@ -78,14 +77,12 @@ public class Resource {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/Role.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -53,14 +52,12 @@ public class Role { ...@@ -53,14 +52,12 @@ public class Role {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/ServiceOrder.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -40,7 +39,6 @@ public class ServiceOrder { ...@@ -40,7 +39,6 @@ public class ServiceOrder {
/** /**
* 报修时间 * 报修时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime submitTime; private LocalDateTime submitTime;
/** /**
...@@ -97,14 +95,12 @@ public class ServiceOrder { ...@@ -97,14 +95,12 @@ public class ServiceOrder {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** /**
...@@ -120,13 +116,11 @@ public class ServiceOrder { ...@@ -120,13 +116,11 @@ public class ServiceOrder {
/** /**
* 签字时间 * 签字时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime signTime; private LocalDateTime signTime;
/** /**
* 完成时间 * 完成时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime finishTime; private LocalDateTime finishTime;
/** /**
......
src/main/java/vion/model/Store.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -59,14 +58,12 @@ public class Store { ...@@ -59,14 +58,12 @@ public class Store {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
/** /**
...@@ -87,7 +84,6 @@ public class Store { ...@@ -87,7 +84,6 @@ public class Store {
/** /**
* 立项日期 * 立项日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate estDate; private LocalDate estDate;
/** /**
......
src/main/java/vion/model/StoreLog.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -31,7 +30,6 @@ public class StoreLog extends BaseDTO { ...@@ -31,7 +30,6 @@ public class StoreLog extends BaseDTO {
*/ */
@TableField(value = "log_date") @TableField(value = "log_date")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate logDate; private LocalDate logDate;
/** /**
...@@ -47,11 +45,9 @@ public class StoreLog extends BaseDTO { ...@@ -47,11 +45,9 @@ public class StoreLog extends BaseDTO {
private String content; private String content;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@OrderBy @OrderBy
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/Tag.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
...@@ -32,10 +31,8 @@ public class Tag extends BaseDTO { ...@@ -32,10 +31,8 @@ public class Tag extends BaseDTO {
private String remark; private String remark;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/model/Task.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -34,7 +33,6 @@ public class Task { ...@@ -34,7 +33,6 @@ public class Task {
* 报修日期 * 报修日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@OrderBy(sort = 2) @OrderBy(sort = 2)
private LocalDateTime repairTime; private LocalDateTime repairTime;
/** /**
...@@ -64,7 +62,6 @@ public class Task { ...@@ -64,7 +62,6 @@ public class Task {
* 解决日期 * 解决日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate solveDate; private LocalDate solveDate;
/** /**
* 故障原因 * 故障原因
...@@ -90,21 +87,18 @@ public class Task { ...@@ -90,21 +87,18 @@ public class Task {
* 截止日期 * 截止日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate expDate; private LocalDate expDate;
/** /**
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
/** /**
......
src/main/java/vion/model/TaskTemp.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -35,7 +34,6 @@ public class TaskTemp { ...@@ -35,7 +34,6 @@ public class TaskTemp {
* 报修时间 * 报修时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@OrderBy(sort = 2) @OrderBy(sort = 2)
private LocalDateTime repairTime; private LocalDateTime repairTime;
...@@ -67,14 +65,12 @@ public class TaskTemp { ...@@ -67,14 +65,12 @@ public class TaskTemp {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
/** /**
......
src/main/java/vion/model/User.java
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Getter; import lombok.Getter;
...@@ -30,11 +29,9 @@ public class User { ...@@ -30,11 +29,9 @@ public class User {
private String phone; private String phone;
private Long deptId; private Long deptId;
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE) @TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
private String remark; private String remark;
/** /**
......
src/main/java/vion/vo/ConstructionTeamVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -20,10 +19,6 @@ public class ConstructionTeamVO { ...@@ -20,10 +19,6 @@ public class ConstructionTeamVO {
* 城市 * 城市
*/ */
private String city; private String city;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/vo/ContractPaymentVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -34,13 +33,11 @@ public class ContractPaymentVO { ...@@ -34,13 +33,11 @@ public class ContractPaymentVO {
/** /**
* 收款日期 * 收款日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate paymentDate; private LocalDate paymentDate;
/** /**
* 节点日期，指合同到这一阶段时的时间 * 节点日期，指合同到这一阶段时的时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate nodeDate; private LocalDate nodeDate;
/** /**
...@@ -56,12 +53,10 @@ public class ContractPaymentVO { ...@@ -56,12 +53,10 @@ public class ContractPaymentVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/vo/ContractVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import lombok.Getter; import lombok.Getter;
...@@ -41,21 +40,18 @@ public class ContractVO { ...@@ -41,21 +40,18 @@ public class ContractVO {
/** /**
* 合同签订日期 * 合同签订日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelColumn(order = 4, title = "签订日期", format = "yyyy-MM-dd") @ExcelColumn(order = 4, title = "签订日期", format = "yyyy-MM-dd")
private LocalDate signDate; private LocalDate signDate;
/** /**
* 合同维保开始日期 * 合同维保开始日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelColumn(order = 5, title = "维保开始日期", format = "yyyy-MM-dd") @ExcelColumn(order = 5, title = "维保开始日期", format = "yyyy-MM-dd")
private LocalDate maintainSdate; private LocalDate maintainSdate;
/** /**
* 合同维保结束日期 * 合同维保结束日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelColumn(order = 6, title = "维保结束日期", format = "yyyy-MM-dd") @ExcelColumn(order = 6, title = "维保结束日期", format = "yyyy-MM-dd")
private LocalDate maintainEdate; private LocalDate maintainEdate;
...@@ -131,13 +127,11 @@ public class ContractVO { ...@@ -131,13 +127,11 @@ public class ContractVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
/** /**
...@@ -148,7 +142,6 @@ public class ContractVO { ...@@ -148,7 +142,6 @@ public class ContractVO {
/** /**
* 终验日期 * 终验日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate finalDate; private LocalDate finalDate;
/** /**
...@@ -170,7 +163,6 @@ public class ContractVO { ...@@ -170,7 +163,6 @@ public class ContractVO {
/** /**
* 录入时间 * 录入时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime entryTime; private LocalDateTime entryTime;
/** /**
......
src/main/java/vion/vo/DeliverLogVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.model.RContractUser; import vion.model.RContractUser;
...@@ -41,7 +40,6 @@ public class DeliverLogVO { ...@@ -41,7 +40,6 @@ public class DeliverLogVO {
/** /**
* 日志日期 * 日志日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate logDate; private LocalDate logDate;
/** /**
...@@ -68,12 +66,10 @@ public class DeliverLogVO { ...@@ -68,12 +66,10 @@ public class DeliverLogVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/vo/DeliveryRecordVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.model.FileInfo; import vion.model.FileInfo;
...@@ -48,13 +47,11 @@ public class DeliveryRecordVO { ...@@ -48,13 +47,11 @@ public class DeliveryRecordVO {
/** /**
* 发货日期 * 发货日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate shipDate; private LocalDate shipDate;
/** /**
* 到货签收日期 * 到货签收日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate signDate; private LocalDate signDate;
/** /**
...@@ -80,13 +77,11 @@ public class DeliveryRecordVO { ...@@ -80,13 +77,11 @@ public class DeliveryRecordVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
private List<FileInfo> fileList; private List<FileInfo> fileList;
......
src/main/java/vion/vo/DeviceVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.model.DeviceLog; import vion.model.DeviceLog;
...@@ -57,18 +56,13 @@ public class DeviceVO { ...@@ -57,18 +56,13 @@ public class DeviceVO {
/** /**
* 入库日期 * 入库日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate recDate; private LocalDate recDate;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
private List<DeviceLog> logList; private List<DeviceLog> logList;
......
src/main/java/vion/vo/FileInfoVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -51,7 +50,6 @@ public class FileInfoVO { ...@@ -51,7 +50,6 @@ public class FileInfoVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 备注 * 备注
......
src/main/java/vion/vo/FinancialAgeVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -27,7 +26,6 @@ public class FinancialAgeVO { ...@@ -27,7 +26,6 @@ public class FinancialAgeVO {
/** /**
* 应付日期 * 应付日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate payableDate; private LocalDate payableDate;
/** /**
* 财龄 * 财龄
......
src/main/java/vion/vo/FormVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -43,7 +42,6 @@ public class FormVO { ...@@ -43,7 +42,6 @@ public class FormVO {
/** /**
* 签字时间 * 签字时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime signTime; private LocalDateTime signTime;
/** /**
...@@ -64,10 +62,6 @@ public class FormVO { ...@@ -64,10 +62,6 @@ public class FormVO {
private Long createUser; private Long createUser;
private Long updateUser; private Long updateUser;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/vo/InspectVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -19,7 +18,6 @@ public class InspectVO { ...@@ -19,7 +18,6 @@ public class InspectVO {
/** /**
* 巡检时间 * 巡检时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate inspectDate; private LocalDate inspectDate;
/** /**
...@@ -42,25 +40,21 @@ public class InspectVO { ...@@ -42,25 +40,21 @@ public class InspectVO {
/** /**
* 巡检时间 * 巡检时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate finishDate; private LocalDate finishDate;
/** /**
* 审核时间 * 审核时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate auditDate; private LocalDate auditDate;
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
/** /**
* 备注 * 备注
......
src/main/java/vion/vo/InvoiceVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import lombok.Getter; import lombok.Getter;
...@@ -26,7 +25,6 @@ public class InvoiceVO { ...@@ -26,7 +25,6 @@ public class InvoiceVO {
/** /**
* 开票时间 * 开票时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelColumn(order = 1, title = "开票时间", format = "yyyy-MM-dd") @ExcelColumn(order = 1, title = "开票时间", format = "yyyy-MM-dd")
private LocalDate invoicingTime; private LocalDate invoicingTime;
...@@ -53,11 +51,7 @@ public class InvoiceVO { ...@@ -53,11 +51,7 @@ public class InvoiceVO {
*/ */
@ExcelColumn(order = 4, title = "流水号") @ExcelColumn(order = 4, title = "流水号")
private String serialNo; private String serialNo;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ExcelColumn(order = 6, title = "录入时间") @ExcelColumn(order = 6, title = "录入时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/vo/PaymentVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import lombok.Getter; import lombok.Getter;
...@@ -31,7 +30,6 @@ public class PaymentVO { ...@@ -31,7 +30,6 @@ public class PaymentVO {
/** /**
* 收款时间 * 收款时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelColumn(order = 2, title = "收款时间", format = "yyyy-MM-dd") @ExcelColumn(order = 2, title = "收款时间", format = "yyyy-MM-dd")
private LocalDate collectionTime; private LocalDate collectionTime;
...@@ -46,10 +44,6 @@ public class PaymentVO { ...@@ -46,10 +44,6 @@ public class PaymentVO {
*/ */
@ExcelColumn(order = 4, title = "备注") @ExcelColumn(order = 4, title = "备注")
private String remark; private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/vo/PointInfoVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import com.github.liaochong.myexcel.core.constant.LinkType; import com.github.liaochong.myexcel.core.constant.LinkType;
...@@ -243,12 +242,7 @@ public class PointInfoVO { ...@@ -243,12 +242,7 @@ public class PointInfoVO {
* 单子施工后的设备序列号列表 * 单子施工后的设备序列号列表
*/ */
private List<String> deviceNoList; private List<String> deviceNoList;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** /**
......
src/main/java/vion/vo/RContractTeamVO.java
package vion.vo; package vion.vo;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -48,13 +47,11 @@ public class RContractTeamVO { ...@@ -48,13 +47,11 @@ public class RContractTeamVO {
/** /**
* 分配日期 * 分配日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate assignDate; private LocalDate assignDate;
/** /**
* 完成日期 * 完成日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate finishDate; private LocalDate finishDate;
/** /**
...@@ -77,11 +74,7 @@ public class RContractTeamVO { ...@@ -77,11 +74,7 @@ public class RContractTeamVO {
* 备注 * 备注
*/ */
private String remark; private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
private Integer contractStatus; private Integer contractStatus;
......
src/main/java/vion/vo/RepairRecVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.model.RRepairDevice; import vion.model.RRepairDevice;
...@@ -102,7 +101,6 @@ public class RepairRecVO { ...@@ -102,7 +101,6 @@ public class RepairRecVO {
/** /**
* 发货日期 * 发货日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate shipDate; private LocalDate shipDate;
/** /**
...@@ -131,11 +129,7 @@ public class RepairRecVO { ...@@ -131,11 +129,7 @@ public class RepairRecVO {
* 备注 * 备注
*/ */
private String remark; private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
private List<RRepairDevice> repairDeviceList; private List<RRepairDevice> repairDeviceList;
......
src/main/java/vion/vo/ResourceVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -58,13 +57,11 @@ public class ResourceVO { ...@@ -58,13 +57,11 @@ public class ResourceVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/vo/RoleVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -18,9 +17,7 @@ public class RoleVO { ...@@ -18,9 +17,7 @@ public class RoleVO {
private String code; private String code;
private Integer status; private Integer status;
private String remark; private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
private Long userId; private Long userId;
......
src/main/java/vion/vo/ServiceOrderVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -28,7 +27,6 @@ public class ServiceOrderVO { ...@@ -28,7 +27,6 @@ public class ServiceOrderVO {
/** /**
* 报修时间 * 报修时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime submitTime; private LocalDateTime submitTime;
/** /**
...@@ -84,13 +82,11 @@ public class ServiceOrderVO { ...@@ -84,13 +82,11 @@ public class ServiceOrderVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** /**
...@@ -106,13 +102,11 @@ public class ServiceOrderVO { ...@@ -106,13 +102,11 @@ public class ServiceOrderVO {
/** /**
* 签字时间 * 签字时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime signTime; private LocalDateTime signTime;
/** /**
* 完成时间 * 完成时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime finishTime; private LocalDateTime finishTime;
/** /**
......
src/main/java/vion/vo/SettlementDiffVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -50,6 +49,5 @@ public class SettlementDiffVO { ...@@ -50,6 +49,5 @@ public class SettlementDiffVO {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
} }
\ No newline at end of file \ No newline at end of file
src/main/java/vion/vo/SparePartVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import com.github.liaochong.myexcel.core.annotation.MultiColumn; import com.github.liaochong.myexcel.core.annotation.MultiColumn;
...@@ -95,7 +94,6 @@ public class SparePartVO { ...@@ -95,7 +94,6 @@ public class SparePartVO {
/** /**
* 发货日期 * 发货日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate shipDate; private LocalDate shipDate;
/** /**
...@@ -132,11 +130,7 @@ public class SparePartVO { ...@@ -132,11 +130,7 @@ public class SparePartVO {
* 微信用户id * 微信用户id
*/ */
private String openid; private String openid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
private List<RRepairDevice> repairDeviceList; private List<RRepairDevice> repairDeviceList;
......
src/main/java/vion/vo/StoreVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.model.StoreLog; import vion.model.StoreLog;
...@@ -45,15 +44,12 @@ public class StoreVO { ...@@ -45,15 +44,12 @@ public class StoreVO {
* 修改者 * 修改者
*/ */
private Integer modifyUser; private Integer modifyUser;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
/** /**
* 立项日期 * 立项日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate estDate; private LocalDate estDate;
/** /**
* 备注 * 备注
...@@ -89,7 +85,6 @@ public class StoreVO { ...@@ -89,7 +85,6 @@ public class StoreVO {
/** /**
* 实际完成日期 * 实际完成日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate finishDate; private LocalDate finishDate;
/** /**
* 完成百分比 * 完成百分比
...@@ -112,7 +107,6 @@ public class StoreVO { ...@@ -112,7 +107,6 @@ public class StoreVO {
/** /**
* 计划完成日期 * 计划完成日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate planFinishDate; private LocalDate planFinishDate;
/** /**
......
src/main/java/vion/vo/TaskTempVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.model.FileInfo; import vion.model.FileInfo;
...@@ -31,7 +30,6 @@ public class TaskTempVO { ...@@ -31,7 +30,6 @@ public class TaskTempVO {
/** /**
* 报修时间 * 报修时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime repairTime; private LocalDateTime repairTime;
/** /**
* 故障说明 * 故障说明
...@@ -49,9 +47,7 @@ public class TaskTempVO { ...@@ -49,9 +47,7 @@ public class TaskTempVO {
* 状态（1待确认、2已确认） * 状态（1待确认、2已确认）
*/ */
private Integer status; private Integer status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
private String remark; private String remark;
/** /**
......
src/main/java/vion/vo/TaskVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import lombok.Getter; import lombok.Getter;
...@@ -41,7 +40,6 @@ public class TaskVO { ...@@ -41,7 +40,6 @@ public class TaskVO {
* 报修日期 * 报修日期
*/ */
@ExcelColumn(order = 5, title = "提交时间", format = "yyyy-MM-dd HH:mm:ss") @ExcelColumn(order = 5, title = "提交时间", format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime repairTime; private LocalDateTime repairTime;
/** /**
* 故障类型 * 故障类型
...@@ -71,7 +69,6 @@ public class TaskVO { ...@@ -71,7 +69,6 @@ public class TaskVO {
/** /**
* 解决日期 * 解决日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate solveDate; private LocalDate solveDate;
/** /**
* 故障原因 * 故障原因
...@@ -98,11 +95,8 @@ public class TaskVO { ...@@ -98,11 +95,8 @@ public class TaskVO {
* 截止日期 * 截止日期
*/ */
@ExcelColumn(order = 8, title = "截止日期", format = "yyyy-MM-dd") @ExcelColumn(order = 8, title = "截止日期", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate expDate; private LocalDate expDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
/** /**
* 备注 * 备注
......
src/main/java/vion/vo/UserVO.java
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import vion.model.Resource; import vion.model.Resource;
...@@ -16,10 +15,7 @@ public class UserVO { ...@@ -16,10 +15,7 @@ public class UserVO {
private String username; private String username;
private String phone; private String phone;
private Long deptId; private Long deptId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modifyTime; private LocalDateTime modifyTime;
private String remark; private String remark;
/** /**
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!