diff --git a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java index 30ee617..d84643d 100644 --- a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java +++ b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java @@ -26,7 +26,7 @@ public class ModSetupResult { private String coilId; @ApiModelProperty(value = "道次号") - private Integer passId; + private Integer passno; @ApiModelProperty(value = "机架号") private Integer standId; diff --git a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java index 242211c..c86ff32 100644 --- a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java +++ b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java @@ -14,12 +14,10 @@ public class CrmPdoExcoilForm { @ApiModelProperty(value = "钢卷号") private String encoilid; - @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "开始日期") - private LocalDateTime startDate; + private String startDate; - @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "结束日期") - private LocalDateTime endDate; + private String endDate; } diff --git a/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java b/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java index b90ade0..2ec56c8 100644 --- a/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java +++ b/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java @@ -13,7 +13,7 @@ public class ModSetupResultForm { private String grade; @ApiModelProperty(value = "道次号") - private Integer passId; + private Integer passno; @ApiModelProperty(value = "退火厚度") private Integer annealThick; diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java index a05072a..eee3fbb 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java @@ -67,8 +67,8 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ModSetupResult::getCalcId,calcId); + queryWrapper.eq(ModSetupResult::getCalcId, calcId); List results = this.baseMapper.selectList(queryWrapper); diff --git a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java index 1a97705..d93876c 100644 --- a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java +++ b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java @@ -23,7 +23,7 @@ public class ModSetupResultVO { private String coilId; @ApiModelProperty(value = "道次号") - private Integer passId; + private Integer passno; @ApiModelProperty(value = "入口厚度") private Float entryThick;