wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

BUG优化

dev
xiepeng 2024-04-16 17:30:29 +08:00
parent f922966913
commit be7db01faa
6 changed files with 0 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zcloud/controller/beidou/BeidouController.java
View File

@ -106,20 +106,6 @@ public class BeidouController extends BaseController {
operatingVehiclesService.edit(resData); operatingVehiclesService.edit(resData);
} }
beidouService.save(pd); 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("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;

63
src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java
View File

@ -66,37 +66,6 @@ public class InspectAnnuallyController extends BaseController {
pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("ARCHIVES_TYPE", "0"); //档案状态
pd.put("VEHICLE",pd.get("PLATE_NUMBER")); pd.put("VEHICLE",pd.get("PLATE_NUMBER"));
inspectAnnuallyService.save(pd); 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("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -144,38 +113,6 @@ public class InspectAnnuallyController extends BaseController {
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
inspectAnnuallyService.edit(pd); 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("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;

62
src/main/java/com/zcloud/controller/insure/InsureController.java
View File

@ -61,37 +61,6 @@ public class InsureController extends BaseController {
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
pd.put("VEHICLE", pd.getString("PLATE_NUMBER")); 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); insureService.save(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -140,37 +109,6 @@ public class InsureController extends BaseController {
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
insureService.edit(pd); 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("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;

15
src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java
View File

@ -63,21 +63,6 @@ public class MaintenanceController extends BaseController {
pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("ARCHIVES_TYPE", "0"); //档案状态
pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态 pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态
maintenanceService.save(pd); 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("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;

62
src/main/java/com/zcloud/controller/operations/OperationsController.java
View File

@ -63,37 +63,6 @@ public class OperationsController extends BaseController {
pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("ARCHIVES_TYPE", "0"); //档案状态
pd.put("VEHICLE", pd.get("PLATE_NUMBER")); pd.put("VEHICLE", pd.get("PLATE_NUMBER"));
operationsService.save(pd); 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("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
@ -141,37 +110,6 @@ public class OperationsController extends BaseController {
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
operationsService.edit(pd); 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("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;

14
src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java
View File

@ -70,20 +70,6 @@ public class TaxationManageController extends BaseController {
} }
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
taxationManageService.save(pd); 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("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;