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

BUG优化

dev
xiepeng 2024-04-17 13:01:53 +08:00
parent be7db01faa
commit 06395c0c05
23 changed files with 71 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ public class BeidouController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("BEIDOU_ID", this.get32UUID()); //主键 pd.put("BEIDOU_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("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
@ -127,7 +127,7 @@ public class BeidouController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
beidouService.delete(pd); beidouService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -150,7 +150,7 @@ public class BeidouController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
PageData operationData = new PageData(); PageData operationData = new PageData();
operationData.put("OPERATING_ID", pd.get("VEHICLE")); operationData.put("OPERATING_ID", pd.get("VEHICLE"));
@ -188,7 +188,7 @@ public class BeidouController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
beidouService.edit2(pd); beidouService.edit2(pd);
map.put("pd", pd); map.put("pd", pd);

6
src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java
View File

@ -46,7 +46,7 @@ public class TrafficDrivingCommitmentController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键
pd.put("ISDELETE", "0"); //是否删除 pd.put("ISDELETE", "0"); //是否删除
pd.put("INQUIRYCONCLUSION","正常"); pd.put("INQUIRYCONCLUSION","正常");
pd.put("CREATORNAME", Jurisdiction.getUsername()); pd.put("CREATORNAME", Jurisdiction.getName());
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //创建人 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //创建人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间
trafficDrivingCommitmentService.save(pd); trafficDrivingCommitmentService.save(pd);
@ -68,7 +68,7 @@ public class TrafficDrivingCommitmentController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //操作人 pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //操作人
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //操作人 pd.put("OPERATORNAME", Jurisdiction.getName()); //操作人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //操作时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //操作时间
trafficDrivingCommitmentService.edit(pd); trafficDrivingCommitmentService.edit(pd);
@ -106,7 +106,7 @@ public class TrafficDrivingCommitmentController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
trafficDrivingCommitmentService.delete(pd); trafficDrivingCommitmentService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);

6
src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java
View File

@ -40,7 +40,7 @@ public class TrafficDrivingTypeController extends BaseController {
pd.put("DRIVINGTYPE_ID", this.get32UUID()); pd.put("DRIVINGTYPE_ID", this.get32UUID());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键
pd.put("ISDELETE", "0"); //是否删除 pd.put("ISDELETE", "0"); //是否删除
pd.put("CREATORNAME", Jurisdiction.getUsername()); pd.put("CREATORNAME", Jurisdiction.getName());
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //创建人 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //创建人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间
trafficDrivingTypeService.save(pd); trafficDrivingTypeService.save(pd);
@ -62,7 +62,7 @@ public class TrafficDrivingTypeController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //操作人 pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //操作人
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //操作人 pd.put("OPERATORNAME", Jurisdiction.getName()); //操作人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //操作时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //操作时间
trafficDrivingTypeService.edit(pd); trafficDrivingTypeService.edit(pd);
@ -102,7 +102,7 @@ public class TrafficDrivingTypeController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
trafficDrivingTypeService.delete(pd); trafficDrivingTypeService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);

2
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java
View File

@ -174,7 +174,7 @@ public class TrafficSafetyMeetingController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
trafficSafetyMeetingService.delete(pd); trafficSafetyMeetingService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);

2
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java
View File

@ -112,7 +112,7 @@ public class TrafficSecurityAccidentInvestigationController extends BaseControll
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
accidentInvestigationService.delete(pd); accidentInvestigationService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);

6
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java
View File

@ -109,7 +109,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
customerManagementService.delete(pd); customerManagementService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -170,7 +170,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController
pageData.put("ISDELETE", "0"); pageData.put("ISDELETE", "0");
pageData.put("CUSTOMERCONTACT_ID", this.get32UUID()); pageData.put("CUSTOMERCONTACT_ID", this.get32UUID());
pageData.put("CREATOR", Jurisdiction.getUSER_ID()); 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("CUSTOMERMANAGEMENT_ID", pd.getString("CUSTOMERMANAGEMENT_ID"));
pageData.put("CONTACT_ID", this.get32UUID()); pageData.put("CONTACT_ID", this.get32UUID());
pageData.put("CREATETIME", DateUtil.date2Str(new Date())); pageData.put("CREATETIME", DateUtil.date2Str(new Date()));
@ -203,7 +203,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
customerManagementService.deleteContactById(pd); customerManagementService.deleteContactById(pd);
map.put("result", errInfo); map.put("result", errInfo);

2
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java
View File

@ -171,7 +171,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
managementAgreementService.delete(pd); managementAgreementService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);

6
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java
View File

@ -278,7 +278,7 @@ public class TrafficSecurityNoticeController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
securityNoticeService.delete(pd); securityNoticeService.delete(pd);
securityReadDetail.delete(pd); securityReadDetail.delete(pd);
@ -303,7 +303,7 @@ public class TrafficSecurityNoticeController extends BaseController {
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
for (String id : ArrayDATA_IDS) { for (String id : ArrayDATA_IDS) {
pd.put("NOTIFICATION_ID", id); pd.put("NOTIFICATION_ID", id);
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人 pd.put("DELETORNAME", Jurisdiction.getName());//删除人
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
securityNoticeService.delete(pd); securityNoticeService.delete(pd);
} }
@ -340,7 +340,7 @@ public class TrafficSecurityNoticeController extends BaseController {
issue.put("PERSON_ID",personIds[i].trim()); issue.put("PERSON_ID",personIds[i].trim());
issue.put("ISDELETE", "0"); issue.put("ISDELETE", "0");
issue.put("CREATOR", Jurisdiction.getUSER_ID()); issue.put("CREATOR", Jurisdiction.getUSER_ID());
issue.put("CREATORNAME", Jurisdiction.getUsername()); issue.put("CREATORNAME", Jurisdiction.getName());
issue.put("CREATETIME",DateUtil.date2Str(new Date())); issue.put("CREATETIME",DateUtil.date2Str(new Date()));
// 编写发布的 insert // 编写发布的 insert
trafficSecurityReadDetailService.save(issue); trafficSecurityReadDetailService.save(issue);

2
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java
View File

@ -98,7 +98,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
violationRegistrationService.delete(pd); violationRegistrationService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);

4
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java
View File

@ -133,7 +133,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 pd.put("DELETORNAME", Jurisdiction.getName());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
trafficSecurityWaybillRegistrationService.delete(pd); trafficSecurityWaybillRegistrationService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -157,7 +157,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
for (String id : ArrayDATA_IDS) { for (String id : ArrayDATA_IDS) {
pd.put("WAYBILLREGISTRATION_ID", id); pd.put("WAYBILLREGISTRATION_ID", id);
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人 pd.put("DELETORNAME", Jurisdiction.getName());//删除人
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
trafficSecurityWaybillRegistrationService.delete(pd); trafficSecurityWaybillRegistrationService.delete(pd);
} }

9
src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java
View File

@ -46,7 +46,7 @@ public class EnterpriseSafetyProductionController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
enterpriseSafetyProductionService.save(pd); enterpriseSafetyProductionService.save(pd);
map.put("pd", pd); map.put("pd", pd);
@ -66,7 +66,7 @@ public class EnterpriseSafetyProductionController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); 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("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
enterpriseSafetyProductionService.delete(pd); enterpriseSafetyProductionService.delete(pd);
@ -86,11 +86,8 @@ public class EnterpriseSafetyProductionController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) 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("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
enterpriseSafetyProductionService.edit(pd); enterpriseSafetyProductionService.edit(pd);
map.put("pd", pd); map.put("pd", pd);

12
src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java
View File

@ -48,11 +48,8 @@ public class EquipmentFacilityController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("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); equipmentFacilityService.save(pd);
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
@ -71,7 +68,7 @@ public class EquipmentFacilityController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); 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("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
equipmentFacilityService.delete(pd); equipmentFacilityService.delete(pd);
@ -91,11 +88,8 @@ public class EquipmentFacilityController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) 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("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
equipmentFacilityService.edit(pd); equipmentFacilityService.edit(pd);
map.put("pd", pd); map.put("pd", pd);

9
src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java
View File

@ -48,7 +48,7 @@ public class FirefightingEquipmentFacilityController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
firefightingEquipmentFacilityService.save(pd); firefightingEquipmentFacilityService.save(pd);
map.put("pd", pd); map.put("pd", pd);
@ -68,7 +68,7 @@ public class FirefightingEquipmentFacilityController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); 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("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
firefightingEquipmentFacilityService.delete(pd); firefightingEquipmentFacilityService.delete(pd);
@ -88,11 +88,8 @@ public class FirefightingEquipmentFacilityController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) 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("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
firefightingEquipmentFacilityService.edit(pd); firefightingEquipmentFacilityService.edit(pd);
map.put("pd", pd); map.put("pd", pd);

12
src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
View File

@ -72,7 +72,7 @@ public class FreighttTrailerController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("FREIGHTTRAILER_ID", this.get32UUID()); //主键 pd.put("FREIGHTTRAILER_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("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
@ -110,7 +110,7 @@ public class FreighttTrailerController extends BaseController {
scrapAddData.put("VEHICLEOWNER", findPageData.get("CAR_OWNERS")); scrapAddData.put("VEHICLEOWNER", findPageData.get("CAR_OWNERS"));
scrapAddData.put("CONTACT_NUMBER", findPageData.get("CONTACT_PHONE")); scrapAddData.put("CONTACT_NUMBER", findPageData.get("CONTACT_PHONE"));
scrapAddData.put("SCRAP_DATE", DateUtil.date2Str(new Date())); 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("CREATTIME", DateUtil.date2Str(new Date()));
scrapAddData.put("OPERATTIME", DateUtil.date2Str(new Date())); scrapAddData.put("OPERATTIME", DateUtil.date2Str(new Date()));
scrapAddData.put("VEHICLEOWNER_NUMBER", findPageData.get("CAR_OWNERS_TEL")); scrapAddData.put("VEHICLEOWNER_NUMBER", findPageData.get("CAR_OWNERS_TEL"));
@ -125,7 +125,7 @@ public class FreighttTrailerController extends BaseController {
scrapManageService.save(scrapAddData); scrapManageService.save(scrapAddData);
} }
pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
freightTrailerService.delete(pd); freightTrailerService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -148,7 +148,7 @@ public class FreighttTrailerController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
PageData freightTrailer = freightTrailerService.findById(pd); PageData freightTrailer = freightTrailerService.findById(pd);
@ -324,9 +324,9 @@ public class FreighttTrailerController extends BaseController {
riskunit.put("NOTES", lpd.get("var19")); riskunit.put("NOTES", lpd.get("var19"));
riskunit.put("FREIGHTTRAILER_ID", this.get32UUID()); riskunit.put("FREIGHTTRAILER_ID", this.get32UUID());
riskunit.put("ISDELETE", "0"); riskunit.put("ISDELETE", "0");
riskunit.put("CREATOR", Jurisdiction.getUsername()); riskunit.put("CREATOR", Jurisdiction.getName());
riskunit.put("CREATTIME", DateUtil.date2Str(new Date())); 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("OPERATTIME", DateUtil.date2Str(new Date()));
riskunit.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); riskunit.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
riskunitList.add(riskunit); riskunitList.add(riskunit);

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

@ -59,7 +59,7 @@ public class InspectAnnuallyController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("INSPECTANNUALLY_ID", this.get32UUID()); //主键 pd.put("INSPECTANNUALLY_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("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
@ -87,7 +87,7 @@ public class InspectAnnuallyController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
inspectAnnuallyService.delete(pd); inspectAnnuallyService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -110,7 +110,7 @@ public class InspectAnnuallyController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
inspectAnnuallyService.edit(pd); inspectAnnuallyService.edit(pd);
map.put("pd", pd); map.put("pd", pd);
@ -134,7 +134,7 @@ public class InspectAnnuallyController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
inspectAnnuallyService.edit2(pd); inspectAnnuallyService.edit2(pd);
map.put("pd", pd); map.put("pd", pd);

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

@ -56,7 +56,7 @@ public class InsureController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("INSURE_ID", this.get32UUID()); //主键 pd.put("INSURE_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("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
@ -83,7 +83,7 @@ public class InsureController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
insureService.delete(pd); insureService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -106,7 +106,7 @@ public class InsureController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
insureService.edit(pd); insureService.edit(pd);
map.put("pd", pd); map.put("pd", pd);
@ -130,7 +130,7 @@ public class InsureController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
insureService.edit2(pd); insureService.edit2(pd);
map.put("pd", pd); map.put("pd", pd);

6
src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java
View File

@ -44,7 +44,7 @@ public class LabourEntrenchThingController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
labourEntrenchThingService.save(pd); labourEntrenchThingService.save(pd);
map.put("pd", pd); map.put("pd", pd);
@ -64,7 +64,7 @@ public class LabourEntrenchThingController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); 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("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
labourEntrenchThingService.delete(pd); labourEntrenchThingService.delete(pd);
@ -85,7 +85,7 @@ public class LabourEntrenchThingController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
labourEntrenchThingService.edit(pd); labourEntrenchThingService.edit(pd);
map.put("pd", pd); map.put("pd", pd);

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

@ -56,7 +56,7 @@ public class MaintenanceController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("MAINTENANCE_ID", this.get32UUID()); //主键 pd.put("MAINTENANCE_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("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
@ -84,7 +84,7 @@ public class MaintenanceController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
maintenanceService.delete(pd); maintenanceService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -107,7 +107,7 @@ public class MaintenanceController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
maintenanceService.edit(pd); maintenanceService.edit(pd);
map.put("pd", pd); map.put("pd", pd);
@ -131,7 +131,7 @@ public class MaintenanceController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
maintenanceService.edit2(pd); maintenanceService.edit2(pd);
map.put("pd", pd); map.put("pd", pd);
@ -160,9 +160,10 @@ public class MaintenanceController extends BaseController {
for (PageData operation : varList) { for (PageData operation : varList) {
if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) { if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
operation.put("ARCHIVES_TYPE", "2"); operation.put("ARCHIVES_TYPE", "2");
} } else if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
operation.put("ARCHIVES_TYPE", "1"); operation.put("ARCHIVES_TYPE", "1");
}else{
operation.put("ARCHIVES_TYPE", "0");
} }
} }
map.put("varList", varList); map.put("varList", varList);

13
src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
View File

@ -63,9 +63,6 @@ public class OperatingVehiclesController extends BaseController {
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 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("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("NETWORK_STATUS", "未入网"); pd.put("NETWORK_STATUS", "未入网");
pd.put("ISSCRAP", "0"); pd.put("ISSCRAP", "0");
@ -98,7 +95,7 @@ public class OperatingVehiclesController extends BaseController {
scrapAddData.put("VEHICLEOWNER", findPageData.get("VEHICLEOWNER")); scrapAddData.put("VEHICLEOWNER", findPageData.get("VEHICLEOWNER"));
scrapAddData.put("CONTACT_NUMBER", findPageData.get("CONTACT_NUMBER")); scrapAddData.put("CONTACT_NUMBER", findPageData.get("CONTACT_NUMBER"));
scrapAddData.put("SCRAP_DATE", DateUtil.date2Str(new Date())); 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("CREATTIME", DateUtil.date2Str(new Date()));
scrapAddData.put("OPERATTIME", DateUtil.date2Str(new Date())); scrapAddData.put("OPERATTIME", DateUtil.date2Str(new Date()));
scrapAddData.put("VEHICLEOWNER_NUMBER", findPageData.get("VEHICLEOWNER_NUMBER")); scrapAddData.put("VEHICLEOWNER_NUMBER", findPageData.get("VEHICLEOWNER_NUMBER"));
@ -112,7 +109,7 @@ public class OperatingVehiclesController extends BaseController {
scrapManageService.save(scrapAddData); scrapManageService.save(scrapAddData);
} }
pd.put("DELETOR", Jurisdiction.getUSER_ID()); 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("DELETTIME", DateUtil.date2Str(new Date()));
operatingVehiclesService.delete(pd); operatingVehiclesService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -131,7 +128,7 @@ public class OperatingVehiclesController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getCORPINFO_ID()); pd.put("OPERATOR", Jurisdiction.getCORPINFO_ID());
pd.put("OPERATORNAME", Jurisdiction.getUsername()); pd.put("OPERATORNAME", Jurisdiction.getName());
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
PageData operation = operatingVehiclesService.findById(pd); PageData operation = operatingVehiclesService.findById(pd);
List<PageData> assignedList = assignedManageService.assignedList(pd.getString("CORPINFO_ID")); List<PageData> assignedList = assignedManageService.assignedList(pd.getString("CORPINFO_ID"));
@ -460,9 +457,9 @@ public class OperatingVehiclesController extends BaseController {
riskunit.put("REMARK", lpd.get("var18")); riskunit.put("REMARK", lpd.get("var18"));
riskunit.put("OPERATING_ID", this.get32UUID()); riskunit.put("OPERATING_ID", this.get32UUID());
riskunit.put("ISDELETE", "0"); riskunit.put("ISDELETE", "0");
riskunit.put("CREATOR", Jurisdiction.getUsername()); riskunit.put("CREATOR", Jurisdiction.getName());
riskunit.put("CREATTIME", DateUtil.date2Str(new Date())); 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("OPERATTIME", DateUtil.date2Str(new Date()));
riskunit.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); riskunit.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
riskunitList.add(riskunit); riskunitList.add(riskunit);

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

@ -56,7 +56,7 @@ public class OperationsController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATIONS_ID", this.get32UUID()); //主键 pd.put("OPERATIONS_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("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
@ -84,7 +84,7 @@ public class OperationsController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
operationsService.delete(pd); operationsService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -107,7 +107,7 @@ public class OperationsController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
operationsService.edit(pd); operationsService.edit(pd);
map.put("pd", pd); map.put("pd", pd);
@ -131,7 +131,7 @@ public class OperationsController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
operationsService.edit2(pd); operationsService.edit2(pd);
map.put("pd", pd); map.put("pd", pd);

6
src/main/java/com/zcloud/controller/reportedIncident/ReportedIncidentController.java
View File

@ -51,7 +51,7 @@ public class ReportedIncidentController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("REPORTEDINCIDENT_ID", this.get32UUID()); //主键 pd.put("REPORTEDINCIDENT_ID", this.get32UUID()); //主键
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("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
@ -78,7 +78,7 @@ public class ReportedIncidentController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id
pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 pd.put("DELETEORNAME", Jurisdiction.getName()); //删除人
pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间
reportedIncidentService.delete(pd); reportedIncidentService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -101,7 +101,7 @@ public class ReportedIncidentController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 pd.put("OPERATORNAME", Jurisdiction.getName()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
reportedIncidentService.edit(pd); reportedIncidentService.edit(pd);
map.put("pd", pd); map.put("pd", pd);

2
src/main/java/com/zcloud/controller/safetyInvestment/SafetyInvestmentPlanController.java
View File

@ -75,7 +75,7 @@ public class SafetyInvestmentPlanController extends BaseController {
} }
/**删除 /**删除
* @param out * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value="/delete")

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

@ -55,7 +55,7 @@ public class TaxationManageController extends BaseController {
pd.put("TAXATION_ID", this.get32UUID()); //车船税主键 pd.put("TAXATION_ID", this.get32UUID()); //车船税主键
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id 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("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("ARCHIVES_TYPE", "0"); //档案状态 pd.put("ARCHIVES_TYPE", "0"); //档案状态
if("".equals(pd.getString("EXPIRE_STATUS"))) { if("".equals(pd.getString("EXPIRE_STATUS"))) {
@ -87,7 +87,7 @@ public class TaxationManageController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); 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("DELETTIME", DateUtil.date2Str(new Date()));
taxationManageService.delete(pd); taxationManageService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -107,7 +107,7 @@ public class TaxationManageController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id
pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人名字
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
String expireDate = pd.getString("EXPIRE_DATE"); String expireDate = pd.getString("EXPIRE_DATE");
String day = DateUtil.getDay(); String day = DateUtil.getDay();
@ -158,17 +158,6 @@ public class TaxationManageController extends BaseController {
taxation.put("ARCHIVES_TYPE", "2"); taxation.put("ARCHIVES_TYPE", "2");
} }
}); });
/*List<PageData> assignedList = assignedManageService.assignedList(Jurisdiction.getCORPINFO_ID());
List<PageData> 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("varList", taxationList);
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);