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

补充替换CORPINFO_ID通用标识

dev
wangpeng 2024-04-09 21:51:06 +08:00
parent 9a53d54817
commit 78e0bccac5
48 changed files with 193 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityWaybillRegistrationController.java
View File

@ -57,21 +57,6 @@ public class AppTrafficSecurityWaybillRegistrationController extends BaseControl
return map;
}
@RequestMapping(value = "/forSecurityPerson")
@ResponseBody
public Object forSecurityPerson() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
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

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

@ -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<PageData> varList = trafficDrivingCommitmentService.listForDrivingCommitment(page);
map.put("varList", varList);

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

@ -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<PageData> varList = trafficDrivingTypeService.listForDrivingType(page);
map.put("varList", varList);

26
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java
View File

@ -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<PageData> varList = activeService.listForSafetyActivitieslist(page);
varList.forEach(active -> {

26
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java
View File

@ -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<PageData> varList = safetyManualService.listForSafetyManuallist(page);
varList.forEach(manual -> {

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

@ -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<PageData> varList = trafficSafetyMeetingService.listForSafetyMeeting(page);
Date date = DateUtil.fomatDate(DateUtil.getDay());

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

@ -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<PageData> varList = accidentInvestigationService.listForAccidentInvestigation(page);
map.put("varList", varList);

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

@ -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<PageData> 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<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
List<PageData> varList = customerManagementService.getTrafficCustomerSelectList(pd);
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
}

27
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java
View File

@ -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<PageData> 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<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
List<PageData> varList = locationManagementService.getTrafficLocationSelectList(pd);
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
}

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

@ -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<PageData> varList = managementAgreementService.listForManagementAgreementlist(page);

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

@ -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<String, Object> map = new HashMap<String, Object>();
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<PageData> 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");

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

@ -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<PageData> varList = violationRegistrationService.listForViolationRegistration(page);

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

@ -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<PageData> 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<String, Object> map = new HashMap<String, Object>();
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");

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

@ -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<PageData> varList = enterpriseSafetyProductionService.list(page); //列出MajorDangerSource列表
map.put("varList", varList);

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

@ -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<PageData> varList = equipmentFacilityService.list(page); //列出MajorDangerSource列表
map.put("varList", varList);

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

@ -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<PageData> varList = firefightingEquipmentFacilityService.list(page); //列出MajorDangerSource列表
map.put("varList", varList);

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

@ -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<PageData> varList = labourEntrenchThingService.list(page); //列出MajorDangerSource列表
map.put("varList", varList);

1
src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java
View File

@ -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<PageData> varList = scrapManageService.list(page); //列出MajorDangerSource列表
map.put("varList", varList);

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

@ -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<PageData> taxationList = taxationManageService.list(page); //列出MajorDangerSource列表
taxationList.forEach(taxation -> {

1
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java
View File

@ -25,4 +25,5 @@ public interface TrafficSecurityCustomerManagementMapper {
void delete(PageData pd);
List<PageData> getTrafficCustomerSelectList(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java
View File

@ -23,4 +23,6 @@ public interface TrafficSecurityLocationManagementMapper {
List<PageData> datalistPage(Page page);
void delete(PageData pd);
List<PageData> getTrafficLocationSelectList(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java
View File

@ -20,8 +20,6 @@ public interface TrafficSecurityWaybillRegistrationMapper {
void editStatus(PageData pd);
PageData forSecurityPerson(PageData pd);
void delete(PageData pd);
/**通过id获取数据

2
src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java
View File

@ -13,4 +13,6 @@ public interface TrafficSecurityCustomerManagementService {
void saveContact(PageData contactPd);
void delete(PageData pd);
List<PageData> getTrafficCustomerSelectList(PageData pd) throws Exception;
}

2
src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java
View File

@ -11,4 +11,6 @@ public interface TrafficSecurityLocationManagementService {
List<PageData> listForSecurityLocationManagement(Page page);
void delete(PageData pd);
List<PageData> getTrafficLocationSelectList(PageData pd) throws Exception;
}

2
src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java
View File

@ -10,8 +10,6 @@ public interface TrafficSecurityWaybillRegistrationService {
void save(PageData pd);
PageData forSecurityPerson(PageData pd);
void delete(PageData pd);
PageData findById(PageData pd);

5
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java
View File

@ -35,4 +35,9 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu
public void delete(PageData pd) {
customerManagementMapper.delete(pd);
}
@Override
public List<PageData> getTrafficCustomerSelectList(PageData pd) throws Exception {
return customerManagementMapper.getTrafficCustomerSelectList(pd);
}
}

5
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java
View File

@ -27,4 +27,9 @@ public class TrafficSecurityLocationManagementServiceImpl implements TrafficSecu
public void delete(PageData pd) {
locationManagementMapper.delete(pd);
}
@Override
public List<PageData> getTrafficLocationSelectList(PageData pd) throws Exception {
return locationManagementMapper.getTrafficLocationSelectList(pd);
}
}

1
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java
View File

@ -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);

5
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java
View File

@ -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);

2
src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingCommitmentMapper.xml
View File

@ -97,7 +97,7 @@
from
<include refid="tableName"></include> 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}
<if test="pd.INQUIRYCONTENT != null and pd.INQUIRYCONTENT != ''"><!-- 关键词检索 -->
and f.INQUIRYCONTENT LIKE CONCAT(CONCAT('%', #{pd.INQUIRYCONTENT}),'%')
</if>

2
src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingTypeMapper.xml
View File

@ -105,7 +105,7 @@
<include refid="tableName"></include> 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}
<if test="pd.CHECKTYPE_ID != null and pd.CHECKTYPE_ID != ''"><!-- 关键词检索 -->
and f.CHECKTYPE_ID = #{pd.CHECKTYPE_ID}
</if>

10
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml
View File

@ -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
<include refid="tableName"></include> 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}
<if test="pd.ACTIVITIESNAME != null and pd.ACTIVITIESNAME != ''"><!-- 关键词检索-制度名称 -->
and f.ACTIVITIESNAME LIKE CONCAT('%', #{pd.ACTIVITIESNAME}, '%')
</if>

10
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml
View File

@ -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
<include refid="tableName"></include> 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}
<if test="pd.MANUALNAME != null and pd.MANUALNAME != ''"><!-- 关键词检索-制度名称 -->
and f.MANUALNAME LIKE CONCAT('%', #{pd.MANUALNAME}, '%')
</if>

16
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml
View File

@ -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
<include refid="tableName"></include> 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}
<if test="pd.MEETING_TITLE != null and pd.MEETING_TITLE != ''"><!-- 关键词检索-会议标题 -->
and f.MEETING_TITLE like CONCAT('%',#{pd.MEETING_TITLE},'%')
</if>
@ -159,7 +159,7 @@
i.CORP_NAME
from
<include refid="tableName"></include> 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
<include refid="tableName"></include> 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
<include refid="tableName"></include> 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}
</select>

5
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
View File

@ -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 @@
<include refid="tableName"></include> 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}
<if test="pd.USER_ID != null and pd.USER_ID != ''">
and f.USER_ID = #{pd.USER_ID}
</if>

31
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml
View File

@ -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
<include refid="tableName"></include> 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}
<if test="pd.CUSTOMERTYPE != null and pd.CUSTOMERTYPE != ''"><!-- 关键词检索-客户类型 -->
and f.CUSTOMERTYPE = #{pd.CUSTOMERTYPE}
</if>
<if test="pd.TRANSPORTATIONCOMPANY != null and pd.TRANSPORTATIONCOMPANY != ''"><!-- 关键词检索-运输企业 -->
and i.CORP_NAME = #{pd.TRANSPORTATIONCOMPANY}
</select>
<!--列表-->
<select id="getTrafficCustomerSelectList" parameterType="pd" resultType="pd">
select
f.*,
i.CORP_NAME,
u.CONTACT,
u.CONTACT_ID,
u.CONTACTPHONE,
u.CUSTOMERADDRESS,
u.CUSTOMERADDRESS_ID
from
<include refid="tableName"></include> f
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' and f.CORPINFO_ID = #{CORPINFO_ID}
<if test="CUSTOMERTYPE != null and CUSTOMERTYPE != ''"><!-- 关键词检索-客户类型 -->
and f.CUSTOMERTYPE = #{CUSTOMERTYPE}
</if>
</select>
</mapper>

25
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityLocationManagementMapper.xml
View File

@ -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
<include refid="tableName"></include> 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}
<if test="pd.LOCATIONTYPE != null and pd.LOCATIONTYPE != ''"><!-- 关键词检索-客户类型 -->
and f.LOCATIONTYPE = #{pd.LOCATIONTYPE}
</if>
<if test="pd.TRANSPORTATIONCOMPANY != null and pd.TRANSPORTATIONCOMPANY != ''"><!-- 关键词检索-运输企业 -->
and i.CORP_NAME = #{pd.TRANSPORTATIONCOMPANY}
</select>
<!--列表-->
<select id="getTrafficLocationSelectList" parameterType="pd" resultType="pd">
select
f.*,
i.CORP_NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.CORPINFO_ID = i.CORPINFO_ID
where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID}
<if test="LOCATIONTYPE != null and LOCATIONTYPE != ''"><!-- 关键词检索-客户类型 -->
and f.LOCATIONTYPE = #{LOCATIONTYPE}
</if>
</select>
</mapper>

12
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml
View File

@ -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
<include refid="tableName"></include> 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}
<if test="pd.MANAGEMENTAGREEMENTNAME != null and pd.MANAGEMENTAGREEMENTNAME != ''"><!-- 关键词检索-制度名称 -->
and f.MANAGEMENTAGREEMENTNAME LIKE CONCAT('%', #{pd.MANAGEMENTAGREEMENTNAME}, '%')
</if>
@ -142,7 +142,7 @@
i.CORP_NAME
from
<include refid="tableName"></include> 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}
</select>

12
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml
View File

@ -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
<include refid="tableName"></include> 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}
<if test="pd.TITLE != null and pd.TITLE != ''"><!-- 关键词检索-通知标题 -->
and f.TITLE like CONCAT ('%',#{pd.TITLE},'%')
</if>

10
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml
View File

@ -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
<include refid="tableName"></include> 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}
<if test="pd.USER_ID != null and pd.USER_ID != ''">
and u.NAME LIKE CONCAT(CONCAT('%', #{pd.USER_ID}),'%')
</if>

19
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
View File

@ -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
</sql>
@ -115,7 +115,7 @@
#{TRUCKCART},
#{EMPLOYEEPHONE},
#{IDENTITYID},
#{TRANSPORTATIONCOMPANY},
#{CORPINFO_ID},
#{PRACTITIONERTYPE},
#{CONFIRMINGPHONE}
</sql>
@ -167,7 +167,7 @@
p.OPERATTIME AS STOPTIME
from
<include refid="tableName"></include> 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}
<if test="pd.WAYBILLSTATUS != null and pd.WAYBILLSTATUS != ''"><!-- 关键词检索-运单状态 -->
and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS}
</if>
@ -195,15 +195,6 @@
</if>
</select>
<select id="forSecurityPerson" resultType="com.zcloud.entity.PageData"
parameterType="com.zcloud.entity.PageData">
select
i.CORP_NAME
from
bus_corp_info i
where i.CORPINFO_ID = #{TRANSPORTATIONCOMPANY}
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="pd">
select
<include refid="Field"></include>,

2
src/main/resources/mybatis/datasource/enterpriseSafetyProduction/EnterpriseSafetyProductionMapper.xml
View File

@ -330,7 +330,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.WATCHKEEPER != null and pd.WATCHKEEPER != ''"><!-- 关键词检索 -->
and f.WATCHKEEPER LIKE CONCAT(CONCAT('%', #{pd.WATCHKEEPER}),'%')
</if>

2
src/main/resources/mybatis/datasource/equipmentFacility/EquipmentFacilityMapper.xml
View File

@ -340,7 +340,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.FACILITY_NAME != null and pd.FACILITY_NAME != ''"><!-- 关键词检索 -->
and f.FACILITY_NAME LIKE CONCAT(CONCAT('%', #{pd.FACILITY_NAME}),'%')
</if>

2
src/main/resources/mybatis/datasource/firefightingEquipmentFacility/FirefightingEquipmentFacilityMapper.xml
View File

@ -340,7 +340,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.FACILITY_NAME != null and pd.FACILITY_NAME != ''"><!-- 关键词检索 -->
and f.FACILITY_NAME LIKE CONCAT(CONCAT('%', #{pd.FACILITY_NAME}),'%')
</if>

2
src/main/resources/mybatis/datasource/labourEntrenchThing/LabourEntrenchThingMapper.xml
View File

@ -346,7 +346,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.PERSON_NAME != null and pd.PERSON_NAME != ''"><!-- 关键词检索 -->
and f.PERSON_NAME LIKE CONCAT(CONCAT('%', #{pd.PERSON_NAME}),'%')
</if>

2
src/main/resources/mybatis/datasource/reportedIncident/ReportedIncidentMapper.xml
View File

@ -153,7 +153,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.REPORTED_DATE != null and pd.REPORTED_DATE != ''">
and f.REPORTED_DATE = #{pd.REPORTED_DATE}
</if>

2
src/main/resources/mybatis/datasource/scrapManage/ScrapManage.xml
View File

@ -380,7 +380,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.SCRAP_VEHICLEMODEL != null and pd.SCRAP_VEHICLEMODEL != ''"><!-- 关键词检索 -->
and f.SCRAP_VEHICLEMODEL = #{pd.SCRAP_VEHICLEMODEL}
</if>

2
src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml
View File

@ -409,7 +409,7 @@
FROM
<include refid="tableName"></include> f
LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.FREIGHTTRAILER_ID
WHERE f.ISDELETE = '0'
WHERE f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''">
AND f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}), '%')
</if>