forked from integrated_whb/integrated_whb
BUG优化
parent
f922966913
commit
be7db01faa
|
@ -106,20 +106,6 @@ public class BeidouController extends BaseController {
|
|||
operatingVehiclesService.edit(resData);
|
||||
}
|
||||
beidouService.save(pd);
|
||||
PageData vehicle = new PageData();
|
||||
vehicle.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = operatingVehiclesService.findById(vehicle);
|
||||
if (!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData operation = new PageData();
|
||||
operation.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS"));
|
||||
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operatingVehiclesService.editInspectVehicleowner(operation);
|
||||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
|
|
|
@ -66,37 +66,6 @@ public class InspectAnnuallyController extends BaseController {
|
|||
pd.put("ARCHIVES_TYPE", "0"); //档案状态
|
||||
pd.put("VEHICLE",pd.get("PLATE_NUMBER"));
|
||||
inspectAnnuallyService.save(pd);
|
||||
if("1".equals(pd.getString("VEHICLE_MODEL"))) {
|
||||
PageData vehicle = new PageData();
|
||||
vehicle.put("OPERATING_ID", pd.getString("PLATE_NUMBER"));
|
||||
vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = operatingVehiclesService.findById(vehicle);
|
||||
if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData operation = new PageData();
|
||||
operation.put("OPERATING_ID", pd.getString("PLATE_NUMBER"));
|
||||
operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS"));
|
||||
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operatingVehiclesService.editInspectVehicleowner(operation);
|
||||
}
|
||||
}else {
|
||||
PageData traffic = new PageData();
|
||||
traffic.put("FREIGHTTRAILER_ID", pd.getString("PLATE_NUMBER"));
|
||||
traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData trafficInfo = freightTrailerService.findById(traffic);
|
||||
if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData data = new PageData();
|
||||
data.put("FREIGHTTRAILER_ID", pd.getString("PLATE_NUMBER"));
|
||||
data.put("CAR_OWNERS", pd.getString("CAR_OWNERS"));
|
||||
data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
freightTrailerService.editInspectTreight(data);
|
||||
}
|
||||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
|
@ -144,38 +113,6 @@ public class InspectAnnuallyController extends BaseController {
|
|||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
inspectAnnuallyService.edit(pd);
|
||||
if("1".equals(pd.getString("VEHICLE_MODEL"))) {
|
||||
PageData vehicle = new PageData();
|
||||
vehicle.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = operatingVehiclesService.findById(vehicle);
|
||||
if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData operation = new PageData();
|
||||
operation.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS"));
|
||||
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operatingVehiclesService.editInspectVehicleowner(operation);
|
||||
}
|
||||
}else {
|
||||
PageData traffic = new PageData();
|
||||
traffic.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData trafficInfo = freightTrailerService.findById(traffic);
|
||||
if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData data = new PageData();
|
||||
data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
data.put("CAR_OWNERS", pd.getString("CAR_OWNERS"));
|
||||
data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
freightTrailerService.editInspectTreight(data);
|
||||
}
|
||||
}
|
||||
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
|
|
|
@ -61,37 +61,6 @@ public class InsureController extends BaseController {
|
|||
pd.put("ISDELETE", "0"); //是否删除(0:有效 1:删除)
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||
pd.put("VEHICLE", pd.getString("PLATE_NUMBER"));
|
||||
if("1".equals(pd.getString("VEHICLE_MODEL"))) {
|
||||
PageData vehicle = new PageData();
|
||||
vehicle.put("OPERATING_ID", pd.getString("PLATE_NUMBER"));
|
||||
vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = operatingVehiclesService.findById(vehicle);
|
||||
if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData operation = new PageData();
|
||||
operation.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS"));
|
||||
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operatingVehiclesService.editInspectVehicleowner(operation);
|
||||
}
|
||||
}else {
|
||||
PageData traffic = new PageData();
|
||||
traffic.put("FREIGHTTRAILER_ID", pd.getString("PLATE_NUMBER"));
|
||||
traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData trafficInfo = freightTrailerService.findById(traffic);
|
||||
if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData data = new PageData();
|
||||
data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
data.put("CAR_OWNERS", pd.getString("CAR_OWNERS"));
|
||||
data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
freightTrailerService.editInspectTreight(data);
|
||||
}
|
||||
}
|
||||
insureService.save(pd);
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
|
@ -140,37 +109,6 @@ public class InsureController extends BaseController {
|
|||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
insureService.edit(pd);
|
||||
if("1".equals(pd.getString("VEHICLE_MODEL"))) {
|
||||
PageData vehicle = new PageData();
|
||||
vehicle.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = operatingVehiclesService.findById(vehicle);
|
||||
if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData operation = new PageData();
|
||||
operation.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS"));
|
||||
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operatingVehiclesService.editInspectVehicleowner(operation);
|
||||
}
|
||||
}else {
|
||||
PageData traffic = new PageData();
|
||||
traffic.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData trafficInfo = freightTrailerService.findById(traffic);
|
||||
if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData data = new PageData();
|
||||
data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
data.put("CAR_OWNERS", pd.getString("CAR_OWNERS"));
|
||||
data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
freightTrailerService.editInspectTreight(data);
|
||||
}
|
||||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
|
|
|
@ -63,21 +63,6 @@ public class MaintenanceController extends BaseController {
|
|||
pd.put("ARCHIVES_TYPE", "0"); //档案状态
|
||||
pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态
|
||||
maintenanceService.save(pd);
|
||||
PageData vehicle = new PageData();
|
||||
vehicle.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = operatingVehiclesService.findById(vehicle);
|
||||
if (!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData operation = new PageData();
|
||||
operation.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS"));
|
||||
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operatingVehiclesService.editInspectVehicleowner(operation);
|
||||
}
|
||||
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
|
|
|
@ -63,37 +63,6 @@ public class OperationsController extends BaseController {
|
|||
pd.put("ARCHIVES_TYPE", "0"); //档案状态
|
||||
pd.put("VEHICLE", pd.get("PLATE_NUMBER"));
|
||||
operationsService.save(pd);
|
||||
if("1".equals(pd.getString("VEHICLE_MODEL"))) {
|
||||
PageData vehicle = new PageData();
|
||||
vehicle.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = operatingVehiclesService.findById(vehicle);
|
||||
if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData operation = new PageData();
|
||||
operation.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS"));
|
||||
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operatingVehiclesService.editInspectVehicleowner(operation);
|
||||
}
|
||||
}else {
|
||||
PageData traffic = new PageData();
|
||||
traffic.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData trafficInfo = freightTrailerService.findById(traffic);
|
||||
if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData data = new PageData();
|
||||
data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
data.put("CAR_OWNERS", pd.getString("CAR_OWNERS"));
|
||||
data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
freightTrailerService.editInspectTreight(data);
|
||||
}
|
||||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
|
@ -141,37 +110,6 @@ public class OperationsController extends BaseController {
|
|||
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operationsService.edit(pd);
|
||||
if("1".equals(pd.getString("VEHICLE_MODEL"))) {
|
||||
PageData vehicle = new PageData();
|
||||
vehicle.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
vehicle.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData pageData = operatingVehiclesService.findById(vehicle);
|
||||
if(!StringUtils.equals(pageData.getString("VEHICLEOWNER"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData operation = new PageData();
|
||||
operation.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||
operation.put("VEHICLEOWNER", pd.getString("CAR_OWNERS"));
|
||||
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
operation.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
operation.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
operation.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
operatingVehiclesService.editInspectVehicleowner(operation);
|
||||
}
|
||||
}else {
|
||||
PageData traffic = new PageData();
|
||||
traffic.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData trafficInfo = freightTrailerService.findById(traffic);
|
||||
if(!StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("CAR_OWNERS"))) {
|
||||
PageData data = new PageData();
|
||||
data.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||
data.put("CAR_OWNERS", pd.getString("CAR_OWNERS"));
|
||||
data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
freightTrailerService.editInspectTreight(data);
|
||||
}
|
||||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
|
|
|
@ -70,20 +70,6 @@ public class TaxationManageController extends BaseController {
|
|||
}
|
||||
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
taxationManageService.save(pd);
|
||||
PageData traffic = new PageData();
|
||||
traffic.put("FREIGHTTRAILER_ID", pd.getString("FREIGHTTRAILER_ID"));
|
||||
traffic.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
PageData trafficInfo = freightTrailerService.findById(traffic);
|
||||
if(!org.apache.commons.lang.StringUtils.equals(trafficInfo.getString("CAR_OWNERS"), pd.getString("VEHICLEOWNER"))) {
|
||||
PageData data = new PageData();
|
||||
data.put("FREIGHTTRAILER_ID", pd.getString("FREIGHTTRAILER_ID"));
|
||||
data.put("CAR_OWNERS", pd.getString("VEHICLEOWNER"));
|
||||
data.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||
data.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
|
||||
data.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
|
||||
data.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
freightTrailerService.editInspectTreight(data);
|
||||
}
|
||||
map.put("pd", pd);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
|
|
Loading…
Reference in New Issue