From d724494314be02322ff46af014dc332fc877f866 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Sat, 18 Mar 2023 14:01:32 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/xmgl/modules/environment/entity/Pm10TodayData.java | 4 ++++ .../modules/worker/controller/ProjectWorkerApiController.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java index 7b45ed8b1..cbfe7d926 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java @@ -1,8 +1,10 @@ package com.zhgd.xmgl.modules.environment.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -10,6 +12,8 @@ import java.util.Date; @ApiModel(description = "今日PM10数据") public class Pm10TodayData { @ApiModelProperty(value = "数据上传时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date uploadDate; @ApiModelProperty(value = "PM10数据") private Double pm10; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java index 8d42533d2..eeb0b70b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java @@ -240,7 +240,7 @@ public class ProjectWorkerApiController { workerInfo.setAttendanceNumber(uuid); workerInfoService.save(workerInfo); } else { - if (workerVo.getOnlyCreate() == 0) { + if (workerVo.getOnlyCreate() == null || workerVo.getOnlyCreate() == 0) { workerInfo.setId(oldWorkerInfo.getId()); workerInfoService.updateById(workerInfo); }