@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*; | |||
import lombok.Data; | |||
import java.math.BigDecimal; | |||
import java.util.Date; | |||
/** | |||
@@ -52,5 +52,9 @@ public class ZsOperationGoods { | |||
* 是否启用 | |||
*/ | |||
private String isDisabled; | |||
/** | |||
* 创建时间 | |||
*/ | |||
private Date createDate; | |||
} |
@@ -63,5 +63,11 @@ public class ZsOperationGoodsBo extends BaseEntity { | |||
*/ | |||
private String isDisabled; | |||
/** | |||
* 创建时间 | |||
*/ | |||
private Date createDate; | |||
} |
@@ -71,6 +71,10 @@ public class ZsOperationGoodsVo { | |||
@ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class) | |||
@ExcelDictFormat(dictType = "zs_is_disabled") | |||
private String isDisabled; | |||
/** | |||
* 创建时间 | |||
*/ | |||
@ExcelProperty(value = "创建时间") | |||
private Date createDate; | |||
} |
@@ -70,6 +70,8 @@ public class ZsOperationGoodsServiceImpl implements IZsOperationGoodsService { | |||
lqw.like(StringUtils.isNotBlank(bo.getGoodsSkuSn()), ZsOperationGoods::getGoodsSkuSn, bo.getGoodsSkuSn()); | |||
lqw.eq(StringUtils.isNotBlank(bo.getPlatform()), ZsOperationGoods::getPlatform, bo.getPlatform()); | |||
lqw.eq(StringUtils.isNotBlank(bo.getIsDisabled()), ZsOperationGoods::getIsDisabled, bo.getIsDisabled()); | |||
//按照创建时间倒叙查询 | |||
lqw.orderByDesc(ZsOperationGoods::getCreateDate); | |||
return lqw; | |||
} | |||
@@ -101,6 +101,8 @@ public class ZsOperationWarnresultServiceImpl implements IZsOperationWarnresultS | |||
lqw.eq(StringUtils.isNotBlank(bo.getGoodsSkuSn()), ZsOperationWarnresult::getGoodsSkuSn, bo.getGoodsSkuSn()); | |||
lqw.eq(bo.getStatus() != null, ZsOperationWarnresult::getStatus, bo.getStatus()); | |||
lqw.eq(bo.getCompareStatus() != null, ZsOperationWarnresult::getCompareStatus, bo.getCompareStatus()); | |||
//按照预警时间倒叙排列 | |||
lqw.orderByDesc(ZsOperationWarnresult::getWarnTime); | |||
return lqw; | |||
} | |||