|
|
@@ -147,6 +147,26 @@ public class MeterBaseCarController extends BaseRESTfulController {
|
|
|
public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseCar model) {
|
|
|
model.setId(id);
|
|
|
MeterBaseCar meterBaseCar = meterBaseCarService.modify(model);
|
|
|
+ meterBaseCar.setUpdateManNo("admin");
|
|
|
+ meterBaseCar.setUpdateManName("admins");
|
|
|
+ meterBaseCar.setUpdateTime(new Date());
|
|
|
+ if(StringUtils.isNotEmpty(meterBaseCar.getUsetDepartment())) {
|
|
|
+ HashMap<String, Object> map = new HashMap<>();
|
|
|
+ map.put("unitNo", meterBaseCar.getUsetDepartment());
|
|
|
+ List<MeterBaseSpecialUnit> specialUnit = meterBaseSpecialUnitMapper.selectByParameters(map);
|
|
|
+ if(specialUnit.size() >= 1) {
|
|
|
+ if(!specialUnit.get(0).getUnitNo().equals("888888")){
|
|
|
+ meterBaseCar.setUsetDepartmentNo(specialUnit.get(0).getUnitNo());
|
|
|
+ meterBaseCar.setUsetDepartment(specialUnit.get(0).getUnitName());
|
|
|
+ meterBaseCar.setIsSpecialunit("1");
|
|
|
+ }else{
|
|
|
+ meterBaseCar.setUsetDepartmentNo(specialUnit.get(0).getUnitNo());
|
|
|
+ meterBaseCar.setUsetDepartment(specialUnit.get(0).getUnitName());
|
|
|
+ meterBaseCar.setIsSpecialunit("0");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ meterBaseCarMapper.updateByPrimaryKeySelective(meterBaseCar);
|
|
|
+ }
|
|
|
return success(meterBaseCar);
|
|
|
}
|
|
|
|
|
|
@@ -333,8 +353,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
|
|
|
MeterBaseDriver list1 = meterBaseDriverMapper.selectByPrimaryKey(pkNO);
|
|
|
if(list1 == null){
|
|
|
meterBaseDriverService.checkandadd(driver);
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
list1.setValidFlag("0");
|
|
|
meterBaseDriverMapper.updateByPrimaryKeySelective(list1);
|
|
|
}
|
|
|
@@ -354,7 +373,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return failed(null, "操作异常,请确认!");
|
|
|
}
|
|
|
- return success();
|
|
|
+ return success("车辆注册成功");
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "app登录", notes = "app登录")
|