From 06395c0c05c5d64f12be5dbc86e7f7579d8cf1b0 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 17 Apr 2024 13:01:53 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/beidou/BeidouController.java | 8 ++++---- .../TrafficDrivingCommitmentController.java | 6 +++--- .../TrafficDrivingTypeController.java | 6 +++--- .../TrafficSafetyMeetingController.java | 2 +- ...SecurityAccidentInvestigationController.java | 2 +- ...ficSecurityCustomerManagementController.java | 6 +++--- ...icSecurityManagementAgreementController.java | 2 +- .../TrafficSecurityNoticeController.java | 6 +++--- ...SecurityViolationRegistrationController.java | 2 +- ...icSecurityWaybillRegistrationController.java | 4 ++-- .../EnterpriseSafetyProductionController.java | 9 +++------ .../EquipmentFacilityController.java | 12 +++--------- ...FirefightingEquipmentFacilityController.java | 9 +++------ .../FreighttTrailerController.java | 12 ++++++------ .../InspectAnnuallyController.java | 8 ++++---- .../controller/insure/InsureController.java | 8 ++++---- .../LabourEntrenchThingController.java | 6 +++--- .../maintenance/MaintenanceController.java | 13 +++++++------ .../OperatingVehiclesController.java | 13 +++++-------- .../operations/OperationsController.java | 8 ++++---- .../ReportedIncidentController.java | 6 +++--- .../SafetyInvestmentPlanController.java | 2 +- .../TaxationManageController.java | 17 +++-------------- 23 files changed, 71 insertions(+), 96 deletions(-) diff --git a/src/main/java/com/zcloud/controller/beidou/BeidouController.java b/src/main/java/com/zcloud/controller/beidou/BeidouController.java index 901435a..8c5ba41 100644 --- a/src/main/java/com/zcloud/controller/beidou/BeidouController.java +++ b/src/main/java/com/zcloud/controller/beidou/BeidouController.java @@ -66,7 +66,7 @@ public class BeidouController extends BaseController { pd = this.getPageData(); pd.put("BEIDOU_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID @@ -127,7 +127,7 @@ public class BeidouController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id - pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 beidouService.delete(pd); map.put("result", errInfo); //返回结果 @@ -150,7 +150,7 @@ public class BeidouController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 PageData operationData = new PageData(); operationData.put("OPERATING_ID", pd.get("VEHICLE")); @@ -188,7 +188,7 @@ public class BeidouController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 beidouService.edit2(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java index 390f67a..5a004f3 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java @@ -46,7 +46,7 @@ public class TrafficDrivingCommitmentController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键 pd.put("ISDELETE", "0"); //是否删除 pd.put("INQUIRYCONCLUSION","正常"); - pd.put("CREATORNAME", Jurisdiction.getUsername()); + pd.put("CREATORNAME", Jurisdiction.getName()); pd.put("CREATOR", Jurisdiction.getUSER_ID()); //创建人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 trafficDrivingCommitmentService.save(pd); @@ -68,7 +68,7 @@ public class TrafficDrivingCommitmentController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //操作人 - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //操作人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //操作人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //操作时间 trafficDrivingCommitmentService.edit(pd); @@ -106,7 +106,7 @@ public class TrafficDrivingCommitmentController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 trafficDrivingCommitmentService.delete(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java index 2bc7740..a0f7314 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java @@ -40,7 +40,7 @@ public class TrafficDrivingTypeController extends BaseController { pd.put("DRIVINGTYPE_ID", this.get32UUID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键 pd.put("ISDELETE", "0"); //是否删除 - pd.put("CREATORNAME", Jurisdiction.getUsername()); + pd.put("CREATORNAME", Jurisdiction.getName()); pd.put("CREATOR", Jurisdiction.getUSER_ID()); //创建人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 trafficDrivingTypeService.save(pd); @@ -62,7 +62,7 @@ public class TrafficDrivingTypeController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //操作人 - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //操作人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //操作人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //操作时间 trafficDrivingTypeService.edit(pd); @@ -102,7 +102,7 @@ public class TrafficDrivingTypeController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 trafficDrivingTypeService.delete(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java index a9fe0f8..0e19964 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java @@ -174,7 +174,7 @@ public class TrafficSafetyMeetingController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 trafficSafetyMeetingService.delete(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java index cb82bb1..a0b7193 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java @@ -112,7 +112,7 @@ public class TrafficSecurityAccidentInvestigationController extends BaseControll PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 accidentInvestigationService.delete(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index 7a64ce9..314b776 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -109,7 +109,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 customerManagementService.delete(pd); map.put("result", errInfo); @@ -170,7 +170,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController pageData.put("ISDELETE", "0"); pageData.put("CUSTOMERCONTACT_ID", this.get32UUID()); pageData.put("CREATOR", Jurisdiction.getUSER_ID()); - pageData.put("CREATORNAME", Jurisdiction.getUsername()); + pageData.put("CREATORNAME", Jurisdiction.getName()); pageData.put("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID")); pageData.put("CONTACT_ID", this.get32UUID()); pageData.put("CREATETIME", DateUtil.date2Str(new Date())); @@ -203,7 +203,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 customerManagementService.deleteContactById(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java index e556296..1a592cd 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java @@ -171,7 +171,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 managementAgreementService.delete(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java index 0f55c19..f1a8830 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -278,7 +278,7 @@ public class TrafficSecurityNoticeController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 securityNoticeService.delete(pd); securityReadDetail.delete(pd); @@ -303,7 +303,7 @@ public class TrafficSecurityNoticeController extends BaseController { String ArrayDATA_IDS[] = DATA_IDS.split(","); for (String id : ArrayDATA_IDS) { pd.put("NOTIFICATION_ID", id); - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 securityNoticeService.delete(pd); } @@ -340,7 +340,7 @@ public class TrafficSecurityNoticeController extends BaseController { issue.put("PERSON_ID",personIds[i].trim()); issue.put("ISDELETE", "0"); issue.put("CREATOR", Jurisdiction.getUSER_ID()); - issue.put("CREATORNAME", Jurisdiction.getUsername()); + issue.put("CREATORNAME", Jurisdiction.getName()); issue.put("CREATETIME",DateUtil.date2Str(new Date())); // 编写发布的 insert trafficSecurityReadDetailService.save(issue); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java index 9d3e0d2..1713cd6 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java @@ -98,7 +98,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 violationRegistrationService.delete(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 8433e48..9208c83 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -133,7 +133,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 trafficSecurityWaybillRegistrationService.delete(pd); map.put("result", errInfo); @@ -157,7 +157,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController String ArrayDATA_IDS[] = DATA_IDS.split(","); for (String id : ArrayDATA_IDS) { pd.put("WAYBILLREGISTRATION_ID", id); - pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人 + pd.put("DELETORNAME", Jurisdiction.getName());//删除人 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 trafficSecurityWaybillRegistrationService.delete(pd); } diff --git a/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java b/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java index 26d1a27..be72cf3 100644 --- a/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java +++ b/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java @@ -46,7 +46,7 @@ public class EnterpriseSafetyProductionController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 enterpriseSafetyProductionService.save(pd); map.put("pd", pd); @@ -66,7 +66,7 @@ public class EnterpriseSafetyProductionController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID()); - pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETORNAME", Jurisdiction.getName()); pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); enterpriseSafetyProductionService.delete(pd); @@ -86,11 +86,8 @@ public class EnterpriseSafetyProductionController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) - pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 enterpriseSafetyProductionService.edit(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java b/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java index 1d38ae6..4e43b7e 100644 --- a/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java +++ b/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java @@ -48,11 +48,8 @@ public class EquipmentFacilityController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 equipmentFacilityService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -71,7 +68,7 @@ public class EquipmentFacilityController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID()); - pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETORNAME", Jurisdiction.getName()); pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); equipmentFacilityService.delete(pd); @@ -91,11 +88,8 @@ public class EquipmentFacilityController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) - pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 equipmentFacilityService.edit(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java b/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java index 655aff2..2a03f69 100644 --- a/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java +++ b/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java @@ -48,7 +48,7 @@ public class FirefightingEquipmentFacilityController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 firefightingEquipmentFacilityService.save(pd); map.put("pd", pd); @@ -68,7 +68,7 @@ public class FirefightingEquipmentFacilityController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID()); - pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETORNAME", Jurisdiction.getName()); pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); firefightingEquipmentFacilityService.delete(pd); @@ -88,11 +88,8 @@ public class FirefightingEquipmentFacilityController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) - pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 firefightingEquipmentFacilityService.edit(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java index 3d908e0..e847931 100644 --- a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java +++ b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java @@ -72,7 +72,7 @@ public class FreighttTrailerController extends BaseController { pd = this.getPageData(); pd.put("FREIGHTTRAILER_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID @@ -110,7 +110,7 @@ public class FreighttTrailerController extends BaseController { scrapAddData.put("VEHICLEOWNER", findPageData.get("CAR_OWNERS")); scrapAddData.put("CONTACT_NUMBER", findPageData.get("CONTACT_PHONE")); scrapAddData.put("SCRAP_DATE", DateUtil.date2Str(new Date())); - scrapAddData.put("REGISTRANT", Jurisdiction.getUsername()); + scrapAddData.put("REGISTRANT", Jurisdiction.getName()); scrapAddData.put("CREATTIME", DateUtil.date2Str(new Date())); scrapAddData.put("OPERATTIME", DateUtil.date2Str(new Date())); scrapAddData.put("VEHICLEOWNER_NUMBER", findPageData.get("CAR_OWNERS_TEL")); @@ -125,7 +125,7 @@ public class FreighttTrailerController extends BaseController { scrapManageService.save(scrapAddData); } pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id - pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 freightTrailerService.delete(pd); map.put("result", errInfo); //返回结果 @@ -148,7 +148,7 @@ public class FreighttTrailerController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 PageData freightTrailer = freightTrailerService.findById(pd); @@ -324,9 +324,9 @@ public class FreighttTrailerController extends BaseController { riskunit.put("NOTES", lpd.get("var19")); riskunit.put("FREIGHTTRAILER_ID", this.get32UUID()); riskunit.put("ISDELETE", "0"); - riskunit.put("CREATOR", Jurisdiction.getUsername()); + riskunit.put("CREATOR", Jurisdiction.getName()); riskunit.put("CREATTIME", DateUtil.date2Str(new Date())); - riskunit.put("OPERATOR", Jurisdiction.getUsername()); + riskunit.put("OPERATOR", Jurisdiction.getName()); riskunit.put("OPERATTIME", DateUtil.date2Str(new Date())); riskunit.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); riskunitList.add(riskunit); diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java index accaab4..33e03d7 100644 --- a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -59,7 +59,7 @@ public class InspectAnnuallyController extends BaseController { pd = this.getPageData(); pd.put("INSPECTANNUALLY_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID @@ -87,7 +87,7 @@ public class InspectAnnuallyController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id - pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 inspectAnnuallyService.delete(pd); map.put("result", errInfo); //返回结果 @@ -110,7 +110,7 @@ public class InspectAnnuallyController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 inspectAnnuallyService.edit(pd); map.put("pd", pd); @@ -134,7 +134,7 @@ public class InspectAnnuallyController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 inspectAnnuallyService.edit2(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java index b44ace9..260b17d 100644 --- a/src/main/java/com/zcloud/controller/insure/InsureController.java +++ b/src/main/java/com/zcloud/controller/insure/InsureController.java @@ -56,7 +56,7 @@ public class InsureController extends BaseController { pd = this.getPageData(); pd.put("INSURE_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID @@ -83,7 +83,7 @@ public class InsureController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id - pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 insureService.delete(pd); map.put("result", errInfo); //返回结果 @@ -106,7 +106,7 @@ public class InsureController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 insureService.edit(pd); map.put("pd", pd); @@ -130,7 +130,7 @@ public class InsureController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 insureService.edit2(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java b/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java index 2e1f1df..f8a3f65 100644 --- a/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java +++ b/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java @@ -44,7 +44,7 @@ public class LabourEntrenchThingController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 labourEntrenchThingService.save(pd); map.put("pd", pd); @@ -64,7 +64,7 @@ public class LabourEntrenchThingController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID()); - pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETORNAME", Jurisdiction.getName()); pd.put("DELETTIME", DateUtil.date2Str(new Date())); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); labourEntrenchThingService.delete(pd); @@ -85,7 +85,7 @@ public class LabourEntrenchThingController extends BaseController { pd = this.getPageData(); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 labourEntrenchThingService.edit(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java index 7e6de49..0e8d720 100644 --- a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java +++ b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java @@ -56,7 +56,7 @@ public class MaintenanceController extends BaseController { pd = this.getPageData(); pd.put("MAINTENANCE_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID @@ -84,7 +84,7 @@ public class MaintenanceController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id - pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 maintenanceService.delete(pd); map.put("result", errInfo); //返回结果 @@ -107,7 +107,7 @@ public class MaintenanceController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 maintenanceService.edit(pd); map.put("pd", pd); @@ -131,7 +131,7 @@ public class MaintenanceController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 maintenanceService.edit2(pd); map.put("pd", pd); @@ -160,9 +160,10 @@ public class MaintenanceController extends BaseController { for (PageData operation : varList) { if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { operation.put("ARCHIVES_TYPE", "2"); - } - if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { + } else if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) { operation.put("ARCHIVES_TYPE", "1"); + }else{ + operation.put("ARCHIVES_TYPE", "0"); } } map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index fdb3193..e255bef 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -63,9 +63,6 @@ public class OperatingVehiclesController extends BaseController { pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("NETWORK_STATUS", "未入网"); pd.put("ISSCRAP", "0"); @@ -98,7 +95,7 @@ public class OperatingVehiclesController extends BaseController { scrapAddData.put("VEHICLEOWNER", findPageData.get("VEHICLEOWNER")); scrapAddData.put("CONTACT_NUMBER", findPageData.get("CONTACT_NUMBER")); scrapAddData.put("SCRAP_DATE", DateUtil.date2Str(new Date())); - scrapAddData.put("REGISTRANT", Jurisdiction.getUsername()); + scrapAddData.put("REGISTRANT", Jurisdiction.getName()); scrapAddData.put("CREATTIME", DateUtil.date2Str(new Date())); scrapAddData.put("OPERATTIME", DateUtil.date2Str(new Date())); scrapAddData.put("VEHICLEOWNER_NUMBER", findPageData.get("VEHICLEOWNER_NUMBER")); @@ -112,7 +109,7 @@ public class OperatingVehiclesController extends BaseController { scrapManageService.save(scrapAddData); } pd.put("DELETOR", Jurisdiction.getUSER_ID()); - pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETORNAME", Jurisdiction.getName()); pd.put("DELETTIME", DateUtil.date2Str(new Date())); operatingVehiclesService.delete(pd); map.put("result", errInfo); //返回结果 @@ -131,7 +128,7 @@ public class OperatingVehiclesController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getCORPINFO_ID()); - pd.put("OPERATORNAME", Jurisdiction.getUsername()); + pd.put("OPERATORNAME", Jurisdiction.getName()); pd.put("OPERATTIME", DateUtil.date2Str(new Date())); PageData operation = operatingVehiclesService.findById(pd); List assignedList = assignedManageService.assignedList(pd.getString("CORPINFO_ID")); @@ -460,9 +457,9 @@ public class OperatingVehiclesController extends BaseController { riskunit.put("REMARK", lpd.get("var18")); riskunit.put("OPERATING_ID", this.get32UUID()); riskunit.put("ISDELETE", "0"); - riskunit.put("CREATOR", Jurisdiction.getUsername()); + riskunit.put("CREATOR", Jurisdiction.getName()); riskunit.put("CREATTIME", DateUtil.date2Str(new Date())); - riskunit.put("OPERATOR", Jurisdiction.getUsername()); + riskunit.put("OPERATOR", Jurisdiction.getName()); riskunit.put("OPERATTIME", DateUtil.date2Str(new Date())); riskunit.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); riskunitList.add(riskunit); diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java index 90b4c4a..fd1b8e6 100644 --- a/src/main/java/com/zcloud/controller/operations/OperationsController.java +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -56,7 +56,7 @@ public class OperationsController extends BaseController { pd = this.getPageData(); pd.put("OPERATIONS_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID @@ -84,7 +84,7 @@ public class OperationsController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id - pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 operationsService.delete(pd); map.put("result", errInfo); //返回结果 @@ -107,7 +107,7 @@ public class OperationsController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 operationsService.edit(pd); map.put("pd", pd); @@ -131,7 +131,7 @@ public class OperationsController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 operationsService.edit2(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/reportedIncident/ReportedIncidentController.java b/src/main/java/com/zcloud/controller/reportedIncident/ReportedIncidentController.java index 2b35c06..93f0a97 100644 --- a/src/main/java/com/zcloud/controller/reportedIncident/ReportedIncidentController.java +++ b/src/main/java/com/zcloud/controller/reportedIncident/ReportedIncidentController.java @@ -51,7 +51,7 @@ public class ReportedIncidentController extends BaseController { pd = this.getPageData(); pd.put("REPORTEDINCIDENT_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID @@ -78,7 +78,7 @@ public class ReportedIncidentController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id - pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 reportedIncidentService.delete(pd); map.put("result", errInfo); //返回结果 @@ -101,7 +101,7 @@ public class ReportedIncidentController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 reportedIncidentService.edit(pd); map.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentPlanController.java b/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentPlanController.java index 2b5c0a8..cdb1822 100644 --- a/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentPlanController.java +++ b/src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentPlanController.java @@ -75,7 +75,7 @@ public class SafetyInvestmentPlanController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 40e164d..c5219aa 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -55,7 +55,7 @@ public class TaxationManageController extends BaseController { pd.put("TAXATION_ID", this.get32UUID()); //车船税主键 pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id - pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATORNAME", Jurisdiction.getName()); //添加人名字 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ARCHIVES_TYPE", "0"); //档案状态 if("".equals(pd.getString("EXPIRE_STATUS"))) { @@ -87,7 +87,7 @@ public class TaxationManageController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("DELETOR", Jurisdiction.getUSER_ID()); - pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETORNAME", Jurisdiction.getName()); pd.put("DELETTIME", DateUtil.date2Str(new Date())); taxationManageService.delete(pd); map.put("result", errInfo); //返回结果 @@ -107,7 +107,7 @@ public class TaxationManageController extends BaseController { pd = this.getPageData(); pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id - pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 String expireDate = pd.getString("EXPIRE_DATE"); String day = DateUtil.getDay(); @@ -158,17 +158,6 @@ public class TaxationManageController extends BaseController { taxation.put("ARCHIVES_TYPE", "2"); } }); - /*List assignedList = assignedManageService.assignedList(Jurisdiction.getCORPINFO_ID()); - List varList = new ArrayList<>(); - for (int i = 0; i < taxationList.size(); i++) { - for (int j = 0; j < assignedList.size(); j++) { - if(taxationList.get(i).get("PLATE_NUMBER").equals(assignedList.get(j).get("RAW_PLATE_NUMBER"))) { - taxationList.get(i).put("RECORD_STATUS","过户"); - taxationList.get(i).put("ASSIGNEDSTATUS","1"); - } - } - varList.add(taxationList.get(i)); - }*/ map.put("varList", taxationList); map.put("page", page); map.put("result", errInfo);