From 78e0bccac5683826853c139d165b199b6cc6508a Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 9 Apr 2024 21:51:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9B=BF=E6=8D=A2CORPINFO=5F?= =?UTF-8?q?ID=E9=80=9A=E7=94=A8=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SecurityWaybillRegistrationController.java | 15 --------- .../TrafficDrivingCommitmentController.java | 2 +- .../TrafficDrivingTypeController.java | 2 +- .../TrafficSafetyActivitiesController.java | 26 +++++----------- .../TrafficSafetyManualController.java | 26 +++++----------- .../TrafficSafetyMeetingController.java | 20 ++++-------- ...curityAccidentInvestigationController.java | 10 ++---- ...cSecurityCustomerManagementController.java | 27 +++++++++------- ...cSecurityLocationManagementController.java | 27 ++++++++++------ ...SecurityManagementAgreementController.java | 25 +++++---------- .../TrafficSecurityNoticeController.java | 17 +++------- ...curityViolationRegistrationController.java | 18 +++-------- ...SecurityWaybillRegistrationController.java | 26 ++-------------- .../EnterpriseSafetyProductionController.java | 1 + .../EquipmentFacilityController.java | 1 + ...refightingEquipmentFacilityController.java | 1 + .../LabourEntrenchThingController.java | 1 + .../scrapManage/ScrapManageController.java | 1 + .../TaxationManageController.java | 1 + ...afficSecurityCustomerManagementMapper.java | 1 + ...afficSecurityLocationManagementMapper.java | 2 ++ ...fficSecurityWaybillRegistrationMapper.java | 2 -- ...fficSecurityCustomerManagementService.java | 2 ++ ...fficSecurityLocationManagementService.java | 2 ++ ...ficSecurityWaybillRegistrationService.java | 2 -- ...SecurityCustomerManagementServiceImpl.java | 5 +++ ...SecurityLocationManagementServiceImpl.java | 5 +++ ...ecurityManagementAgreementServiceImpl.java | 1 + ...ecurityWaybillRegistrationServiceImpl.java | 5 --- .../TrafficDrivingCommitmentMapper.xml | 2 +- .../TrafficDrivingTypeMapper.xml | 2 +- .../TrafficSafetyActivitiesMapper.xml | 10 +++--- .../TrafficSafetyManualMapper.xml | 10 +++--- .../TrafficSafetyMeetingMapper.xml | 16 +++++----- ...ficSecurityAccidentInvestigationMapper.xml | 5 ++- ...rafficSecurityCustomerManagementMapper.xml | 31 ++++++++++++++----- ...rafficSecurityLocationManagementMapper.xml | 25 ++++++++++----- ...afficSecurityManagementAgreementMapper.xml | 12 +++---- .../TrafficSecurityNoticeMapper.xml | 12 +++---- ...ficSecurityViolationRegistrationMapper.xml | 10 +++--- ...afficSecurityWaybillRegistrationMapper.xml | 19 +++--------- .../EnterpriseSafetyProductionMapper.xml | 2 +- .../EquipmentFacilityMapper.xml | 2 +- .../FirefightingEquipmentFacilityMapper.xml | 2 +- .../LabourEntrenchThingMapper.xml | 2 +- .../ReportedIncidentMapper.xml | 2 +- .../datasource/scrapManage/ScrapManage.xml | 2 +- .../taxationManage/TaxationManageMapper.xml | 2 +- 48 files changed, 193 insertions(+), 249 deletions(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java index 20fa330..d9f8bf9 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java @@ -57,21 +57,6 @@ public class AppTrafficSecurityWaybillRegistrationController extends BaseControl return map; } - @RequestMapping(value = "/forSecurityPerson") - @ResponseBody - public Object forSecurityPerson() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); - pd = trafficSecurityWaybillRegistrationService.forSecurityPerson(pd); - pd.put("PRACTITIONER", Jurisdiction.getName()); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } - /** * 查看详情 * @return diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java index f42eb73..390f67a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingCommitmentController.java @@ -85,7 +85,7 @@ public class TrafficDrivingCommitmentController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = trafficDrivingCommitmentService.listForDrivingCommitment(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java index cdf8d4a..2bc7740 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingTypeController.java @@ -81,7 +81,7 @@ public class TrafficDrivingTypeController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = trafficDrivingTypeService.listForDrivingType(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java index 8fcca7c..04ea166 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java @@ -37,7 +37,7 @@ public class TrafficSafetyActivitiesController extends BaseController { String activities_Id = this.get32UUID(); pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("ACTIVITIES_ID", activities_Id); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("COMPLETIONSTATUS", "0"); @@ -61,8 +61,8 @@ public class TrafficSafetyActivitiesController extends BaseController { } //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = file.getOriginalFilename(); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -85,7 +85,7 @@ public class TrafficSafetyActivitiesController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("ISDELETE", "0"); if(!StringUtils.isEmpty(pd.getString("EXPIRYDATE")) && DateUtil.compareDate(pd.getString("EXPIRYDATE"),DateUtil.getDay())) { @@ -106,8 +106,8 @@ public class TrafficSafetyActivitiesController extends BaseController { return map; } String fileName = file.getOriginalFilename(); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -132,19 +132,7 @@ public class TrafficSafetyActivitiesController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 page.setPd(pd); List varList = activeService.listForSafetyActivitieslist(page); varList.forEach(active -> { diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java index ec05845..bec2e94 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java @@ -35,7 +35,7 @@ public class TrafficSafetyManualController extends BaseController { String manual_Id = this.get32UUID(); pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("MANUAL_ID", manual_Id); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("COMPLETIONSTATUS", "0"); @@ -59,8 +59,8 @@ public class TrafficSafetyManualController extends BaseController { } //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = file.getOriginalFilename(); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -83,7 +83,7 @@ public class TrafficSafetyManualController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("ISDELETE", "0"); @@ -106,8 +106,8 @@ public class TrafficSafetyManualController extends BaseController { } //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = file.getOriginalFilename(); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -132,19 +132,7 @@ public class TrafficSafetyManualController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 page.setPd(pd); List varList = safetyManualService.listForSafetyManuallist(page); varList.forEach(manual -> { diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java index bb7e4a2..a9fe0f8 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java @@ -41,7 +41,7 @@ public class TrafficSafetyMeetingController extends BaseController { pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 pd.put("SAFETY_MEETING_ID", safety_meeting_id); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("MEETING_STATUS", "0"); // 会议状态 pd.put("MEETING_PERSONS", "0"); // 参会人数 pd.put("ISDELETE", "0"); @@ -56,8 +56,8 @@ public class TrafficSafetyMeetingController extends BaseController { return map; } String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); - pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -72,8 +72,8 @@ public class TrafficSafetyMeetingController extends BaseController { return map; } String videoFileName = this.get32UUID() + videoFile.getOriginalFilename().substring(videoFile.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(videoFile, videoFileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); - pd.put("VIDEO_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + videoFileName); + smb.sshSftp(videoFile, videoFileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("VIDEO_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + videoFileName); pd.put("VIDEO_NAME",pd.getString("CREATORNAME")); } String meetingDate = pd.getString("MEETING_DATE"); @@ -117,15 +117,7 @@ public class TrafficSafetyMeetingController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String MEETING_TITLE = pd.getString("MEETING_TITLE"); // 关键词检索条件 - if (Tools.notEmpty(MEETING_TITLE)) - pd.put("MEETING_TITLE", MEETING_TITLE.trim()); - - String MEETING_TYPE = pd.getString("MEETING_TYPE"); // 关键词检索条件 - if (Tools.notEmpty(MEETING_TYPE)) - pd.put("MEETING_TYPE", MEETING_TYPE.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 page.setPd(pd); List varList = trafficSafetyMeetingService.listForSafetyMeeting(page); Date date = DateUtil.fomatDate(DateUtil.getDay()); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java index eb1e575..cb82bb1 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java @@ -42,6 +42,7 @@ public class TrafficSecurityAccidentInvestigationController extends BaseControll pd.put("INCIDENTNUMBER", this.get32UUID()); // 事故编号 pd.put("CERTIFICATIONNUMBER", this.get32UUID()); // 认定书编号 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id pd.put("DEPARTMENT", Jurisdiction.getCORPINFO_ID()); // 部门 pd.put("ISDELETE", "0"); @@ -90,14 +91,7 @@ public class TrafficSecurityAccidentInvestigationController extends BaseControll PageData pd = new PageData(); pd = this.getPageData(); - String USER_ID = pd.getString("USER_ID"); - if (Tools.notEmpty(USER_ID)) - pd.put("USER_ID", USER_ID.trim()); - - String ACCIDENTDATE = pd.getString("ACCIDENTDATE"); // 运输车辆 - if (Tools.notEmpty(ACCIDENTDATE)) - pd.put("ACCIDENTDATE", ACCIDENTDATE.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = accidentInvestigationService.listForAccidentInvestigation(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index 08d1528..49e53d7 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -40,7 +40,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController String customermanagement_id = this.get32UUID(); // 生成主键ID pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 设置客户管理ID pd.put("CUSTOMERNAME_ID", this.get32UUID()); - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 设置运输公司ID + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 设置运输公司ID pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID pd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间 @@ -73,7 +73,6 @@ public class TrafficSecurityCustomerManagementController extends BaseController return map; } - @RequestMapping(value = "/listForSecurityCustomerManagement") @ResponseBody public Object listForSecurityCustomerManagement(Page page) throws Exception { @@ -81,15 +80,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String CUSTOMERTYPE = pd.getString("CUSTOMERTYPE"); // 关键词检索条件 - if (Tools.notEmpty(CUSTOMERTYPE)) - pd.put("CUSTOMERTYPE", CUSTOMERTYPE.trim()); - - String TRANSPORTATIONCOMPANY = pd.getString("TRANSPORTATIONCOMPANY"); // 关键词检索条件 - if (Tools.notEmpty(TRANSPORTATIONCOMPANY)) - pd.put("REPLYSTTRANSPORTATIONCOMPANYATUS", TRANSPORTATIONCOMPANY.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = customerManagementService.listForSecurityCustomerManagement(page); map.put("varList", varList); @@ -116,4 +107,18 @@ public class TrafficSecurityCustomerManagementController extends BaseController map.put("result", errInfo); return map; } + + @RequestMapping(value = "/getTrafficCustomerSelectList") + @ResponseBody + public Object getTrafficCustomerSelectList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + List varList = customerManagementService.getTrafficCustomerSelectList(pd); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java index 9a6e888..daa5df5 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java @@ -34,7 +34,7 @@ public class TrafficSecurityLocationManagementController extends BaseController PageData pd = this.getPageData(); String locationmanagement_id = this.get32UUID(); - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 pd.put("LOCATIONMANAGEMENT_ID", locationmanagement_id); // 主键 @@ -57,15 +57,7 @@ public class TrafficSecurityLocationManagementController extends BaseController PageData pd = new PageData(); pd = this.getPageData(); - - String LOCATIONTYPE = pd.getString("LOCATIONTYPE"); // 关键词检索条件 - if (Tools.notEmpty(LOCATIONTYPE)) - pd.put("LOCATIONTYPE", LOCATIONTYPE.trim()); - - String TRANSPORTATIONCOMPANY = pd.getString("TRANSPORTATIONCOMPANY"); // 关键词检索条件 - if (Tools.notEmpty(TRANSPORTATIONCOMPANY)) - pd.put("REPLYSTTRANSPORTATIONCOMPANYATUS", TRANSPORTATIONCOMPANY.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = locationManagementService.listForSecurityLocationManagement(page); map.put("varList", varList); @@ -94,4 +86,19 @@ public class TrafficSecurityLocationManagementController extends BaseController return map; } + @RequestMapping(value = "/getTrafficLocationSelectList") + @ResponseBody + public Object getTrafficLocationSelectList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + List varList = locationManagementService.getTrafficLocationSelectList(pd); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java index 44983b7..e556296 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java @@ -37,7 +37,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("MANAGEMENTAGREEMENT_ID", managementagreementId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("COMPLETIONSTATUS", "0"); @@ -60,8 +60,8 @@ public class TrafficSecurityManagementAgreementController extends BaseController return map; } String fileName =file.getOriginalFilename(); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -84,7 +84,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 经营企业 pd.put("ISDELETE", "0"); String ffile = DateUtil.getDays(); @@ -99,8 +99,8 @@ public class TrafficSecurityManagementAgreementController extends BaseController } //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName =file.getOriginalFilename(); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -125,18 +125,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 - if (Tools.notEmpty(SYSTEMNAME)) - pd.put("SYSTEMNAME", SYSTEMNAME.trim()); - - String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(COMPLETIONSTATUS)) - pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); - - String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(VALIDSTATUS)) - pd.put("VALIDSTATUS", VALIDSTATUS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = managementAgreementService.listForManagementAgreementlist(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java index 99818e8..dffaeb4 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -47,9 +47,8 @@ public class TrafficSecurityNoticeController extends BaseController { String notificationId = this.get32UUID(); pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id - pd.put("CORPINFO_ID", Jurisdiction.getPOST_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("NOTIFICATION_ID", notificationId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("POSTSTATUS", "0"); // 发布状态 @@ -131,15 +130,7 @@ public class TrafficSecurityNoticeController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - - String TITLE = pd.getString("TITLE");// 关键词检索条件 - if (Tools.notEmpty(TITLE)) - pd.put("TITLE", TITLE.trim()); - - String REPLYSTATUS = pd.getString("REPLYSTATUS");// 关键词检索条件 - if (Tools.notEmpty(REPLYSTATUS)) - pd.put("REPLYSTATUS", REPLYSTATUS.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = securityNoticeService.listForSecurityNotice(page); @@ -218,7 +209,7 @@ public class TrafficSecurityNoticeController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CORPINFO_ID", Jurisdiction.getPOST_ID()); // 创建人id pd.put("OPERATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("POSTSTATUS", "0"); // 发布状态 pd.put("SIGNEDSTATUS", "0"); // 签收状态 @@ -344,7 +335,7 @@ public class TrafficSecurityNoticeController extends BaseController { issue.put("LEVEL",securityNotice.getString("LEVEL")); issue.put("REPLY", "0"); issue.put("SIGNING", "0"); - issue.put("TRANSPORTATIONCOMPANY", securityNotice.getString("TRANSPORTATIONCOMPANY")); + issue.put("CORPINFO_ID", securityNotice.getString("CORPINFO_ID")); issue.put("PERSON_ID",personIds[i]); issue.put("PERSON", securityNotice.getString("PERSON_ID")); issue.put("ISDELETE", "0"); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java index 208e7d5..9d3e0d2 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java @@ -43,7 +43,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 pd.put("REGISTRATION_ID", registration_id); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("ISDELETE", "0"); String ffile = DateUtil.getDays(); @@ -56,8 +56,8 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll return map; } String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); - pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } @@ -76,17 +76,7 @@ public class TrafficSecurityViolationRegistrationController extends BaseControll String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String USER_ID = pd.getString("USER_ID"); // 运输企业 - if (Tools.notEmpty(USER_ID)){ - - pd.put("USER_ID", USER_ID.trim()); - } - - - String PENALTYTIME = pd.getString("PENALTYTIME"); // 运输车辆 - if (Tools.notEmpty(PENALTYTIME)) - pd.put("PENALTYTIME", PENALTYTIME.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = violationRegistrationService.listForViolationRegistration(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index b765dd1..16817fa 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -39,15 +39,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - - String TITLE = pd.getString("TITLE"); // 关键词检索条件 - if (Tools.notEmpty(TITLE)) - pd.put("TITLE", TITLE.trim()); - - String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件 - if (Tools.notEmpty(REPLYSTATUS)) - pd.put("REPLYSTATUS", REPLYSTATUS.trim()); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = trafficSecurityWaybillRegistrationService.listForSecurityWaybill(page); @@ -57,20 +49,6 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController return map; } - @RequestMapping(value = "/forSecurityPerson") - @ResponseBody - public Object forSecurityPerson() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); - pd = trafficSecurityWaybillRegistrationService.forSecurityPerson(pd); - pd.put("PRACTITIONER", Jurisdiction.getName()); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } /** * 查看详情 * @return @@ -115,7 +93,7 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("WAYBILLREGISTRATION_ID", waybillregistrationId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("ISDELETE", "0"); diff --git a/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java b/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java index 752bdc1..26d1a27 100644 --- a/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java +++ b/src/main/java/com/zcloud/controller/enterpriseSafetyProduction/EnterpriseSafetyProductionController.java @@ -124,6 +124,7 @@ public class EnterpriseSafetyProductionController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = enterpriseSafetyProductionService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java b/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java index dbf7f48..1d38ae6 100644 --- a/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java +++ b/src/main/java/com/zcloud/controller/equipmentFacility/EquipmentFacilityController.java @@ -133,6 +133,7 @@ public class EquipmentFacilityController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = equipmentFacilityService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java b/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java index 2bb032b..655aff2 100644 --- a/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java +++ b/src/main/java/com/zcloud/controller/firefightingEquipmentFacility/FirefightingEquipmentFacilityController.java @@ -130,6 +130,7 @@ public class FirefightingEquipmentFacilityController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = firefightingEquipmentFacilityService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java b/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java index a803d36..2e1f1df 100644 --- a/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java +++ b/src/main/java/com/zcloud/controller/labourEntrenchThing/LabourEntrenchThingController.java @@ -119,6 +119,7 @@ public class LabourEntrenchThingController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = labourEntrenchThingService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java index d392a7d..a86a02d 100644 --- a/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java +++ b/src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java @@ -149,6 +149,7 @@ public class ScrapManageController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List varList = scrapManageService.list(page); //列出MajorDangerSource列表 map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java index 9b10a4a..40e164d 100644 --- a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -148,6 +148,7 @@ public class TaxationManageController extends BaseController { pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); page.setPd(pd); List taxationList = taxationManageService.list(page); //列出MajorDangerSource列表 taxationList.forEach(taxation -> { diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java index 629dda9..02bfd51 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java @@ -25,4 +25,5 @@ public interface TrafficSecurityCustomerManagementMapper { void delete(PageData pd); + List getTrafficCustomerSelectList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java index 44bfb53..4bff1b4 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java @@ -23,4 +23,6 @@ public interface TrafficSecurityLocationManagementMapper { List datalistPage(Page page); void delete(PageData pd); + + List getTrafficLocationSelectList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java index 16d168c..181c60d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java @@ -20,8 +20,6 @@ public interface TrafficSecurityWaybillRegistrationMapper { void editStatus(PageData pd); - PageData forSecurityPerson(PageData pd); - void delete(PageData pd); /**通过id获取数据 diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java index b5d3f07..52fb4a9 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -13,4 +13,6 @@ public interface TrafficSecurityCustomerManagementService { void saveContact(PageData contactPd); void delete(PageData pd); + + List getTrafficCustomerSelectList(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java index e753bb0..8b8b9b2 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java @@ -11,4 +11,6 @@ public interface TrafficSecurityLocationManagementService { List listForSecurityLocationManagement(Page page); void delete(PageData pd); + + List getTrafficLocationSelectList(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java index 42cb149..251b572 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java @@ -10,8 +10,6 @@ public interface TrafficSecurityWaybillRegistrationService { void save(PageData pd); - PageData forSecurityPerson(PageData pd); - void delete(PageData pd); PageData findById(PageData pd); diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java index b9efa57..8c06faa 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -35,4 +35,9 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu public void delete(PageData pd) { customerManagementMapper.delete(pd); } + + @Override + public List getTrafficCustomerSelectList(PageData pd) throws Exception { + return customerManagementMapper.getTrafficCustomerSelectList(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java index 1e71aa5..6312bf9 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java @@ -27,4 +27,9 @@ public class TrafficSecurityLocationManagementServiceImpl implements TrafficSecu public void delete(PageData pd) { locationManagementMapper.delete(pd); } + + @Override + public List getTrafficLocationSelectList(PageData pd) throws Exception { + return locationManagementMapper.getTrafficLocationSelectList(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java index 680dcfa..8b7fa41 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java @@ -13,6 +13,7 @@ import java.util.List; public class TrafficSecurityManagementAgreementServiceImpl implements TrafficSecurityManagementAgreementService { @Autowired private TrafficSecurityManagementAgreementMapper managementAgreementMapper; + @Override public void save(PageData pd) { managementAgreementMapper.save(pd); diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java index 3a4a377..710638f 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java @@ -24,11 +24,6 @@ public class TrafficSecurityWaybillRegistrationServiceImpl implements TrafficSec TrafficSecurityWaybillRegistrationMapper.save(pd); } - @Override - public PageData forSecurityPerson(PageData pd) { - return TrafficSecurityWaybillRegistrationMapper.forSecurityPerson(pd); - } - @Override public void delete(PageData pd) { TrafficSecurityWaybillRegistrationMapper.delete(pd); diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml index 03bd6d6..d3fae6f 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml @@ -97,7 +97,7 @@ from f left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.INQUIRYCONTENT LIKE CONCAT(CONCAT('%', #{pd.INQUIRYCONTENT}),'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml index 32187bf..01e09a1 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml @@ -105,7 +105,7 @@ f left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID left join sys_dictionaries d on d.BIANMA = f.CHECKTYPE_ID and d.PARENT_ID = '5ef3a19edcb2435f8db94487834bbae3' - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.CHECKTYPE_ID = #{pd.CHECKTYPE_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml index fcbb98e..2367804 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml @@ -18,7 +18,7 @@ f.COMPLETIONSTATUS, f.CYCLE, f.VALIDSTATUS, - f.OPERATINGCOMPANY, + f.CORPINFO_ID, f.EXPIRYDATE, f.ATTACHMENT_ROUTE, f.ISDELETE, @@ -40,7 +40,7 @@ COMPLETIONSTATUS, CYCLE, VALIDSTATUS, - OPERATINGCOMPANY, + CORPINFO_ID, EXPIRYDATE, ATTACHMENT_ROUTE, ISDELETE, @@ -62,7 +62,7 @@ #{COMPLETIONSTATUS}, #{CYCLE}, #{VALIDSTATUS}, - #{OPERATINGCOMPANY}, + #{CORPINFO_ID}, #{EXPIRYDATE}, #{ATTACHMENT_ROUTE}, #{ISDELETE}, @@ -126,8 +126,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.ACTIVITIESNAME LIKE CONCAT('%', #{pd.ACTIVITIESNAME}, '%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml index be17d96..4dc4dda 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml @@ -17,7 +17,7 @@ f.MANUALNAME, f.COMPLETIONSTATUS, f.VALIDSTATUS, - f.OPERATINGCOMPANY, + f.CORPINFO_ID, f.EXPIRYDATE, f.ATTACHMENT_ROUTE, f.ISDELETE, @@ -38,7 +38,7 @@ MANUALNAME, COMPLETIONSTATUS, VALIDSTATUS, - OPERATINGCOMPANY, + CORPINFO_ID, EXPIRYDATE, ATTACHMENT_ROUTE, ISDELETE, @@ -59,7 +59,7 @@ #{MANUALNAME}, #{COMPLETIONSTATUS}, #{VALIDSTATUS}, - #{OPERATINGCOMPANY}, + #{CORPINFO_ID}, #{EXPIRYDATE}, #{ATTACHMENT_ROUTE}, #{ISDELETE}, @@ -122,8 +122,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.MANUALNAME LIKE CONCAT('%', #{pd.MANUALNAME}, '%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml index 891b931..cbafe8c 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml @@ -34,7 +34,7 @@ f.OPERATOR, f.OPERATORNAME, f.OPERATTIME, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.RECORDER, f.MEETING_STATUS, f.MEETING_DATE_END, @@ -67,7 +67,7 @@ OPERATOR, OPERATORNAME, OPERATTIME, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, RECORDER, MEETING_STATUS, MEETING_DATE_END, @@ -100,7 +100,7 @@ #{OPERATOR}, #{OPERATORNAME}, #{OPERATTIME}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{RECORDER}, #{MEETING_STATUS}, #{MEETING_DATE_END}, @@ -141,8 +141,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.MEETING_TITLE like CONCAT('%',#{pd.MEETING_TITLE},'%') @@ -159,7 +159,7 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join bus_traffic_safety_meeting_recipient e on f.SAFETY_MEETING_ID = e.SAFETY_MEETING_ID where f.ISDELETE = '0' AND @@ -180,7 +180,7 @@ r.ATTENDANCE_STATUS from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join bus_traffic_safety_meeting_recipient r on f.SAFETY_MEETING_ID = r.SAFETY_MEETING_ID where f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID} @@ -194,7 +194,7 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID where f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml index 9890017..7cf0b63 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml @@ -56,6 +56,7 @@ f.OPERATOR, f.OPERATORNAME, f.OPERATTIME, + f.CORPINFO_ID, f.AGE, f.GENDER, f.EDUCATIONALLEVEL, @@ -111,6 +112,7 @@ OPERATOR, OPERATORNAME, OPERATTIME, + CORPINFO_ID, AGE, GENDER, EDUCATIONALLEVEL, @@ -166,6 +168,7 @@ #{OPERATOR}, #{OPERATORNAME}, #{OPERATTIME}, + #{CORPINFO_ID}, #{AGE}, #{GENDER}, #{EDUCATIONALLEVEL}, @@ -342,7 +345,7 @@ f left join bus_corp_info i on f.DEPARTMENT = i.CORPINFO_ID left join sys_user u on f.USER_ID = u.USER_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.USER_ID = #{pd.USER_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml index 999f8a1..eb3bd6b 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml @@ -15,7 +15,7 @@ f.CUSTOMERMANAGEMENT_ID, f.CUSTOMERTYPE, f.CUSTOMERNAME, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.ISDELETE, f.DELETOR, f.DELETORNAME, @@ -34,7 +34,7 @@ CUSTOMERMANAGEMENT_ID, CUSTOMERTYPE, CUSTOMERNAME, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, ISDELETE, DELETOR, DELETORNAME, @@ -53,7 +53,7 @@ #{CUSTOMERMANAGEMENT_ID}, #{CUSTOMERTYPE}, #{CUSTOMERNAME}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{ISDELETE}, #{DELETOR}, #{DELETORNAME}, @@ -102,14 +102,31 @@ u.CUSTOMERADDRESS_ID from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join bus_traffic_customer_contact u on f.CUSTOMERMANAGEMENT_ID = u.CUSTOMERMANAGEMENT_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.CUSTOMERTYPE = #{pd.CUSTOMERTYPE} - - and i.CORP_NAME = #{pd.TRANSPORTATIONCOMPANY} + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml index 027ed8b..8c25745 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml @@ -17,7 +17,7 @@ f.LOCATIONNAME, f.ADDRESSDETAILS, f.ADMINISTRATIVEREGIONS, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.ISDELETE, f.DELETOR, f.DELETORNAME, @@ -41,7 +41,7 @@ LOCATIONNAME, ADDRESSDETAILS, ADMINISTRATIVEREGIONS, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, ISDELETE, DELETOR, DELETORNAME, @@ -65,7 +65,7 @@ #{LOCATIONNAME}, #{ADDRESSDETAILS}, #{ADMINISTRATIVEREGIONS}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{ISDELETE}, #{DELETOR}, #{DELETORNAME}, @@ -113,13 +113,24 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.LOCATIONTYPE = #{pd.LOCATIONTYPE} - - and i.CORP_NAME = #{pd.TRANSPORTATIONCOMPANY} + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml index d5b98aa..e505982 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml @@ -17,7 +17,7 @@ f.MANAGEMENTAGREEMENTNAME, f.COMPLETIONSTATUS, f.VALIDSTATUS, - f.OPERATINGCOMPANY, + f.CORPINFO_ID, f.EXPIRYDATE, f.OPERATINGTYPE, f.ATTACHMENT_ROUTE, @@ -39,7 +39,7 @@ MANAGEMENTAGREEMENTNAME, COMPLETIONSTATUS, VALIDSTATUS, - OPERATINGCOMPANY, + CORPINFO_ID, EXPIRYDATE, OPERATINGTYPE, ATTACHMENT_ROUTE, @@ -61,7 +61,7 @@ #{MANAGEMENTAGREEMENTNAME}, #{COMPLETIONSTATUS}, #{VALIDSTATUS}, - #{OPERATINGCOMPANY}, + #{CORPINFO_ID}, #{EXPIRYDATE}, #{OPERATINGTYPE}, #{ATTACHMENT_ROUTE}, @@ -123,8 +123,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.MANAGEMENTAGREEMENTNAME LIKE CONCAT('%', #{pd.MANAGEMENTAGREEMENTNAME}, '%') @@ -142,7 +142,7 @@ i.CORP_NAME from f - left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID where f.MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml index 2fc5bae..d055cad 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml @@ -19,7 +19,7 @@ f.LEVEL, f.REPLY, f.SIGNING, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.PERSON_ID, f.PERSON, f.NOTIFICATIONCONTENT, @@ -49,7 +49,7 @@ LEVEL, REPLY, SIGNING, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, PERSON_ID, PERSON, NOTIFICATIONCONTENT, @@ -79,7 +79,7 @@ #{LEVEL}, #{REPLY}, #{SIGNING}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{PERSON_ID}, #{PERSON}, #{NOTIFICATIONCONTENT}, @@ -135,7 +135,7 @@ LEVEL = #{LEVEL}, REPLY = #{REPLY}, SIGNING = #{SIGNING}, - TRANSPORTATIONCOMPANY = #{TRANSPORTATIONCOMPANY}, + CORPINFO_ID = #{CORPINFO_ID}, PERSON_ID = #{PERSON_ID}, PERSON = #{PERSON}, NOTIFICATIONCONTENT = #{NOTIFICATIONCONTENT}, @@ -167,8 +167,8 @@ i.CORP_NAME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID - where f.ISDELETE = '0' + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.TITLE like CONCAT ('%',#{pd.TITLE},'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml index ee5dee4..2a77267 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml @@ -21,7 +21,7 @@ f.PENALTYEVENT, f.PENALTYMEASURES, f.PENALTYREGISTRANT, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.ISDELETE, f.DELETOR, f.DELETORNAME, @@ -45,7 +45,7 @@ PENALTYEVENT, PENALTYMEASURES, PENALTYREGISTRANT, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, ISDELETE, DELETOR, DELETORNAME, @@ -69,7 +69,7 @@ #{PENALTYEVENT}, #{PENALTYMEASURES}, #{PENALTYREGISTRANT}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{ISDELETE}, #{DELETOR}, #{DELETORNAME}, @@ -135,9 +135,9 @@ u.PHONE from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join sys_user u on f.USER_ID = u.USER_ID - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and u.NAME LIKE CONCAT(CONCAT('%', #{pd.USER_ID}),'%') diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml index c394ba8..89ffd26 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -40,7 +40,7 @@ f.TRUCKCART, f.EMPLOYEEPHONE, f.IDENTITYID, - f.TRANSPORTATIONCOMPANY, + f.CORPINFO_ID, f.PRACTITIONERTYPE, f.PRACTITIONER, f.CONFIRMINGPHONE @@ -78,7 +78,7 @@ TRUCKCART, EMPLOYEEPHONE, IDENTITYID, - TRANSPORTATIONCOMPANY, + CORPINFO_ID, PRACTITIONERTYPE, CONFIRMINGPHONE @@ -115,7 +115,7 @@ #{TRUCKCART}, #{EMPLOYEEPHONE}, #{IDENTITYID}, - #{TRANSPORTATIONCOMPANY}, + #{CORPINFO_ID}, #{PRACTITIONERTYPE}, #{CONFIRMINGPHONE} @@ -167,7 +167,7 @@ p.OPERATTIME AS STOPTIME from f - left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID left join sys_user u on f.PRACTITIONER = u.USER_ID left join bus_traffic_location_management b on f.ORIGIN = b.LOCATIONNAME_ID left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONNAME_ID @@ -175,7 +175,7 @@ left join bus_traffic_customer_management c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID left join bus_traffic_driving_sign t on t.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and t.CHECKTYPE_ID = 'status001' left join bus_traffic_driving_sign p on p.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and p.CHECKTYPE_ID = 'status003' - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS} @@ -195,15 +195,6 @@ - -