统一时间格式

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysProcurementStandard.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
@@ -18,12 +19,12 @@ import java.util.Date;
 @TableName("sys_procurement_standard")
 public class SysProcurementStandard implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
     @ApiModelProperty(value = "采购标准ID")
     @TableField("procurement_standard_id")
     @TableId(type = IdType.AUTO)
     private Long procurementStandardId;
-    
+
     @ApiModelProperty(value = "部门ID")
     @TableField("dept_id")
     private Long deptId;
@@ -37,20 +38,22 @@ public class SysProcurementStandard implements Serializable {
     @ApiModelProperty(value = "状态")
     @TableField("state")
     private Integer state;
-    
+
     @ApiModelProperty(value = "最小值(万元)")
     @TableField("minimum_value")
     private BigDecimal minimumValue;
-    
+
     @ApiModelProperty(value = "最大值(万元)")
     @TableField("maximum")
     private BigDecimal maximum;
-    
+
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
-    
+
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("update_time")
     private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/base/domain/BaseExpert.java

@@ -128,6 +128,7 @@ public class BaseExpert extends BaseDto {
      */
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -142,5 +143,6 @@ public class BaseExpert extends BaseDto {
      */
     @ApiModelProperty(value = "更新时间")
     @TableField("update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/base/domain/BaseUnitInformation.java

@@ -2,6 +2,7 @@ package com.ozs.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -32,6 +33,7 @@ public class BaseUnitInformation {
      * 创建人
      */
     @ApiModelProperty(value = "创建人")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("created")
     private String created;
 
@@ -39,6 +41,7 @@ public class BaseUnitInformation {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("create_time")
     private Date createTime;
 }

purchase-system/src/main/java/com/ozs/base/domain/vo/BaseExpertVo.java

@@ -139,6 +139,7 @@ public class BaseExpertVo extends PageVo {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -151,5 +152,6 @@ public class BaseExpertVo extends PageVo {
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/base/service/impl/BaseExpertServiceImpl.java

@@ -85,7 +85,7 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
         // 通过专家ID查询 与专家库关联的采购执行管理ID
         List<Integer> demandIdList = pmDemandExpertRefService.selectByExpertId(baseExpertVo.getId());
         if (ObjectUtils.isEmpty(demandIdList)) {
-            return AjaxResult.success(null);
+            return AjaxResult.success(demandIdList);
         }
         List<PmDemand> pmDemandList = pmDemandService.selectByDemandIdList(demandIdList);
         List<PmDemandResVo> pmDemandResponseVoList = changTo(pmDemandList);

purchase-system/src/main/java/com/ozs/pm/doman/PmBidFailure.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -59,6 +60,7 @@ public class PmBidFailure implements Serializable {
 
     @ApiModelProperty("创建时间")
     @TableField("CREATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
@@ -68,6 +70,7 @@ public class PmBidFailure implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/pm/doman/PmBidOpening.java

@@ -64,6 +64,7 @@ public class PmBidOpening implements Serializable {
 
     @ApiModelProperty("创建时间")
     @TableField("CREATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
@@ -73,6 +74,7 @@ public class PmBidOpening implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/pm/doman/PmBidWinning.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -67,6 +68,7 @@ public class PmBidWinning implements Serializable {
 
     @ApiModelProperty("创建时间")
     @TableField("CREATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
@@ -77,6 +79,7 @@ public class PmBidWinning implements Serializable {
 
     @ApiModelProperty("更新时间")
     @TableField("UPDATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
 

purchase-system/src/main/java/com/ozs/pm/doman/PmBidWinningOpeningRef.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -57,6 +58,7 @@ public class PmBidWinningOpeningRef implements Serializable {
 
     @ApiModelProperty("创建时间")
     @TableField("CREATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
@@ -66,6 +68,7 @@ public class PmBidWinningOpeningRef implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/pm/doman/PmBookBuilding.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -63,6 +64,7 @@ public class PmBookBuilding implements Serializable {
 
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Date createTime;
 
@@ -73,6 +75,7 @@ public class PmBookBuilding implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/pm/doman/PmContractInfo.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -74,6 +75,7 @@ public class PmContractInfo implements Serializable {
 
     @ApiModelProperty("创建时间")
     @TableField("CREATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
@@ -83,6 +85,7 @@ public class PmContractInfo implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/pm/doman/PmDemand.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -174,6 +175,7 @@ public class PmDemand implements Serializable {
 
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Date createTime;
 
@@ -184,6 +186,7 @@ public class PmDemand implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandExpertRef.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -57,6 +58,7 @@ public class PmDemandExpertRef implements Serializable {
 
     @ApiModelProperty("创建时间")
     @TableField("CREATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
@@ -66,6 +68,7 @@ public class PmDemandExpertRef implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/pm/doman/PmFlowChart.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -59,6 +60,7 @@ public class PmFlowChart implements Serializable {
 
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Date createTime;
 
@@ -69,6 +71,7 @@ public class PmFlowChart implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/pm/doman/PmProjectConstruction.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -68,6 +69,7 @@ public class PmProjectConstruction implements Serializable {
 
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Date createTime;
 
@@ -78,6 +80,7 @@ public class PmProjectConstruction implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/pm/doman/PmReleaseAnnouncement.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -79,6 +80,7 @@ public class PmReleaseAnnouncement implements Serializable {
 
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Date createTime;
 
@@ -89,6 +91,7 @@ public class PmReleaseAnnouncement implements Serializable {
 
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("UPDATE_TIME")
     private Date updateTime;
 

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysProcurementStandardVo.java

@@ -16,10 +16,10 @@ import java.util.Date;
 @Data
 public class SysProcurementStandardVo implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
     @ApiModelProperty(value = "采购标准ID")
     private Long procurementStandardId;
-    
+
     @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
@@ -30,16 +30,18 @@ public class SysProcurementStandardVo implements Serializable {
     /** 状态(0不限1限额) */
     @ApiModelProperty(value = "状态")
     private Integer state;
-    
+
     @ApiModelProperty(value = "最小值(万元)")
     private BigDecimal minimumValue;
-    
+
     @ApiModelProperty(value = "最大值(万元)")
     private BigDecimal maximum;
-    
+
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
-    
+
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 }