admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
Administrator 2023-03-18 14:01:32 +08:00
parent c1c33b9a1b
commit d724494314
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java
View File

@ -1,8 +1,10 @@
package com.zhgd.xmgl.modules.environment.entity; package com.zhgd.xmgl.modules.environment.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@ -10,6 +12,8 @@ import java.util.Date;
@ApiModel(description = "今日PM10数据") @ApiModel(description = "今日PM10数据")
public class Pm10TodayData { public class Pm10TodayData {
@ApiModelProperty(value = "数据上传时间") @ApiModelProperty(value = "数据上传时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date uploadDate; private Date uploadDate;
@ApiModelProperty(value = "PM10数据") @ApiModelProperty(value = "PM10数据")
private Double pm10; private Double pm10;

2
src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
View File

@ -240,7 +240,7 @@ public class ProjectWorkerApiController {
workerInfo.setAttendanceNumber(uuid); workerInfo.setAttendanceNumber(uuid);
workerInfoService.save(workerInfo); workerInfoService.save(workerInfo);
} else { } else {
if (workerVo.getOnlyCreate() == 0) { if (workerVo.getOnlyCreate() == null || workerVo.getOnlyCreate() == 0) {
workerInfo.setId(oldWorkerInfo.getId()); workerInfo.setId(oldWorkerInfo.getId());
workerInfoService.updateById(workerInfo); workerInfoService.updateById(workerInfo);
} }