CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:1173d670e4018043e7be0232f44623cdd086825b
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:ylc
..
compare: CaiXiang:1562854e5911a4a5aad42752679085916dffadb7
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:ylc

No commits in common. "1173d670e4018043e7be0232f44623cdd086825b" and "1562854e5911a4a5aad42752679085916dffadb7" have entirely different histories.
1173d670e4 ... 1562854e59

2 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

3
ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java
View File

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@ -31,7 +30,7 @@ public class InspectionSampleDTO implements Serializable {
private String batchNum; private String batchNum;
@ApiModelProperty(value = "取样时间") @ApiModelProperty(value = "取样时间")
private Instant sampleTime; private LocalDateTime sampleTime;
@ApiModelProperty(value = "样本号") @ApiModelProperty(value = "样本号")
private String sampleNumber; private String sampleNumber;

8
ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
View File

@ -238,8 +238,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
InspectionSampleDTO sampleDTO = new InspectionSampleDTO(); InspectionSampleDTO sampleDTO = new InspectionSampleDTO();
sampleDTO.setSampleNumber(sampleNumber); sampleDTO.setSampleNumber(sampleNumber);
//sampleDTO.setSampleTime(LocalDateTime.ofInstant(events.get(0).getTime(), ZoneId.systemDefault())); sampleDTO.setSampleTime(LocalDateTime.ofInstant(events.get(0).getTime(), ZoneId.systemDefault()));
sampleDTO.setSampleTime(events.get(0).getTime());
sampleDTO.setBatchNum(dto.getBatchNumber()); sampleDTO.setBatchNum(dto.getBatchNumber());
sampleDTO.setInspectionSheetId(events.get(0).getInspectionSheetId()); sampleDTO.setInspectionSheetId(events.get(0).getInspectionSheetId());
@ -265,9 +264,8 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
String sampleNumber = dto.getSampleNumber(); String sampleNumber = dto.getSampleNumber();
String jsonData = dto.getJsonData(); String jsonData = dto.getJsonData();
JSONObject json = JSON.parseObject(jsonData); JSONObject json = JSON.parseObject(jsonData);
// LocalDateTime sampleTime = dto.getSampleTime(); LocalDateTime sampleTime = dto.getSampleTime();
// Instant eventTime = sampleTime.toInstant(ZoneOffset.UTC); Instant eventTime = sampleTime.toInstant(ZoneOffset.UTC);
Instant eventTime = dto.getSampleTime();
List<Event> list = new ArrayList<>(); List<Event> list = new ArrayList<>();
for (Map.Entry entry : json.entrySet()) { for (Map.Entry entry : json.entrySet()) {
String key = entry.getKey().toString(); String key = entry.getKey().toString();