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

bug修改

Browse Source
This commit is contained in:
Administrator 2023-02-24 15:40:47 +08:00
parent e78adab54c
commit 0b0c5c743e
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java
View File

@ -56,7 +56,7 @@ public class MaterialApproachRecord implements Serializable {
*/ */
@Excel(name = "车牌号", width = 15) @Excel(name = "车牌号", width = 15)
@ApiModelProperty(value = "车牌号") @ApiModelProperty(value = "车牌号")
private Integer licensePlateNumber; private String licensePlateNumber;
/** /**
* 进场量 * 进场量
*/ */

3
src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java
View File

@ -86,5 +86,8 @@ public class MaterialDetectionReport implements Serializable {
@ApiModelProperty(value = "楼层") @ApiModelProperty(value = "楼层")
private String floor; private String floor;
@ApiModelProperty(value = "材料种类")
private String materialType;
} }

3
src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java
View File

@ -94,6 +94,7 @@ public class MaterialDetectionReportQO implements Serializable {
@ApiModelProperty(value = "楼层") @ApiModelProperty(value = "楼层")
private String floor; private String floor;
@ApiModelProperty(value = "材料种类")
private String materialType;
} }

3
src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java
View File

@ -50,7 +50,8 @@ public class MaterialDetectionReportServiceImpl extends ServiceImpl<MaterialDete
// 更新时间 yyyy-MM-dd HH:mm:ss 之后 // 更新时间 yyyy-MM-dd HH:mm:ss 之后
.ge(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getStartUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getStartUpdateDate()) .ge(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getStartUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getStartUpdateDate())
// 更新时间 yyyy-MM-dd HH:mm:ss 之前 // 更新时间 yyyy-MM-dd HH:mm:ss 之前
.le(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getEndUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getEndUpdateDate()); .le(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getEndUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getEndUpdateDate())
.eq(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getMaterialType()), MaterialDetectionReport::getMaterialType, materialDetectionReportQo.getMaterialType());
wrapper.orderByDesc(MaterialDetectionReport::getUpdateDate); wrapper.orderByDesc(MaterialDetectionReport::getUpdateDate);
return materialDetectionReportMapper.selectPage(page, wrapper); return materialDetectionReportMapper.selectPage(page, wrapper);
} }