|
|
|
@ -16,6 +16,7 @@ import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
|
import jnpf.paymentdoc.entity.PaymentdocEntity;
|
|
|
|
|
import jnpf.poundlist.entity.PoundlistEntity;
|
|
|
|
|
import jnpf.poundlist.service.PoundlistService;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
@ -135,13 +136,26 @@ public class VehicleController {
|
|
|
|
|
public ActionResult create(@RequestBody @Valid VehicleCrForm vehicleCrForm) throws DataException {
|
|
|
|
|
String mainId =RandomUtil.uuId();
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
vehicleCrForm.setCreatortime(DateUtil.getNow());
|
|
|
|
|
VehicleEntity entity = JsonUtil.getJsonToBean(vehicleCrForm, VehicleEntity.class);
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
vehicleService.save(entity);
|
|
|
|
|
|
|
|
|
|
String userId=userProvider.get().getUserId();
|
|
|
|
|
String detpartment = null;
|
|
|
|
|
QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
|
|
|
|
|
vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno,vehicleCrForm.getTicketno());
|
|
|
|
|
vehicleQueryWrapper.lambda().eq(VehicleEntity::getDrivername,vehicleCrForm.getDrivername());
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()) {
|
|
|
|
|
detpartment = userProvider.getDepartmentId(userId);
|
|
|
|
|
vehicleQueryWrapper.lambda().eq(VehicleEntity::getDepartmentId,detpartment);
|
|
|
|
|
}
|
|
|
|
|
List<VehicleEntity> vehicleEntityList = vehicleService.list(vehicleQueryWrapper);
|
|
|
|
|
if (vehicleEntityList.size()>0){
|
|
|
|
|
return ActionResult.fail("已经存在该车辆信息");
|
|
|
|
|
}else {
|
|
|
|
|
vehicleCrForm.setCreatortime(DateUtil.getNow());
|
|
|
|
|
VehicleEntity entity = JsonUtil.getJsonToBean(vehicleCrForm, VehicleEntity.class);
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
vehicleService.save(entity);
|
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|