forked from integrated_whb/integrated_whb
BUG优化
parent
6544fe9706
commit
f922966913
|
@ -106,6 +106,20 @@ 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;
|
||||||
|
|
|
@ -66,6 +66,37 @@ 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;
|
||||||
|
@ -113,6 +144,38 @@ 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;
|
||||||
|
@ -163,10 +226,10 @@ public class InspectAnnuallyController extends BaseController {
|
||||||
varList.forEach(inspectAnnually -> {
|
varList.forEach(inspectAnnually -> {
|
||||||
boolean isScrapFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP")));
|
boolean isScrapFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISSCRAP")) || "1".equals(inspectAnnually.get("FREIGHT_ISSCRAP")));
|
||||||
boolean isAssignedFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED")));
|
boolean isAssignedFlag = varList.stream().anyMatch(data -> "1".equals(inspectAnnually.get("OPEAR_ISASSIGNED")) || "1".equals(inspectAnnually.get("FREIGHT_ISASSIGNED")));
|
||||||
if(isScrapFlag) {
|
if (isScrapFlag) {
|
||||||
inspectAnnually.put("ARCHIVES_TYPE","2");
|
inspectAnnually.put("ARCHIVES_TYPE", "2");
|
||||||
} else if (isAssignedFlag) {
|
} else if (isAssignedFlag) {
|
||||||
inspectAnnually.put("ARCHIVES_TYPE","1");
|
inspectAnnually.put("ARCHIVES_TYPE", "1");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
map.put("varList", varList);
|
map.put("varList", varList);
|
||||||
|
|
|
@ -47,7 +47,6 @@ public class InsureController extends BaseController {
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/add")
|
@RequestMapping(value = "/add")
|
||||||
// @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR)
|
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@LogAnno(menuType = "机务档案", menuServer = "保险管理", instructionsOperate = "保险管理", instructionsType = "新增")
|
@LogAnno(menuType = "机务档案", menuServer = "保险管理", instructionsOperate = "保险管理", instructionsType = "新增")
|
||||||
public Object add() throws Exception {
|
public Object add() throws Exception {
|
||||||
|
@ -61,7 +60,38 @@ public class InsureController extends BaseController {
|
||||||
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
|
||||||
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"));
|
||||||
|
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);
|
||||||
|
@ -110,6 +140,37 @@ 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;
|
||||||
|
@ -179,7 +240,19 @@ public class InsureController extends BaseController {
|
||||||
PageData pd = new PageData();
|
PageData pd = new PageData();
|
||||||
pd = this.getPageData();
|
pd = this.getPageData();
|
||||||
pd = insureService.findById(pd); //根据ID读取
|
pd = insureService.findById(pd); //根据ID读取
|
||||||
|
if("1".equals(pd.getString("VEHICLE_MODEL"))) {
|
||||||
|
PageData operation = new PageData();
|
||||||
|
operation.put("OPERATING_ID", pd.getString("VEHICLE"));
|
||||||
|
operation.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||||
|
PageData operationInfo = operatingVehiclesService.findById(operation);
|
||||||
|
pd.put("PLATE_NUMBER", operationInfo.getString("PLATE_NUMBER"));
|
||||||
|
}else {
|
||||||
|
PageData trailer = new PageData();
|
||||||
|
trailer.put("FREIGHTTRAILER_ID", pd.getString("VEHICLE"));
|
||||||
|
trailer.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
|
||||||
|
PageData operationInfo = freightTrailerService.findById(trailer);
|
||||||
|
pd.put("PLATE_NUMBER", operationInfo.getString("PLATE_NUMBER"));
|
||||||
|
}
|
||||||
pd.put("FOREIGN_KEY", pd.getString("INSURE_ID"));
|
pd.put("FOREIGN_KEY", pd.getString("INSURE_ID"));
|
||||||
pd.put("TYPE",125);
|
pd.put("TYPE",125);
|
||||||
List<PageData> insureinfoImgs = imgfilesService.listAll(pd);//保险资料图片
|
List<PageData> insureinfoImgs = imgfilesService.listAll(pd);//保险资料图片
|
||||||
|
|
|
@ -63,6 +63,21 @@ 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;
|
||||||
|
|
|
@ -63,6 +63,37 @@ 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;
|
||||||
|
@ -110,6 +141,37 @@ 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;
|
||||||
|
|
|
@ -70,6 +70,20 @@ 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;
|
||||||
|
|
|
@ -91,5 +91,6 @@ public interface FreightTrailerMapper {
|
||||||
|
|
||||||
List<PageData> getScrapPulldownVehicleList(String corpId);
|
List<PageData> getScrapPulldownVehicleList(String corpId);
|
||||||
|
|
||||||
|
void editInspectTreight(PageData pd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,4 +51,6 @@ public interface OperatingVehiclesMapper {
|
||||||
void setAssinedStatus(PageData operating);
|
void setAssinedStatus(PageData operating);
|
||||||
|
|
||||||
List<PageData> getScrapPulldownVehicleList(PageData pd);
|
List<PageData> getScrapPulldownVehicleList(PageData pd);
|
||||||
|
|
||||||
|
void editInspectVehicleowner(PageData pd);
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,5 +90,7 @@ public interface FreightTrailerService {
|
||||||
void setAssinedStatus(PageData freightTrailer);
|
void setAssinedStatus(PageData freightTrailer);
|
||||||
|
|
||||||
List<PageData> getScrapPulldownVehicleList(String corpId);
|
List<PageData> getScrapPulldownVehicleList(String corpId);
|
||||||
|
|
||||||
|
void editInspectTreight(PageData data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -142,5 +142,10 @@ public class FreightTrailerServiceImpl implements FreightTrailerService {
|
||||||
public List<PageData> getScrapPulldownVehicleList(String corpId) {
|
public List<PageData> getScrapPulldownVehicleList(String corpId) {
|
||||||
return freightTrailerMapper.getScrapPulldownVehicleList(corpId);
|
return freightTrailerMapper.getScrapPulldownVehicleList(corpId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void editInspectTreight(PageData pd) {
|
||||||
|
freightTrailerMapper.editInspectTreight(pd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,4 +51,6 @@ public interface OperatingVehiclesService {
|
||||||
void setAssinedStatus(PageData operating);
|
void setAssinedStatus(PageData operating);
|
||||||
|
|
||||||
List<PageData> getScrapPulldownVehicleList(PageData pd);
|
List<PageData> getScrapPulldownVehicleList(PageData pd);
|
||||||
|
|
||||||
|
void editInspectVehicleowner(PageData operation);
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,4 +86,9 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService {
|
||||||
public List<PageData> getScrapPulldownVehicleList(PageData pd) {
|
public List<PageData> getScrapPulldownVehicleList(PageData pd) {
|
||||||
return operatingVehiclesMapper.getScrapPulldownVehicleList(pd);
|
return operatingVehiclesMapper.getScrapPulldownVehicleList(pd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void editInspectVehicleowner(PageData pd) {
|
||||||
|
operatingVehiclesMapper.editInspectVehicleowner(pd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -394,8 +394,22 @@
|
||||||
CORPINFO_ID = #{CORPINFO_ID}
|
CORPINFO_ID = #{CORPINFO_ID}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
<update id="editInspectTreight">
|
||||||
|
update
|
||||||
|
<include refid="tableName"></include>
|
||||||
|
set
|
||||||
|
CAR_OWNERS = #{CAR_OWNERS},
|
||||||
|
OPERATOR = #{OPERATOR},
|
||||||
|
OPERATTIME = #{OPERATTIME},
|
||||||
|
OPERATORNAME = #{OPERATORNAME}
|
||||||
|
where
|
||||||
|
FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}
|
||||||
|
and
|
||||||
|
CORPINFO_ID = #{CORPINFO_ID}
|
||||||
|
</update>
|
||||||
|
|
||||||
<select id="getScrapPulldownVehicleList" resultType="com.zcloud.entity.PageData">
|
|
||||||
|
<select id="getScrapPulldownVehicleList" resultType="com.zcloud.entity.PageData">
|
||||||
select
|
select
|
||||||
*,
|
*,
|
||||||
v.ID
|
v.ID
|
||||||
|
|
|
@ -172,8 +172,7 @@
|
||||||
f.DELETEORNAME,
|
f.DELETEORNAME,
|
||||||
f.DELETTIME
|
f.DELETTIME
|
||||||
from
|
from
|
||||||
<include refid="tableName"></include>
|
<include refid="tableName"></include> f
|
||||||
f
|
|
||||||
where
|
where
|
||||||
f.INSURE_ID = #{INSURE_ID}
|
f.INSURE_ID = #{INSURE_ID}
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -329,6 +329,20 @@
|
||||||
CORPINFO_ID = #{CORPINFO_ID}
|
CORPINFO_ID = #{CORPINFO_ID}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
<update id="editInspectVehicleowner">
|
||||||
|
update
|
||||||
|
<include refid="tableName"></include>
|
||||||
|
set
|
||||||
|
VEHICLEOWNER = #{VEHICLEOWNER},
|
||||||
|
OPERATOR = #{OPERATOR},
|
||||||
|
OPERATORNAME = #{OPERATORNAME},
|
||||||
|
OPERATTIME = #{OPERATTIME}
|
||||||
|
where
|
||||||
|
OPERATING_ID = #{OPERATING_ID}
|
||||||
|
AND
|
||||||
|
CORPINFO_ID = #{CORPINFO_ID}
|
||||||
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<!-- 通过ID获取数据 -->
|
<!-- 通过ID获取数据 -->
|
||||||
<select id="findByfindByPlateNumber" parameterType="pd" resultType="pd">
|
<select id="findByfindByPlateNumber" parameterType="pd" resultType="pd">
|
||||||
|
|
Loading…
Reference in New Issue