删除标识更改
This commit is contained in:
parent
b53d9eecd3
commit
93087f564c
@ -79,7 +79,7 @@ public class ExampleOrderServiceImpl extends ServiceImpl<ExampleOrderMapper, Exa
|
|||||||
OrderWrapper.in(ExampleOrderEntity::getSaleMan,ids);
|
OrderWrapper.in(ExampleOrderEntity::getSaleMan,ids);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OrderWrapper.isNull(ExampleOrderEntity::getDeleteMark);
|
OrderWrapper.eq(ExampleOrderEntity::getDeleteMark,"1");
|
||||||
OrderWrapper.orderByDesc(ExampleOrderEntity::getCreatorTime);
|
OrderWrapper.orderByDesc(ExampleOrderEntity::getCreatorTime);
|
||||||
if("0".equals(exampleOrderPagination.getDataType())){
|
if("0".equals(exampleOrderPagination.getDataType())){
|
||||||
Page<ExampleOrderEntity> page=new Page<>(exampleOrderPagination.getCurrentPage(), exampleOrderPagination.getPageSize());
|
Page<ExampleOrderEntity> page=new Page<>(exampleOrderPagination.getCurrentPage(), exampleOrderPagination.getPageSize());
|
||||||
@ -140,6 +140,7 @@ public class ExampleOrderServiceImpl extends ServiceImpl<ExampleOrderMapper, Exa
|
|||||||
// entity.setId(mainId);
|
// entity.setId(mainId);
|
||||||
String saleOrdNo = generateSaleOrdNo(entity.getOrdType());
|
String saleOrdNo = generateSaleOrdNo(entity.getOrdType());
|
||||||
entity.setSaleOrdNo(saleOrdNo);
|
entity.setSaleOrdNo(saleOrdNo);
|
||||||
|
entity.setDeleteMark(1);
|
||||||
}
|
}
|
||||||
this.saveOrUpdate(entity);
|
this.saveOrUpdate(entity);
|
||||||
if (ObjectUtil.isNotEmpty(OrderForm.getOrderDetailList())){
|
if (ObjectUtil.isNotEmpty(OrderForm.getOrderDetailList())){
|
||||||
@ -179,7 +180,7 @@ public class ExampleOrderServiceImpl extends ServiceImpl<ExampleOrderMapper, Exa
|
|||||||
|
|
||||||
LambdaQueryWrapper<ExampleOrderEntity> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ExampleOrderEntity> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(ExampleOrderEntity::getOrdType, ordType);
|
queryWrapper.eq(ExampleOrderEntity::getOrdType, ordType);
|
||||||
queryWrapper.eq(ExampleOrderEntity::getDeleteMark, null);
|
queryWrapper.eq(ExampleOrderEntity::getDeleteMark, "1");
|
||||||
queryWrapper.likeRight(ExampleOrderEntity::getSaleOrdNo, prefix + ym);
|
queryWrapper.likeRight(ExampleOrderEntity::getSaleOrdNo, prefix + ym);
|
||||||
queryWrapper.orderByDesc(ExampleOrderEntity::getSaleOrdNo);
|
queryWrapper.orderByDesc(ExampleOrderEntity::getSaleOrdNo);
|
||||||
queryWrapper.last("LIMIT 1");
|
queryWrapper.last("LIMIT 1");
|
||||||
|
|||||||
@ -1030,7 +1030,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
let _data = this.dataForm
|
let _data = this.dataForm
|
||||||
if (this.dataFormSubmitType == 0&&isDetail!='change') {
|
if (this.dataFormSubmitType == 0&&this.isDetail!='change') {
|
||||||
_data.ordStatus=1
|
_data.ordStatus=1
|
||||||
}else {
|
}else {
|
||||||
_data.ordStatus=2
|
_data.ordStatus=2
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user