|
@@ -29,6 +29,7 @@ import org.springframework.util.StringUtils;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -507,6 +508,11 @@ public class ChuanyunBasicDataScheduledTask {
|
|
|
list.forEach(chuanyunLaborCostDTO -> {
|
|
|
try {
|
|
|
if(chuanyunLaborCostDTO != null) {
|
|
|
+ //日期格式化
|
|
|
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
|
|
|
+ String newDate = dateTimeFormatter.format(chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().getPeriod());
|
|
|
+ LocalDateTime dt = LocalDateTime.parse(newDate,dateTimeFormatter);
|
|
|
+ chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().setPeriod(dt);
|
|
|
LaborCostDTO laborCostDTO = new LaborCostDTO(chuanyunLaborCostDTO);
|
|
|
laborCostDTO.setDataType("U9");
|
|
|
var purcostString=objectMapper.writeValueAsString(laborCostDTO);
|
|
@@ -1095,6 +1101,8 @@ public class ChuanyunBasicDataScheduledTask {
|
|
|
private BigDecimal amount;
|
|
|
|
|
|
@JsonProperty("F0000002")
|
|
|
+ @JsonSerialize(using = ChuanyunLocalDateTimeSerializer.class)
|
|
|
+ @JsonDeserialize(using = ChuanyunLocalDateTimeDeserializer.class)
|
|
|
private LocalDateTime logDate;
|
|
|
|
|
|
@JsonProperty("F0000004")
|