diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java new file mode 100644 index 0000000..cc23727 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java @@ -0,0 +1,141 @@ +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.TrafficSafetyMeetingRecipienService; +import com.zcloud.service.comprehensive.TrafficSafetyMeetingService; +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("/app/safetymeeting") +public class AppTrafficSafetyMeetingController extends BaseController { + + @Autowired + private TrafficSafetyMeetingService trafficSafetyMeetingService; + @Autowired + private TrafficSafetyMeetingRecipienService meetingRecipienService; + @Autowired + private Smb smb; + //列表 + @RequestMapping(value = "/listForSafetyMeeting") + @ResponseBody + public Object listForSecurityNotice(Page page) throws Exception { + Map map = new HashMap(); + 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()); + + page.setPd(pd); + List varList = trafficSafetyMeetingService.listForSafetyMeeting(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + 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()));//删除时间 + trafficSafetyMeetingService.delete(pd); + map.put("result", errInfo); + return map; + } + + //详情 + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd = trafficSafetyMeetingService.findById(pd); // 根据ID读取 + if (pd == null) { + map.put("pd", pd); // 这里pd是null + map.put("result", errInfo); + return map; + } + List varList = trafficSafetyMeetingService.listForSafetyMeetingRecipient(pd); + int realPersonNum = 0; + for (PageData pageData : varList) { + if ("1".equals(pageData.getString("ATTENDANCE_STATUS"))) { + realPersonNum++; + } + } + pd.put("totalPersonNum", varList.size()); + pd.put("realPersonNum", realPersonNum); + pd.put("recipientsList", varList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + 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("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + 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("TRANSPORTATIONCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + meetingRecipienService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java index 671e8a5..34a3a97 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java @@ -29,13 +29,13 @@ public class TrafficSafetyMeetingController extends BaseController { @RequestMapping(value = "/add") @ResponseBody - public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file,@RequestParam(value="VVIDEO",required=false) MultipartFile videoFile) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); String safety_meeting_id = this.get32UUID(); - + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 pd.put("SAFETY_MEETING_ID", safety_meeting_id); // 主键 @@ -48,18 +48,33 @@ public class TrafficSafetyMeetingController extends BaseController { String ffile = DateUtil.getDays(); if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + 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("CORPINFO_ID") + "/" + ffile); - pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd.put("CONFIRM_MESSAGE",pd.getString("CREATORNAME")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); + pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } + + // 处理 videoFile + if (videoFile != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))) { + String videoSuffixName = videoFile.getOriginalFilename().substring(videoFile.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"mp4".equals(videoSuffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "视频文件格式不正确！"); + 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); + pd.put("VIDEO_NAME",pd.getString("CREATORNAME")); + } String meetingDate = pd.getString("MEETING_DATE"); String[] dates = meetingDate.split(","); if (dates.length == 2){ @@ -67,6 +82,19 @@ public class TrafficSafetyMeetingController extends BaseController { pd.put("MEETING_DATE_END", dates[1].trim()); } trafficSafetyMeetingService.save(pd); + + String[] personIds = pd.getString("PERSON_ID").split(","); + for (String personId : personIds) { + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("SAFETY_MEETING_ID", safety_meeting_id); + pd.put("PRACTITIONER", personId.trim()); + pd.put("PERSON_ID", personId.trim()); + pd.put("SAFETY_MEETING_RECIPIENT_ID", this.get32UUID()); // 主键 + pd.put("ATTENDANCE_STATUS", "0"); // 参会状态 + trafficSafetyMeasureetingRecipienService.save(pd); + } map.put("result", errInfo); map.put("pd", pd); return map; @@ -194,8 +222,8 @@ public class TrafficSafetyMeetingController extends BaseController { if (Tools.notEmpty(REPLYSTATUS)) pd.put("REPLYSTATUS", REPLYSTATUS.trim()); page.setPd(pd); - List notifications = trafficSafetyMeasureetingRecipienService.getAllRecipient(page); - map.put("varList", notifications); + List varList = trafficSafetyMeasureetingRecipienService.getAllRecipient(page); + map.put("varList", varList); map.put("page", page); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index 271a002..0c33c39 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -31,7 +31,7 @@ public class TrafficSecurityCustomerManagementController extends BaseController //新增 @RequestMapping(value = "/add") @ResponseBody - public Object add(@RequestParam(value="fileList",required=false) MultipartFile file, @RequestParam(value="videoList",required=false) MultipartFile videoFile) throws Exception { + public Object add() throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java new file mode 100644 index 0000000..5bd237f --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java @@ -0,0 +1,143 @@ +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.TrafficSecurityManagementStaffingService; +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("/staffing") +public class TrafficSecurityManagementStaffingController extends BaseController { + @Autowired + private TrafficSecurityManagementStaffingService securityManagementStaffingService; + @Autowired + private Smb smb; + //新增 + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + String staffingId = this.get32UUID(); + + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("STAFFING_ID", staffingId); // 主键 + 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())); + } + + securityManagementStaffingService.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 map = new HashMap(); + 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()); // 经营企业 + 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())); + } + + securityManagementStaffingService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + @RequestMapping(value = "/listForSecurityStaffing") + @ResponseBody + public Object listForSecurityWaybillRegistra(Page page) throws Exception { + Map map = new HashMap(); + 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()); + + String OPERATIONTYPE = pd.getString("OPERATIONTYPE"); // 关键词检索条件 + if (Tools.notEmpty(OPERATIONTYPE)) + pd.put("OPERATIONTYPE", OPERATIONTYPE.trim()); + + page.setPd(pd); + List varList = securityManagementStaffingService.listForSecurityStaffing(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityPractitionerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityPractitionerManagementController.java index 924c636..31fee1f 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityPractitionerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityPractitionerManagementController.java @@ -46,6 +46,7 @@ public class TrafficSecurityPractitionerManagementController extends BaseControl pd.put("EMPLOYEESDETAILS_ID", employeesdetails_id); + detailsService.save(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java index df58b6a..071ced0 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java @@ -29,4 +29,5 @@ public interface TrafficSafetyMeetingMapper { void save(PageData pd); + } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java index df6fae5..902bc2e 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java @@ -21,4 +21,8 @@ public interface TrafficSafetyMeetingRecipientMapper { * @return */ List listForSafetyMeetingRecipient(PageData pd); + + void edit(PageData pd); + + void save(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java new file mode 100644 index 0000000..507fac6 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java @@ -0,0 +1,16 @@ +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 TrafficSecurityManagementStaffingMapper { + void save(PageData pd); + + List datalistPage(Page page); + + void edit(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java index 1397272..5df1b84 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java @@ -7,4 +7,8 @@ import java.util.List; public interface TrafficSafetyMeetingRecipienService { List getAllRecipient(Page page); + + void edit(PageData pd); + + void save(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java new file mode 100644 index 0000000..86373a3 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java @@ -0,0 +1,15 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityManagementStaffingService { + void save(PageData pd); + + List listForSecurityStaffing(Page page); + + void edit(PageData pd); + +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java index 32b16da..28c42df 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java @@ -18,4 +18,14 @@ public class TrafficSafetyMeetingRecipienServiceImpl implements TrafficSafetyMee public List getAllRecipient(Page page) { return trafficSafetyMeetingRecordMapper.datalistPage(page); } + + @Override + public void edit(PageData pd) { + trafficSafetyMeetingRecordMapper.edit(pd); + } + + @Override + public void save(PageData pd) { + trafficSafetyMeetingRecordMapper.save(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java index 9a33ce5..7db36bc 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java @@ -53,4 +53,5 @@ public class TrafficSafetyMeetingServiceImpl implements TrafficSafetyMeetingServ public void save(PageData pd) { trafficSafetyMeetingMapper.save(pd); } + } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java new file mode 100644 index 0000000..a3e0ccf --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java @@ -0,0 +1,31 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityManagementStaffingMapper; +import com.zcloud.service.comprehensive.TrafficSecurityManagementStaffingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityManagementStaffingServiceImpl implements TrafficSecurityManagementStaffingService { + + @Autowired + private TrafficSecurityManagementStaffingMapper securityManagementStaffingMapper; + @Override + public void save(PageData pd) { + securityManagementStaffingMapper.save(pd); + } + + @Override + public List listForSecurityStaffing(Page page) { + return securityManagementStaffingMapper.datalistPage(page); + } + + @Override + public void edit(PageData pd) { + securityManagementStaffingMapper.edit(pd); + } +} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml index b121e9c..5b2c6cf 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml @@ -18,7 +18,6 @@ f.MEETING_TITLE, f.MEETING_TYPE, f.MEETING_DATE_START, - f.MEETING_DATE_END, f.MEETING_ADDRESS, f.HOST_PERSON, f.MEETING_PERSONS, @@ -36,10 +35,14 @@ f.OPERATORNAME, f.OPERATTIME, f.TRANSPORTATIONCOMPANY, + f.RECORDER, f.MEETING_STATUS, + f.MEETING_DATE_END, f.PRACTITIONER_TYPE, f.CONFIRM_MESSAGE_SIGN_ROUTE, - f.RECORDER + f.VIDEO_SIGN_ROUTE, + f.LIVEPHOTOS, + f.SIGNATUREPHOTOS @@ -48,7 +51,6 @@ MEETING_TITLE, MEETING_TYPE, MEETING_DATE_START, - MEETING_DATE_END, MEETING_ADDRESS, HOST_PERSON, MEETING_PERSONS, @@ -66,10 +68,14 @@ OPERATORNAME, OPERATTIME, TRANSPORTATIONCOMPANY, + RECORDER, MEETING_STATUS, + MEETING_DATE_END, PRACTITIONER_TYPE, CONFIRM_MESSAGE_SIGN_ROUTE, - RECORDER + VIDEO_SIGN_ROUTE, + LIVEPHOTOS, + SIGNATUREPHOTOS @@ -78,7 +84,6 @@ #{MEETING_TITLE}, #{MEETING_TYPE}, #{MEETING_DATE_START}, - #{MEETING_DATE_END}, #{MEETING_ADDRESS}, #{HOST_PERSON}, #{MEETING_PERSONS}, @@ -96,11 +101,16 @@ #{OPERATORNAME}, #{OPERATTIME}, #{TRANSPORTATIONCOMPANY}, + #{RECORDER}, #{MEETING_STATUS}, + #{MEETING_DATE_END}, #{PRACTITIONER_TYPE}, #{CONFIRM_MESSAGE_SIGN_ROUTE}, - #{RECORDER} + #{VIDEO_SIGN_ROUTE}, + #{LIVEPHOTOS}, + #{SIGNATUREPHOTOS} + insert into @@ -127,9 +137,11 @@ - - - - - diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml index 3104c6b..d31bbce 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml @@ -15,44 +15,78 @@ f.SAFETY_MEETING_RECIPIENT_ID, f.SAFETY_MEETING_ID, + f.AVATAR, f.PRACTITIONER, f.PRACTITIONER_TYPE, f.CONTACT_PHONE, f.ATTENDANCE_STATUS, f.HOME_ADDRESS, + f.IDENTITY_NUMBER, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, f.SIGNATUREPICTURE, - f.AVATAR, - f.IDENTITY_NUMBER + f.LIVEPHOTOS SAFETY_MEETING_RECIPIENT_ID, SAFETY_MEETING_ID, + AVATAR, PRACTITIONER, PRACTITIONER_TYPE, CONTACT_PHONE, ATTENDANCE_STATUS, HOME_ADDRESS, + IDENTITY_NUMBER, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, SIGNATUREPICTURE, - AVATAR, - IDENTITY_NUMBER + LIVEPHOTOS #{SAFETY_MEETING_RECIPIENT_ID}, #{SAFETY_MEETING_ID}, + #{AVATAR}, #{PRACTITIONER}, #{PRACTITIONER_TYPE}, #{CONTACT_PHONE}, #{ATTENDANCE_STATUS}, #{HOME_ADDRESS}, + #{IDENTITY_NUMBER}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, #{SIGNATUREPICTURE}, - #{AVATAR}, - #{IDENTITY_NUMBER} + #{LIVEPHOTOS} + insert into @@ -64,32 +98,41 @@ ) + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME}, + SIGNATUREPICTURE = #{SIGNATUREPICTURE}, + LIVEPHOTOS = #{LIVEPHOTOS}, + ATTENDANCE_STATUS = #{ATTENDANCE_STATUS} + where + SAFETY_MEETING_RECIPIENT_ID = #{SAFETY_MEETING_RECIPIENT_ID} + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml new file mode 100644 index 0000000..6f4a535 --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml @@ -0,0 +1,126 @@ + + + + + + BUS_TRAFFIC_MANAGEMENT_STAFFING + + + + + SYS_DICTIONARIES + + + + f.STAFFING_ID, + f.SYSTEMNAME, + f.COMPLETIONSTATUS, + f.VALIDSTATUS, + f.OPERATINGCOMPANY, + f.OPERATIONTYPE, + 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 + + + + + STAFFING_ID, + SYSTEMNAME, + COMPLETIONSTATUS, + VALIDSTATUS, + OPERATINGCOMPANY, + OPERATIONTYPE, + EXPIRYDATE, + ATTACHMENT_ROUTE, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{STAFFING_ID}, + #{SYSTEMNAME}, + #{COMPLETIONSTATUS}, + #{VALIDSTATUS}, + #{OPERATINGCOMPANY}, + #{OPERATIONTYPE}, + #{EXPIRYDATE}, + #{ATTACHMENT_ROUTE}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME}, + ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} + where + STAFFING_ID = #{STAFFING_ID} + + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml index 70e4f3a..f97657b 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml @@ -128,9 +128,11 @@