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

安全生产月活动，安全知识手册模块开发 

运单登记，地点管理模块优化
dev
WenShiJun 2024-03-21 08:42:15 +08:00
parent c40c8fe706
commit 7558066cb4
38 changed files with 1198 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,9 +43,9 @@ public class AppTrafficSafetyMeetingController extends BaseController {
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());
// String MEETING_TYPE = pd.getString("MEETING_TYPE"); // 关键词检索条件
// if (Tools.notEmpty(MEETING_TYPE))
// pd.put("MEETING_TYPE", MEETING_TYPE.trim());
page.setPd(pd);
List<PageData> varList = trafficSafetyMeetingService.listForSafetyMeeting(page);

180
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java Normal file
View File

@ -0,0 +1,180 @@
package com.zcloud.controller.comprehensive;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.comprehensive.TrafficSafetyActivitiesService;
import com.zcloud.service.comprehensive.TrafficSafetyProductionService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping("/activities")
public class TrafficSafetyActivitiesController extends BaseController {
@Autowired
private TrafficSafetyActivitiesService activeService;
@Autowired
private Smb smb;
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
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("ACTIVITIES_ID", activities_Id); // 主键
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
pd.put("COMPLETIONSTATUS", "0");
pd.put("ISDELETE", "0");
if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
pd.put("VALIDSTATUS", "0");
} else {
pd.put("VALIDSTATUS", "1");
}
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){
pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
activeService.save(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
//修改
@RequestMapping(value = "/edit")
@ResponseBody
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
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("ISDELETE", "0");
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
activeService.edit(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
/**
* 列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSafetyActivitieslist")
@ResponseBody
public Object listForSafetyActivitieslist(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
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());
page.setPd(pd);
List<PageData> varList = activeService.listForSafetyActivitieslist(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
//详情
@RequestMapping(value="/goEdit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = activeService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
activeService.delete(pd);
map.put("result", errInfo);
return map;
}
}

179
src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java Normal file
View File

@ -0,0 +1,179 @@
package com.zcloud.controller.comprehensive;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.comprehensive.TrafficSafetyManualService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping("/manual")
public class TrafficSafetyManualController extends BaseController {
@Autowired
private TrafficSafetyManualService safetyManualService;
@Autowired
private Smb smb;
@RequestMapping(value = "/add")
@ResponseBody
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
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("MANUAL_ID", manual_Id); // 主键
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
pd.put("COMPLETIONSTATUS", "0");
pd.put("ISDELETE", "0");
if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) {
pd.put("VALIDSTATUS", "0");
} else {
pd.put("VALIDSTATUS", "1");
}
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){
pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
safetyManualService.save(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
//修改
@RequestMapping(value = "/edit")
@ResponseBody
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
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("ISDELETE", "0");
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
pd.put("COMPLETIONSTATUS", "1");
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) {
errInfo = "fail";
map.put("result", errInfo);
map.put("msg", "文件格式不正确！");
return map;
}
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
}
safetyManualService.edit(pd);
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
/**
* 列表
* @param page
* @return
* @throws Exception
*/
@RequestMapping(value = "/listForSafetyManuallist")
@ResponseBody
public Object listForSafetyManuallist(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
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());
page.setPd(pd);
List<PageData> varList = safetyManualService.listForSafetyManuallist(page);
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
//详情
@RequestMapping(value="/goEdit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = safetyManualService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
safetyManualService.delete(pd);
map.put("result", errInfo);
return map;
}
}

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

@ -1,5 +1,6 @@
package com.zcloud.controller.comprehensive;
import com.alibaba.fastjson.JSON;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -32,24 +33,44 @@ public class TrafficSecurityCustomerManagementController extends BaseController
@RequestMapping(value = "/add")
@ResponseBody
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
String errInfo = "success";
PageData pd = this.getPageData();
PageData pd = this.getPageData(); // 获取页面提交的数据
String customermanagement_id = this.get32UUID();
pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 创建人id
pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 主键
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
pd.put("ISDELETE", "0");
String customermanagement_id = this.get32UUID(); // 生成主键ID
pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 设置客户管理ID
pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 设置运输公司ID
pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID
pd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间
pd.put("ISDELETE", "0"); // 设置删除标志
customerManagementService.save(pd);
if ( pd.getString("contacts") != null && ! pd.getString("contacts").isEmpty()){
List<PageData> contacts = JSON.parseArray(pd.getString("contacts"), PageData.class);
for (PageData contact : contacts) {
PageData contactPd = new PageData();
contactPd.put("CUSTOMERCONTACT_ID", this.get32UUID());
contactPd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id);
contactPd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID
contactPd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名
contactPd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间
contactPd.put("CONTACT", contact.get("CONTACT"));
contactPd.put("CONTACTPHONE", contact.get("CONTACTPHONE"));
contactPd.put("CUSTOMERADDRESS", contact.get("CUSTOMERADDRESS"));
contactPd.put("ISDELETE", "0"); // 设置删除标志
customerManagementService.saveContact(contactPd);
}
}
map.put("result", errInfo);
map.put("pd", pd);
return map;
}
@RequestMapping(value = "/listForSecurityCustomerManagement")
@ResponseBody
public Object listForSecurityCustomerManagement(Page page) throws Exception {
@ -73,4 +94,23 @@ public class TrafficSecurityCustomerManagementController extends BaseController
map.put("result", errInfo);
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
customerManagementService.delete(pd);
map.put("result", errInfo);
return map;
}
}

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

@ -72,4 +72,24 @@ public class TrafficSecurityLocationManagementController extends BaseController
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
locationManagementService.delete(pd);
map.put("result", errInfo);
return map;
}
}

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

@ -107,16 +107,16 @@ public class TrafficSecurityNoticeController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String PRACTITIONER = pd.getString("PRACTITIONER"); // 关键词检索条件
String PRACTITIONER = pd.getString("PRACTITIONER");// 关键词检索条件
if (Tools.notEmpty(PRACTITIONER))
pd.put("PRACTITIONER", PRACTITIONER.trim());
String PRACTITIONERTYPE = pd.getString("PRACTITIONERTYPE"); // 关键词检索条件
String PRACTITIONERTYPE = pd.getString("PRACTITIONERTYPE");// 关键词检索条件
if (Tools.notEmpty(PRACTITIONERTYPE))
pd.put("PRACTITIONERTYPE", PRACTITIONERTYPE.trim());
String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS"); // 关键词检索条件
String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS");// 关键词检索条件
if (Tools.notEmpty(SIGNEDSTATUS))
pd.put("SIGNEDSTATUS", SIGNEDSTATUS.trim());
String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件
String REPLYSTATUS = pd.getString("REPLYSTATUS");// 关键词检索条件
if (Tools.notEmpty(REPLYSTATUS))
pd.put("REPLYSTATUS", REPLYSTATUS.trim());
page.setPd(pd);
@ -135,11 +135,11 @@ public class TrafficSecurityNoticeController extends BaseController {
String errInfo = "success";
PageData pd = this.getPageData();
String TITLE = pd.getString("TITLE"); // 关键词检索条件
String TITLE = pd.getString("TITLE");// 关键词检索条件
if (Tools.notEmpty(TITLE))
pd.put("TITLE", TITLE.trim());
String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件
String REPLYSTATUS = pd.getString("REPLYSTATUS");// 关键词检索条件
if (Tools.notEmpty(REPLYSTATUS))
pd.put("REPLYSTATUS", REPLYSTATUS.trim());
@ -186,7 +186,7 @@ public class TrafficSecurityNoticeController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = securityNoticeService.findById(pd); //根据ID读取
pd = securityNoticeService.findById(pd);//根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
@ -204,11 +204,12 @@ public class TrafficSecurityNoticeController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID()); //删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername()); //删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date())); //删除时间
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
securityNoticeService.delete(pd);
map.put("result", errInfo); //返回结果
securityReadDetail.delete(pd);
map.put("result", errInfo);//返回结果
return map;
}
@ -229,7 +230,7 @@ public class TrafficSecurityNoticeController extends BaseController {
String ArrayDATA_IDS[] = DATA_IDS.split(",");
for (String id : ArrayDATA_IDS) {
pd.put("NOTIFICATION_ID", id);
pd.put("DELETORNAME", Jurisdiction.getUsername()); //删除人
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
securityNoticeService.delete(pd);
}
@ -237,7 +238,7 @@ public class TrafficSecurityNoticeController extends BaseController {
}else{
errInfo = "error";
}
map.put("result", errInfo); //返回结果
map.put("result", errInfo);//返回结果
return map;
}
}

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

@ -81,9 +81,8 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业
pd.put("WAYBILLREGISTRATION_ID", waybillregistrationId); // 主键
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
pd.put("WAYBILLNUMBER", this.get32UUID()); // 添加时间
pd.put("ISDELETE", "0");
Date shippingDate = DateUtil.str2Date(pd.getString("SHIPPINGDATE"));
Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE"));
if (shippingDate != null && shippingDate.after(new Date())) {
pd.put("WAYBILLSTATUS", "1");
} else {
@ -96,4 +95,53 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
map.put("pd", pd);
return map;
}
/**
* 删除
* @return
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
trafficSecurityWaybillRegistrationService.delete(pd);
map.put("result", errInfo);
return map;
}
/**批量删除
* @param
* @throws Exception
*/
@RequestMapping(value="/deleteAll")
@ResponseBody
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
String err="";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
for (String id : ArrayDATA_IDS) {
pd.put("WAYBILLREGISTRATION_ID", id);
pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人
pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间
trafficSecurityWaybillRegistrationService.delete(pd);
}
errInfo = "success";
}else{
errInfo = "error";
}
map.put("result", errInfo);//返回结果
return map;
}
}

25
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -167,6 +167,31 @@ public class UsersController extends BaseController {
return map;
}
/**
* 根据从业类型查询用户
*
* @param page
* @return
* @throws Exception
*/
@RequestMapping("/listSelectPersonType")
@ResponseBody
@LogAnno(menuType = "综合管理", menuServer = "特种设备", instructionsOperate = "设备管理", instructionsType = "用户列表")
public Object listSelectPersonType(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
page.setPd(pd);
List<PageData> userList = usersService.userSelectPersonTypelistPage(page);//列出用户列表
map.put("userList", userList);
map.put("page", page);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* 去新增用户页面

20
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyActivitiesMapper.java Normal file
View File

@ -0,0 +1,20 @@
package com.zcloud.mapper.datasource.comprehensive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface TrafficSafetyActivitiesMapper {
void save(PageData pd);
List<PageData> datalistPage(Page page);
void edit(PageData pd);
PageData findById(PageData pd);
void delete(PageData pd);
}

20
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyManualMapper.java Normal file
View File

@ -0,0 +1,20 @@
package com.zcloud.mapper.datasource.comprehensive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface TrafficSafetyManualMapper {
void save(PageData pd);
List<PageData> datalistPage(Page page);
void edit(PageData pd);
PageData findById(PageData pd);
void delete(PageData pd);
}

10
src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java Normal file
View File

@ -0,0 +1,10 @@
package com.zcloud.mapper.datasource.comprehensive;
import com.zcloud.entity.PageData;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface TrafficSecurityCustomerContactMapper {
void saveContact(PageData contactPd);
}

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

@ -22,4 +22,7 @@ public interface TrafficSecurityCustomerManagementMapper {
*/
List<PageData> datalistPage(Page page);
void delete(PageData pd);
}

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

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

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

@ -14,4 +14,6 @@ public interface TrafficSecurityReadDetailMapper {
public List<PageData> listByUserId (Page page);
void edit(PageData pd);
void delete(PageData pd);
}

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

@ -19,4 +19,6 @@ public interface TrafficSecurityWaybillRegistrationMapper {
void save(PageData pd);
PageData forSecurityPerson(PageData pd);
void delete(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
View File

@ -269,4 +269,6 @@ public interface UsersMapper {
List<PageData> simplelistPage(Page page);
List<PageData> getByUserId(PageData entity);
List<PageData> userSelectPersonTypelistPage(Page page);
}

19
src/main/java/com/zcloud/service/comprehensive/TrafficSafetyActivitiesService.java Normal file
View File

@ -0,0 +1,19 @@
package com.zcloud.service.comprehensive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
public interface TrafficSafetyActivitiesService {
void save(PageData pd);
void edit(PageData pd);
List<PageData> listForSafetyActivitieslist(Page page);
PageData findById(PageData pd);
void delete(PageData pd);
}

18
src/main/java/com/zcloud/service/comprehensive/TrafficSafetyManualService.java Normal file
View File

@ -0,0 +1,18 @@
package com.zcloud.service.comprehensive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
public interface TrafficSafetyManualService {
void save(PageData pd);
void edit(PageData pd);
List<PageData> listForSafetyManuallist(Page page);
PageData findById(PageData pd);
void delete(PageData pd);
}

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

@ -9,4 +9,8 @@ public interface TrafficSecurityCustomerManagementService {
void save(PageData pd);
List<PageData> listForSecurityCustomerManagement(Page page);
void saveContact(PageData contactPd);
void delete(PageData pd);
}

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

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

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

@ -13,4 +13,6 @@ public interface TrafficSecurityReadDetailService {
List<PageData> listByUserId(Page page) throws Exception;
void edit(PageData pd);
void delete(PageData pd);
}

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

@ -11,4 +11,6 @@ public interface TrafficSecurityWaybillRegistrationService {
void save(PageData pd);
PageData forSecurityPerson(PageData pd);
void delete(PageData pd);
}

40
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyActivitiesServiceImpl.java Normal file
View File

@ -0,0 +1,40 @@
package com.zcloud.service.comprehensive.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyActivitiesMapper;
import com.zcloud.service.comprehensive.TrafficSafetyActivitiesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class TrafficSafetyActivitiesServiceImpl implements TrafficSafetyActivitiesService {
@Autowired
private TrafficSafetyActivitiesMapper accessMapper;
@Override
public void save(PageData pd) {
accessMapper.save(pd);
}
@Override
public void edit(PageData pd) {
accessMapper.edit(pd);
}
@Override
public List<PageData> listForSafetyActivitieslist(Page page) {
return accessMapper.datalistPage(page);
}
@Override
public PageData findById(PageData pd) {
return accessMapper.findById(pd);
}
@Override
public void delete(PageData pd) {
accessMapper.delete(pd);
}
}

39
src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyManualServiceImpl.java Normal file
View File

@ -0,0 +1,39 @@
package com.zcloud.service.comprehensive.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyManualMapper;
import com.zcloud.service.comprehensive.TrafficSafetyManualService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class TrafficSafetyManualServiceImpl implements TrafficSafetyManualService {
@Autowired
private TrafficSafetyManualMapper strategyMapper;
@Override
public void save(PageData pd) {
strategyMapper.save(pd);
}
@Override
public void edit(PageData pd) {
strategyMapper.edit(pd);
}
@Override
public List<PageData> listForSafetyManuallist(Page page) {
return strategyMapper.datalistPage(page);
}
@Override
public PageData findById(PageData pd) {
return strategyMapper.findById(pd);
}
@Override
public void delete(PageData pd) {
strategyMapper.delete(pd);
}
}

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

@ -2,6 +2,7 @@ package com.zcloud.service.comprehensive.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCustomerContactMapper;
import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCustomerManagementMapper;
import com.zcloud.service.comprehensive.TrafficSecurityCustomerManagementService;
import org.springframework.beans.factory.annotation.Autowired;
@ -13,6 +14,8 @@ import java.util.List;
public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecurityCustomerManagementService {
@Autowired
private TrafficSecurityCustomerManagementMapper customerManagementMapper;
@Autowired
private TrafficSecurityCustomerContactMapper customerContactMapper;
@Override
public void save(PageData pd) {
customerManagementMapper.save(pd);
@ -22,4 +25,14 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu
public List<PageData> listForSecurityCustomerManagement(Page page) {
return customerManagementMapper.datalistPage(page);
}
@Override
public void saveContact(PageData contactPd) {
customerContactMapper.saveContact(contactPd);
}
@Override
public void delete(PageData pd) {
customerManagementMapper.delete(pd);
}
}

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

@ -22,4 +22,9 @@ public class TrafficSecurityLocationManagementServiceImpl implements TrafficSecu
public List<PageData> listForSecurityLocationManagement(Page page) {
return locationManagementMapper.datalistPage(page);
}
@Override
public void delete(PageData pd) {
locationManagementMapper.delete(pd);
}
}

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

@ -33,4 +33,9 @@ public class TrafficSecurityReadDetailImpl implements TrafficSecurityReadDetailS
public void edit(PageData pd) {
securityReadDetailMapper.edit(pd);
}
@Override
public void delete(PageData pd) {
securityReadDetailMapper.delete(pd);
}
}

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

@ -28,4 +28,9 @@ public class TrafficSecurityWaybillRegistrationServiceImpl implements TrafficSec
public PageData forSecurityPerson(PageData pd) {
return TrafficSecurityWaybillRegistrationMapper.forSecurityPerson(pd);
}
@Override
public void delete(PageData pd) {
TrafficSecurityWaybillRegistrationMapper.delete(pd);
}
}

2
src/main/java/com/zcloud/service/system/UsersService.java
View File

@ -316,4 +316,6 @@ public interface UsersService {
PageData getInfo(PageData request) throws Exception;
void setState(PageData request) throws Exception;
List<PageData> userSelectPersonTypelistPage(Page page);
}

5
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -649,4 +649,9 @@ public class UsersServiceImpl implements UsersService {
public void setState(PageData request) throws Exception {
usersMapper.editUser(request);
}
@Override
public List<PageData> userSelectPersonTypelistPage(Page page) {
return usersMapper.userSelectPersonTypelistPage(page);
}
}

146
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml Normal file
View File

@ -0,0 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSafetyActivitiesMapper">
<!-- 表名 -->
<sql id="tableName">
BUS_TRAFFIC_SAFETY_ACTIVITIES
</sql>
<!-- 数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.ACTIVITIES_ID,
f.ACTIVITIESNAME,
f.COMPLETIONSTATUS,
f.CYCLE,
f.VALIDSTATUS,
f.OPERATINGCOMPANY,
f.EXPIRYDATE,
f.ATTACHMENT_ROUTE,
f.ISDELETE,
f.DELETOR,
f.DELETORNAME,
f.DELETETIME,
f.CREATOR,
f.CREATORNAME,
f.CREATETIME,
f.OPERATOR,
f.OPERATORNAME,
f.OPERATTIME
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
ACTIVITIES_ID,
ACTIVITIESNAME,
COMPLETIONSTATUS,
CYCLE,
VALIDSTATUS,
OPERATINGCOMPANY,
EXPIRYDATE,
ATTACHMENT_ROUTE,
ISDELETE,
DELETOR,
DELETORNAME,
DELETETIME,
CREATOR,
CREATORNAME,
CREATETIME,
OPERATOR,
OPERATORNAME,
OPERATTIME
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{ACTIVITIES_ID},
#{ACTIVITIESNAME},
#{COMPLETIONSTATUS},
#{CYCLE},
#{VALIDSTATUS},
#{OPERATINGCOMPANY},
#{EXPIRYDATE},
#{ATTACHMENT_ROUTE},
#{ISDELETE},
#{DELETOR},
#{DELETORNAME},
#{DELETETIME},
#{CREATOR},
#{CREATORNAME},
#{CREATETIME},
#{OPERATOR},
#{OPERATORNAME},
#{OPERATTIME}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
EXPIRYDATE = #{EXPIRYDATE},
CYCLE = #{CYCLE},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
where
ACTIVITIES_ID = #{ACTIVITIES_ID}
</update>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
ACTIVITIES_ID = #{ACTIVITIES_ID}
</delete>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
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'
<if test="pd.ACTIVITIESNAME != null and pd.ACTIVITIESNAME != ''"><!-- 关键词检索-制度名称 -->
and f.ACTIVITIESNAME LIKE CONCAT('%', #{pd.ACTIVITIESNAME}, '%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and f.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.ACTIVITIES_ID = #{ACTIVITIES_ID}
</select>
</mapper>

142
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml Normal file
View File

@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSafetyManualMapper">
<!-- 表名 -->
<sql id="tableName">
BUS_TRAFFIC_SAFETY_MANUAL
</sql>
<!-- 数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.MANUAL_ID,
f.MANUALNAME,
f.COMPLETIONSTATUS,
f.VALIDSTATUS,
f.OPERATINGCOMPANY,
f.EXPIRYDATE,
f.ATTACHMENT_ROUTE,
f.ISDELETE,
f.DELETOR,
f.DELETORNAME,
f.DELETETIME,
f.CREATOR,
f.CREATORNAME,
f.CREATETIME,
f.OPERATOR,
f.OPERATORNAME,
f.OPERATTIME
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
MANUAL_ID,
MANUALNAME,
COMPLETIONSTATUS,
VALIDSTATUS,
OPERATINGCOMPANY,
EXPIRYDATE,
ATTACHMENT_ROUTE,
ISDELETE,
DELETOR,
DELETORNAME,
DELETETIME,
CREATOR,
CREATORNAME,
CREATETIME,
OPERATOR,
OPERATORNAME,
OPERATTIME
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{MANUAL_ID},
#{MANUALNAME},
#{COMPLETIONSTATUS},
#{VALIDSTATUS},
#{OPERATINGCOMPANY},
#{EXPIRYDATE},
#{ATTACHMENT_ROUTE},
#{ISDELETE},
#{DELETOR},
#{DELETORNAME},
#{DELETETIME},
#{CREATOR},
#{CREATORNAME},
#{CREATETIME},
#{OPERATOR},
#{OPERATORNAME},
#{OPERATTIME}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME},
EXPIRYDATE = #{EXPIRYDATE},
ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
where
MANUAL_ID = #{MANUAL_ID}
</update>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
MANUAL_ID = #{MANUAL_ID}
</delete>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
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'
<if test="pd.MANUALNAME != null and pd.MANUALNAME != ''"><!-- 关键词检索-制度名称 -->
and f.MANUALNAME LIKE CONCAT('%', #{pd.MANUALNAME}, '%')
</if>
<if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''"><!-- 关键词检索-完成状态 -->
and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}
</if>
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and f.VALIDSTATUS = #{pd.VALIDSTATUS}
</if>
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.MANUAL_ID = #{MANUAL_ID}
</select>
</mapper>

84
src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml Normal file
View File

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCustomerContactMapper">
<sql id="tableName">
BUS_TRAFFIC_CUSTOMER_CONTACT
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<!-- 字段 -->
<sql id="Field">
f.CUSTOMERCONTACT_ID,
f.CUSTOMERMANAGEMENT_ID,
f.CONTACT,
f.CONTACTPHONE,
f.CUSTOMERADDRESS,
f.ISDELETE,
f.DELETOR,
f.DELETORNAME,
f.DELETETIME,
f.CREATOR,
f.CREATORNAME,
f.CREATETIME,
f.OPERATOR,
f.OPERATORNAME,
f.OPERATTIME
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
CUSTOMERCONTACT_ID,
CUSTOMERMANAGEMENT_ID,
CONTACT,
CONTACTPHONE,
CUSTOMERADDRESS,
ISDELETE,
DELETOR,
DELETORNAME,
DELETETIME,
CREATOR,
CREATORNAME,
CREATETIME,
OPERATOR,
OPERATORNAME,
OPERATTIME
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{CUSTOMERCONTACT_ID},
#{CUSTOMERMANAGEMENT_ID},
#{CONTACT},
#{CONTACTPHONE},
#{CUSTOMERADDRESS},
#{ISDELETE},
#{DELETOR},
#{DELETORNAME},
#{DELETETIME},
#{CREATOR},
#{CREATORNAME},
#{CREATETIME},
#{OPERATOR},
#{OPERATORNAME},
#{OPERATTIME}
</sql>
<!-- 新增-->
<insert id="saveContact" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
</mapper>

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

@ -15,9 +15,6 @@
f.CUSTOMERMANAGEMENT_ID,
f.CUSTOMERTYPE,
f.CUSTOMERNAME,
f.CONTACT,
f.CONTACTPHONE,
f.CUSTOMERADDRESS,
f.TRANSPORTATIONCOMPANY,
f.ISDELETE,
f.DELETOR,
@ -36,9 +33,6 @@
CUSTOMERMANAGEMENT_ID,
CUSTOMERTYPE,
CUSTOMERNAME,
CONTACT,
CONTACTPHONE,
CUSTOMERADDRESS,
TRANSPORTATIONCOMPANY,
ISDELETE,
DELETOR,
@ -57,9 +51,6 @@
#{CUSTOMERMANAGEMENT_ID},
#{CUSTOMERTYPE},
#{CUSTOMERNAME},
#{CONTACT},
#{CONTACTPHONE},
#{CUSTOMERADDRESS},
#{TRANSPORTATIONCOMPANY},
#{ISDELETE},
#{DELETOR},
@ -84,14 +75,30 @@
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID}
</delete>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME
i.CORP_NAME,
u.CONTACT,
u.CONTACTPHONE,
u.CUSTOMERADDRESS
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
left join bus_traffic_customer_contact u on f.CUSTOMERMANAGEMENT_ID = u.CUSTOMERMANAGEMENT_ID
where f.ISDELETE = '0'
<if test="pd.CUSTOMERTYPE != null and pd.CUSTOMERTYPE != ''"><!-- 关键词检索-客户类型 -->
and f.CUSTOMERTYPE = #{pd.CUSTOMERTYPE}

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

@ -88,6 +88,18 @@
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
LOCATIONMANAGEMENT_ID = #{LOCATIONMANAGEMENT_ID}
</delete>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select

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

@ -104,6 +104,18 @@
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
NOTIFICATION_ID = #{NOTIFICATION_ID}
</delete>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select

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

@ -132,14 +132,32 @@
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETOR = #{DELETOR},
DELETETIME = #{DELETETIME}
where
WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}
</delete>
<!--列表-->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
i.CORP_NAME
i.CORP_NAME,
u.NAME,
b.LOCATIONNAME AS ORIGIN_NAME,
b2.LOCATIONNAME AS DESTINATION_NAME
from
<include refid="tableName"></include> f
left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = 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.LOCATIONMANAGEMENT_ID
left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONMANAGEMENT_ID
where f.ISDELETE = '0'
<if test="pd.WAYBILLSTATUS != null and pd.WAYBILLSTATUS != ''"><!-- 关键词检索-运单状态 -->
and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS}

24
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -1559,4 +1559,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where
f.USER_ID = #{USER_ID}
</select>
<!-- 用户类型用户列表 -->
<select id="userSelectPersonTypelistPage" parameterType="page" resultType="pd" >
select u.USER_ID,
u.USERNAME,
u.PASSWORD,
u.LAST_LOGIN,
u.NAME,
u.SEX,
u.IP,
u.EMAIL,
u.NUMBER,
u.PHONE,
u.ISMAIN,
u.PUSH_CID,
r.PERSONNEL_TYPE
from <include refid="tableName"></include> u
left join sys_userinfo r on u.USER_ID = r.USER_ID
left join sys_dictionaries d on r.PERSONNEL_TYPE = d.DICTIONARIES_ID
where
u.ISDELETE = 0
and d.DICTIONARIES_ID = '5ae743c76dbf496eb1b5101075b073d5'
</select>
</mapper>