FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_1' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-08-08 17:37:45 +08:00
parent 313251dbbd 6058cc036c
commit 11ef32d698
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+1
View File
@@ -83,6 +83,7 @@ public class SarStandardComplianceAssessResultController {
queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
} }
IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
while(page.getRecords().remove(null)); while(page.getRecords().remove(null));
return Result.success(page); return Result.success(page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
+4
View File
@@ -5,11 +5,13 @@ import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
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 lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
/** /**
* <p> * <p>
@@ -84,6 +86,8 @@ public class SarInterpretationNationalStandard extends BaseEntity {
@ApiModelProperty(value = "评估时间") @ApiModelProperty(value = "评估时间")
@TableField("INTERPRETATION_TIME") @TableField("INTERPRETATION_TIME")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date interpretationTime; private Date interpretationTime;
@TableField("ID") @TableField("ID")