审核通过之后,用车需求不给删除
This commit is contained in:
parent
76cb8173eb
commit
04fdd08b88
@ -128,7 +128,10 @@ public class VehicleDemandController extends JeecgController<VehicleDemand, IVeh
|
|||||||
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
VehicleDemand byId = vehicleDemandService.getById(id);
|
VehicleDemand byId = vehicleDemandService.getById(id);
|
||||||
// 删除用车计算中的数据
|
// 删除用车计算中的数据
|
||||||
vehicleDemandCountService.deleteByVdNo(byId.getVdNo());
|
boolean b = vehicleDemandCountService.deleteByVdNo(byId.getVdNo());
|
||||||
|
if (!b) {
|
||||||
|
return Result.error("用车需求计算含有已经审核通过的数据,不能删除!");
|
||||||
|
}
|
||||||
// 更新发货需求数据
|
// 更新发货需求数据
|
||||||
deliveryDemandService.updateByVdNo(byId.getVdNo(), "0");
|
deliveryDemandService.updateByVdNo(byId.getVdNo(), "0");
|
||||||
vehicleDemandService.removeById(id);
|
vehicleDemandService.removeById(id);
|
||||||
|
@ -14,7 +14,7 @@ import java.util.List;
|
|||||||
public interface IVehicleDemandCountService extends IService<VehicleDemandCount> {
|
public interface IVehicleDemandCountService extends IService<VehicleDemandCount> {
|
||||||
|
|
||||||
List<VehicleDemandCount> getByVdNo(String vdNo);
|
List<VehicleDemandCount> getByVdNo(String vdNo);
|
||||||
void deleteByVdNo(String vdNo);
|
boolean deleteByVdNo(String vdNo);
|
||||||
|
|
||||||
List<VehicleDemandCount> getVdCountById(String id);
|
List<VehicleDemandCount> getVdCountById(String id);
|
||||||
}
|
}
|
||||||
|
@ -29,10 +29,18 @@ public class VehicleDemandCountServiceImpl extends ServiceImpl<VehicleDemandCoun
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deleteByVdNo(String vdNo) {
|
public boolean deleteByVdNo(String vdNo) {
|
||||||
LambdaQueryWrapper<VehicleDemandCount> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<VehicleDemandCount> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.eq(VehicleDemandCount::getVdNo, vdNo);
|
lambdaQueryWrapper.eq(VehicleDemandCount::getVdNo, vdNo)
|
||||||
vehicleDemandCountMapper.delete(lambdaQueryWrapper);
|
.eq(VehicleDemandCount::getAuditResult, "1");
|
||||||
|
List<VehicleDemandCount> vehicleDemandCounts = vehicleDemandCountMapper.selectList(lambdaQueryWrapper);
|
||||||
|
if (vehicleDemandCounts != null && vehicleDemandCounts.size() > 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
LambdaQueryWrapper<VehicleDemandCount> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
|
||||||
|
lambdaQueryWrapper1.eq(VehicleDemandCount::getVdNo, vdNo);
|
||||||
|
vehicleDemandCountMapper.delete(lambdaQueryWrapper1);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
x
Reference in New Issue
Block a user