安全例会->列表，新增，删除，详情接口开发

src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingLogController.java

@@ -0,0 +1,89 @@
+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.TrafficDrivingLogService;
+import com.zcloud.service.comprehensive.TrafficDrivingMissionDetailsService;
+import com.zcloud.service.comprehensive.TrafficSafetyMeetingService;
+import com.zcloud.util.DateUtil;
+import com.zcloud.util.Jurisdiction;
+import com.zcloud.util.Tools;
+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.ResponseBody;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/drivinglog")
+public class TrafficDrivingLogController extends BaseController {
+    @Autowired
+    private TrafficDrivingLogService trafficDrivingLogService;
+    @Autowired
+    private TrafficDrivingMissionDetailsService trafficDrivingMissionDetailsService;
+    //列表
+    @RequestMapping(value = "/listForSafetyDrivingLog")
+    @ResponseBody
+    public Object listForSecurityNotice(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+
+        String TRANSPORTCOMPANY = pd.getString("TRANSPORTCOMPANY"); // 关键词检索条件
+        if (Tools.notEmpty(TRANSPORTCOMPANY))
+            pd.put("TRANSPORTCOMPANY", TRANSPORTCOMPANY.trim());
+
+        String TRANSPORTVEHICLE = pd.getString("TRANSPORTVEHICLE"); // 关键词检索条件
+        if (Tools.notEmpty(TRANSPORTVEHICLE))
+            pd.put("TRANSPORTVEHICLE", TRANSPORTVEHICLE.trim());
+
+        page.setPd(pd);
+        List<PageData> varList = trafficDrivingLogService.listForDrivingLog(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<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()));//删除时间
+        trafficDrivingLogService.delete(pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**
+     * 查看详情
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/goEdit")
+    @ResponseBody
+    public Object goEdit() throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        String errInfo = "success";
+        PageData pd = this.getPageData();
+        pd = trafficDrivingMissionDetailsService.findById(pd); // 根据ID读取
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+}

src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyMeetingController.java

@@ -0,0 +1,203 @@
+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.*;
+
+@Controller
+@RequestMapping("/safetymeeting")
+public class TrafficSafetyMeetingController extends BaseController {
+
+    @Autowired
+    private TrafficSafetyMeetingService trafficSafetyMeetingService;
+    @Autowired
+    private TrafficSafetyMeetingRecipienService trafficSafetyMeasureetingRecipienService;
+    @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 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); // 主键
+        pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
+        pd.put("MEETING_STATUS", "0"); // 会议状态
+        pd.put("MEETING_PERSONS", "0"); // 参会人数
+        pd.put("ISDELETE", "0");
+
+        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)) {
+                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"));
+            pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
+        }
+        String meetingDate = pd.getString("MEETING_DATE");
+        String[] dates  = meetingDate.split(",");
+        if (dates.length == 2){
+            pd.put("MEETING_DATE_START", dates[0].trim());
+            pd.put("MEETING_DATE_END", dates[1].trim());
+        }
+        trafficSafetyMeetingService.save(pd);
+        map.put("result", errInfo);
+        map.put("pd", pd);
+        return map;
+    }
+
+    //列表
+    @RequestMapping(value = "/listForSafetyMeeting")
+    @ResponseBody
+    public Object listForSecurityNotice(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        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<PageData> varList = trafficSafetyMeetingService.listForSafetyMeeting(page);
+        Date date = DateUtil.fomatDate(DateUtil.getDay());
+        for (PageData item : varList) {
+            String start = item.getString("MEETING_DATE_START");
+            String end = item.getString("MEETING_DATE_END");
+            if (start != null && end != null){
+                Date startDate = DateUtil.fomatDate(start);
+                Date endDate = DateUtil.fomatDate(end);
+                if (date.after(startDate) && date.before(endDate)){
+                    item.put("MEETING_STATUS",1);
+                }else if (date.after(endDate)){
+                    item.put("MEETING_STATUS",0);
+                }
+                String meetingDate = start + "至" + end;
+                item.put("MEETING_DATE", meetingDate);
+            }
+            List<PageData> personsList = trafficSafetyMeetingService.listForSafetyMeetingRecipient(item);
+            int count = 0;
+            for (PageData data : personsList) {
+                if (data.getString("ATTENDANCE_STATUS").equals("1")){
+                    count++;
+                }
+            }
+            int meetingPersons = Integer.parseInt(item.getString("MEETING_PERSONS"));
+            meetingPersons += count;
+            item.put("MEETING_PERSONS", String.valueOf(meetingPersons));
+            item.put("TOTALPERSONNUM", personsList.size());
+        }
+
+        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<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()));//删除时间
+        trafficSafetyMeetingService.delete(pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    //详情
+    @RequestMapping(value="/goEdit")
+    @ResponseBody
+    public Object goEdit() throws Exception {
+        Map<String, Object> 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<PageData> 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 = "/getAllRecipient")
+    @ResponseBody
+    public Object getAllRecipient(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String PRACTITIONER = pd.getString("PRACTITIONER"); // 关键词检索条件
+        if (Tools.notEmpty(PRACTITIONER))
+            pd.put("PRACTITIONER", PRACTITIONER.trim());
+        String PRACTITIONERTYPE = pd.getString("PRACTITIONERTYPE"); // 关键词检索条件
+        if (Tools.notEmpty(PRACTITIONERTYPE))
+            pd.put("PRACTITIONERTYPE", PRACTITIONERTYPE.trim());
+        String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS"); // 关键词检索条件
+        if (Tools.notEmpty(SIGNEDSTATUS))
+            pd.put("SIGNEDSTATUS", SIGNEDSTATUS.trim());
+        String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件
+        if (Tools.notEmpty(REPLYSTATUS))
+            pd.put("REPLYSTATUS", REPLYSTATUS.trim());
+        page.setPd(pd);
+        List<PageData> notifications = trafficSafetyMeasureetingRecipienService.getAllRecipient(page);
+        map.put("varList", notifications);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+
+}

src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java

@@ -3,34 +3,37 @@ 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.SecurityNoticeService;
+import com.zcloud.service.comprehensive.TrafficSecurityNoticeService;
-import com.zcloud.service.comprehensive.SecurityReadDetailService;
+import com.zcloud.service.comprehensive.TrafficSecurityReadDetailService;
 import com.zcloud.service.system.UsersService;
-import com.zcloud.util.DateUtil;
+import com.zcloud.util.*;
-import com.zcloud.util.Jurisdiction;
+import org.apache.commons.lang.StringUtils;
-import com.zcloud.util.Tools;
 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.*;
 
 @Controller
 @RequestMapping("/securitynotice")
-public class SecurityNoticeController extends BaseController {
+public class TrafficSecurityNoticeController extends BaseController {
 
     @Autowired
-    private SecurityNoticeService securityNoticeService;
+    private TrafficSecurityNoticeService securityNoticeService;
     @Autowired
-    private SecurityReadDetailService securityReadDetail;
+    private TrafficSecurityReadDetailService securityReadDetail;
-
+    @Autowired
+    private Smb smb;
     @Autowired
     private UsersService usersService;
+
     //新增
     @RequestMapping(value = "/add")
     @ResponseBody
-    public Object add() throws Exception {
+    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();
@@ -46,6 +49,22 @@ public class SecurityNoticeController extends BaseController {
         pd.put("SIGNEDSTATUS", "0"); // 签收状态
         pd.put("ISDELETE", "0");
 
+        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)) {
+                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"));
+            pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date()));
+        }
+
         List<PageData> notifications = securityNoticeService.getAllNotifications(pd);
         Map<String, Integer> statusCount = new HashMap<>();
         statusCount.put("total", notifications.size());
@@ -97,7 +116,6 @@ public class SecurityNoticeController extends BaseController {
 
     //列表
     @RequestMapping(value = "/listForSecurityNotice")
-    // @RequiresPermissions("hidden:list")
     @ResponseBody
     public Object listForSecurityNotice(Page page) throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();

src/main/java/com/zcloud/entity/comprehensivemanagement/Notification.java

@@ -85,6 +85,11 @@ public class Notification {
      */
     private String POSTSTATUS;
 
+    /**
+     * 通知附件地址
+     */
+    private String CONFIRM_MESSAGE_SIGN_ROUTE;
+
     /**
      * 是否删除
      */

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficDrivingMissionDetailsMapper.java

@@ -0,0 +1,19 @@
+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 TrafficDrivingMissionDetailsMapper {
+    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    List<PageData> datalistPage(Page page);
+
+    PageData findById(PageData pd);
+}

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyDrivingLogMapper.java

@@ -0,0 +1,30 @@
+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 TrafficSafetyDrivingLogMapper {
+
+    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    List<PageData> datalistPage(Page page);
+
+    /**删除
+     * @param pd
+     * @throws Exception
+     */
+    void delete(PageData pd);
+
+    /**通过id获取数据
+     * @param pd
+     * @throws Exception
+     */
+    PageData findById(PageData pd);
+}

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java

@@ -0,0 +1,32 @@
+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 TrafficSafetyMeetingMapper {
+    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    List<PageData> datalistPage(Page page);
+
+    /**删除
+     * @param pd
+     * @throws Exception
+     */
+    void delete(PageData pd);
+
+    /**通过id获取数据
+     * @param pd
+     * @throws Exception
+     */
+    PageData findById(PageData pd);
+
+
+    void save(PageData pd);
+}

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.java

@@ -0,0 +1,24 @@
+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 TrafficSafetyMeetingRecipientMapper {
+    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    List<PageData> datalistPage(Page page);
+
+    /**
+     * 根据例会id查询
+     * @param pd
+     * @return
+     */
+    List<PageData> listForSafetyMeetingRecipient(PageData pd);
+}

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 
 @Mapper
-public interface SecurityNoticeMapper {
+public interface TrafficSecurityNoticeMapper {
     /**新增
      * @param pd
      * @throws Exception

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java

@@ -5,8 +5,8 @@ import com.zcloud.entity.PageData;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-
+@Mapper
-public interface SecurityReadDetailMapper {
+public interface TrafficSecurityReadDetailMapper {
     void save(PageData pd);
 
     List<PageData> datalistPage(Page page);

src/main/java/com/zcloud/service/comprehensive/TrafficDrivingLogService.java

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

src/main/java/com/zcloud/service/comprehensive/TrafficDrivingMissionDetailsService.java

@@ -0,0 +1,7 @@
+package com.zcloud.service.comprehensive;
+
+import com.zcloud.entity.PageData;
+
+public interface TrafficDrivingMissionDetailsService {
+    PageData findById(PageData pd);
+}

src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingRecipienService.java

@@ -0,0 +1,10 @@
+package com.zcloud.service.comprehensive;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+public interface TrafficSafetyMeetingRecipienService {
+    List<PageData> getAllRecipient(Page page);
+}

src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java

@@ -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 TrafficSafetyMeetingService {
+    List<PageData> listForSafetyMeeting(Page page);
+
+    void delete(PageData pd) throws Exception;
+
+    PageData findById(PageData pd);
+
+    List<PageData> listForSafetyMeetingRecipient(PageData pd);
+
+    void save(PageData pd);
+}

src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java

@@ -5,7 +5,7 @@ import com.zcloud.entity.PageData;
 
 import java.util.List;
 
-public interface SecurityNoticeService {
+public interface TrafficSecurityNoticeService {
 
     void save(PageData pd);
 

src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java

@@ -5,7 +5,7 @@ import com.zcloud.entity.PageData;
 
 import java.util.List;
 
-public interface SecurityReadDetailService {
+public interface TrafficSecurityReadDetailService {
     void save(PageData pd);
 
     List<PageData> getAllReadDetail(Page page)throws Exception;

src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingLogServiceImpl.java

@@ -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.TrafficSafetyDrivingLogMapper;
+import com.zcloud.service.comprehensive.TrafficDrivingLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficDrivingLogServiceImpl implements TrafficDrivingLogService {
+
+    @Autowired
+    private TrafficSafetyDrivingLogMapper trafficSafetyDrivingLogMapper;
+    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    @Override
+    public List<PageData> listForDrivingLog(Page page) {
+        return trafficSafetyDrivingLogMapper.datalistPage(page);
+    }
+
+    /**
+     * 删除
+     * @param pd
+     */
+    @Override
+    public void delete(PageData pd) {
+        trafficSafetyDrivingLogMapper.delete(pd);
+    }
+
+    @Override
+    public PageData findById(PageData pd) {
+        return trafficSafetyDrivingLogMapper.findById(pd);
+    }
+}

src/main/java/com/zcloud/service/comprehensive/impl/TrafficDrivingMissionDetailsServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zcloud.service.comprehensive.impl;
+
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficDrivingMissionDetailsMapper;
+import com.zcloud.service.comprehensive.TrafficDrivingMissionDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TrafficDrivingMissionDetailsServiceImpl implements TrafficDrivingMissionDetailsService {
+
+    @Autowired
+    private TrafficDrivingMissionDetailsMapper trafficDrivingMissionDetailsMapper;
+    @Override
+    public PageData findById(PageData pd) {
+        return trafficDrivingMissionDetailsMapper.findById(pd);
+    }
+}

src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingRecipienServiceImpl.java

@@ -0,0 +1,21 @@
+package com.zcloud.service.comprehensive.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyMeetingRecipientMapper;
+import com.zcloud.service.comprehensive.TrafficSafetyMeetingRecipienService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficSafetyMeetingRecipienServiceImpl implements TrafficSafetyMeetingRecipienService {
+
+    @Autowired
+    private TrafficSafetyMeetingRecipientMapper trafficSafetyMeetingRecordMapper;;
+    @Override
+    public List<PageData> getAllRecipient(Page page) {
+        return trafficSafetyMeetingRecordMapper.datalistPage(page);
+    }
+}

src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java

@@ -0,0 +1,56 @@
+package com.zcloud.service.comprehensive.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyMeetingMapper;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyMeetingRecipientMapper;
+import com.zcloud.service.comprehensive.TrafficSafetyMeetingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficSafetyMeetingServiceImpl implements TrafficSafetyMeetingService {
+    @Autowired
+    private TrafficSafetyMeetingMapper trafficSafetyMeetingMapper;
+    @Autowired
+    private TrafficSafetyMeetingRecipientMapper trafficSafetyMeetingRecipientMapper;
+    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    @Override
+    public List<PageData> listForSafetyMeeting(Page page) {
+        return trafficSafetyMeetingMapper.datalistPage(page);
+    }
+
+    /**删除
+     * @param pd
+     * @throws Exception
+     */
+    public void delete(PageData pd)throws Exception{
+        trafficSafetyMeetingMapper.delete(pd);
+    }
+
+    @Override
+    public PageData findById(PageData pd) {
+        return trafficSafetyMeetingMapper.findById(pd);
+    }
+
+    /**
+     * 根据例会id查询
+     * @param pd
+     * @return
+     */
+    @Override
+    public List<PageData> listForSafetyMeetingRecipient(PageData pd) {
+        return trafficSafetyMeetingRecipientMapper.listForSafetyMeetingRecipient(pd);
+    }
+
+    @Override
+    public void save(PageData pd) {
+        trafficSafetyMeetingMapper.save(pd);
+    }
+}

src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java

@@ -2,17 +2,17 @@ package com.zcloud.service.comprehensive.impl;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
-import com.zcloud.mapper.datasource.comprehensive.SecurityNoticeMapper;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityNoticeMapper;
-import com.zcloud.service.comprehensive.SecurityNoticeService;
+import com.zcloud.service.comprehensive.TrafficSecurityNoticeService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class SecurityNoticeServiceImpl implements SecurityNoticeService {
+public class TrafficSecurityNoticeServiceImpl implements TrafficSecurityNoticeService {
     @Resource
-    private SecurityNoticeMapper securityNoticeMapper;
+    private TrafficSecurityNoticeMapper securityNoticeMapper;
     @Override
     public void save(PageData pd) {
         securityNoticeMapper.save(pd);

src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java

@@ -2,17 +2,17 @@ package com.zcloud.service.comprehensive.impl;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
-import com.zcloud.mapper.datasource.comprehensive.SecurityReadDetailMapper;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityReadDetailMapper;
-import com.zcloud.service.comprehensive.SecurityReadDetailService;
+import com.zcloud.service.comprehensive.TrafficSecurityReadDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
-public class SecurityReadDetailImpl implements SecurityReadDetailService {
+public class TrafficSecurityReadDetailImpl implements TrafficSecurityReadDetailService {
     @Autowired
-    private SecurityReadDetailMapper securityReadDetailMapper;
+    private TrafficSecurityReadDetailMapper securityReadDetailMapper;
     @Override
     public void save(PageData pd) {
         securityReadDetailMapper.save(pd);

src/main/resources/mybatis/datasource/comprehensive/TrafficDrivingMissionDetailsMapper.xml

@@ -0,0 +1,187 @@
+<?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.TrafficDrivingMissionDetailsMapper">
+    <!--表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_DRIVING_MISSION_DETAILS
+    </sql>
+
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+    <!-- 字段 -->
+    <sql id="Field">
+        f.WAYBILLNUMBER,
+        f.TRANSPORTATIONCOMPANY,
+        f.TRANSPORTMISSION,
+        f.TRANSPORTVEHICLE,
+        f.TRANSPORTNATURE,
+        f.DEPARTURETIME,
+        f.DEPARTUREPLACE,
+        f.FRAMENUMBER,
+        f.EMPLOYEES,
+        f.ARRIVALTIME,
+        f.ARRIVALPLACE,
+        f.WEATHERCONDITION,
+        f.CONTACTPHONE,
+        f.RATEDLOAD,
+        f.ACTUALLOAD,
+        f.DRIVINGSAFETYINQUIRY,
+        f.DEPARTURECONCLUSION,
+        f.PREDEPARTUREINSPECTOR,
+        f.PREDEPARTUREFAULTTREATMENT,
+        f.PREDEPARTUREINSPECTIONTIME,
+        f.INDRIVINGINSPECTOR,
+        f.INSPECTIONTIMEWHILEDRIVING,
+        f.INDRIVINGFAULTTREATMENT,
+        f.POSTARRIVALINSPECTOR,
+        f.POSTARRIVALINSPECTIONTIME,
+        f.POSTARRIVALFAULTTREATMENT,
+        f.DRIVINGDURATION,
+        f.TIMEINTERVAL,
+        f.HANDOVERPLACE,
+        f.HANDOVERPERSON,
+        f.RELIEFPICTURE,
+        f.SAFETYOFFICER,
+        f.PREDEPARTUREPHOTO,
+        f.PREDEPARTURESIGNATURE,
+        f.ISDELETE,
+        f.DELETOR,
+        f.DELETORNAME,
+        f.DELETETIME,
+        f.CREATOR,
+        f.CREATORNAME,
+        f.CREATETIME,
+        f.OPERATOR,
+        f.OPERATORNAME,
+        f.OPERATTIME,
+        f.PHOTOSWHILEDRIVING,
+        f.SIGNINGWHILEDRIVING,
+        f.CHECKPHOTOS,
+        f.DRIVING_LOG_ID,
+        f.CHECKSIGNATURE
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        WAYBILLNUMBER,
+        TRANSPORTATIONCOMPANY,
+        TRANSPORTMISSION,
+        TRANSPORTVEHICLE,
+        TRANSPORTNATURE,
+        DEPARTURETIME,
+        DEPARTUREPLACE,
+        FRAMENUMBER,
+        EMPLOYEES,
+        ARRIVALTIME,
+        ARRIVALPLACE,
+        WEATHERCONDITION,
+        CONTACTPHONE,
+        RATEDLOAD,
+        ACTUALLOAD,
+        DRIVINGSAFETYINQUIRY,
+        DEPARTURECONCLUSION,
+        PREDEPARTUREINSPECTOR,
+        PREDEPARTUREFAULTTREATMENT,
+        PREDEPARTUREINSPECTIONTIME,
+        INDRIVINGINSPECTOR,
+        INSPECTIONTIMEWHILEDRIVING,
+        INDRIVINGFAULTTREATMENT,
+        POSTARRIVALINSPECTOR,
+        POSTARRIVALINSPECTIONTIME,
+        POSTARRIVALFAULTTREATMENT,
+        DRIVINGDURATION,
+        TIMEINTERVAL,
+        HANDOVERPLACE,
+        HANDOVERPERSON,
+        RELIEFPICTURE,
+        SAFETYOFFICER,
+        PREDEPARTUREPHOTO,
+        PREDEPARTURESIGNATURE,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME,
+        PHOTOSWHILEDRIVING,
+        SIGNINGWHILEDRIVING,
+        CHECKPHOTOS,
+        DRIVING_LOG_ID,
+        CHECKSIGNATURE
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{WAYBILLNUMBER},
+        #{TRANSPORTATIONCOMPANY},
+        #{TRANSPORTMISSION},
+        #{TRANSPORTVEHICLE},
+        #{TRANSPORTNATURE},
+        #{DEPARTURETIME},
+        #{DEPARTUREPLACE},
+        #{FRAMENUMBER},
+        #{EMPLOYEES},
+        #{ARRIVALTIME},
+        #{ARRIVALPLACE},
+        #{WEATHERCONDITION},
+        #{CONTACTPHONE},
+        #{RATEDLOAD},
+        #{ACTUALLOAD},
+        #{DRIVINGSAFETYINQUIRY},
+        #{DEPARTURECONCLUSION},
+        #{PREDEPARTUREINSPECTOR},
+        #{PREDEPARTUREFAULTTREATMENT},
+        #{PREDEPARTUREINSPECTIONTIME},
+        #{INDRIVINGINSPECTOR},
+        #{INSPECTIONTIMEWHILEDRIVING},
+        #{INDRIVINGFAULTTREATMENT},
+        #{POSTARRIVALINSPECTOR},
+        #{POSTARRIVALINSPECTIONTIME},
+        #{POSTARRIVALFAULTTREATMENT},
+        #{DRIVINGDURATION},
+        #{TIMEINTERVAL},
+        #{HANDOVERPLACE},
+        #{HANDOVERPERSON},
+        #{RELIEFPICTURE},
+        #{SAFETYOFFICER},
+        #{PREDEPARTUREPHOTO},
+        #{PREDEPARTURESIGNATURE},
+        #{ISDELETE},
+        #{DELETOR},
+        #{DELETORNAME},
+        #{DELETETIME},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATETIME},
+        #{OPERATOR},
+        #{OPERATORNAME},
+        #{OPERATTIME},
+        #{PHOTOSWHILEDRIVING},
+        #{SIGNINGWHILEDRIVING},
+        #{CHECKPHOTOS},
+        #{DRIVING_LOG_ID},
+        #{CHECKSIGNATURE}
+    </sql>
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        where f.ISDELETE = '0'
+    </select>
+
+    <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        where
+        f.DRIVING_LOG_ID = #{DRIVING_LOG_ID}
+    </select>
+</mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyDrivingLogMapper.xml

@@ -0,0 +1,126 @@
+<?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.TrafficSafetyDrivingLogMapper">
+    <!--表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_DRIVING_LOG
+    </sql>
+
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+
+    <!-- 字段 -->
+    <sql id="Field">
+        f.DRIVING_LOG_ID,
+        f.REGISTRATIONNUMBER,
+        f.DEPARTURESTATUS,
+        f.DRIVINGCONDITION,
+        f.TRANSPORTVEHICLE,
+        f.EMPLOYEES,
+        f.CONTACTPHONE,
+        f.WEATHERCONDITION,
+        f.TRANSPORTNATURE,
+        f.DEPARTURETIME,
+        f.ARRIVALTIME,
+        f.TRANSPORTCOMPANY,
+        f.ISDELETE,
+        f.DELETOR,
+        f.DELETORNAME,
+        f.DELETETIME,
+        f.CREATOR,
+        f.CREATORNAME,
+        f.CREATETIME,
+        f.OPERATOR,
+        f.OPERATORNAME,
+        f.OPERATTIME
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        DRIVING_LOG_ID,
+        REGISTRATIONNUMBER,
+        DEPARTURESTATUS,
+        DRIVINGCONDITION,
+        TRANSPORTVEHICLE,
+        EMPLOYEES,
+        CONTACTPHONE,
+        WEATHERCONDITION,
+        TRANSPORTNATURE,
+        DEPARTURETIME,
+        ARRIVALTIME,
+        TRANSPORTCOMPANY,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATORNAME,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{DRIVING_LOG_ID},
+        #{REGISTRATIONNUMBER},
+        #{DEPARTURESTATUS},
+        #{DRIVINGCONDITION},
+        #{TRANSPORTVEHICLE},
+        #{EMPLOYEES},
+        #{CONTACTPHONE},
+        #{WEATHERCONDITION},
+        #{TRANSPORTNATURE},
+        #{DEPARTURETIME},
+        #{ARRIVALTIME},
+        #{TRANSPORTCOMPANY},
+        #{ISDELETE},
+        #{DELETOR},
+        #{DELETORNAME},
+        #{DELETETIME},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATETIME},
+        #{OPERATOR},
+        #{OPERATORNAME},
+        #{OPERATTIME}
+    </sql>
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        where f.ISDELETE = '0'
+        <if test="pd.TRANSPORTCOMPANY != null and pd.TRANSPORTCOMPANY != ''"><!-- 关键词检索-运输企业 -->
+            and f.TRANSPORTCOMPANY = #{pd.TRANSPORTCOMPANY}
+        </if>
+        <if test="pd.TRANSPORTVEHICLE != null and pd.TRANSPORTVEHICLE != ''"><!-- 关键词检索-运输车辆 -->
+            and f.TRANSPORTVEHICLE = #{pd.TRANSPORTVEHICLE}
+        </if>
+    </select>
+
+    <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        where
+        f.DRIVING_LOG_ID = #{DRIVING_LOG_ID}
+    </select>
+
+    <!-- 删除-->
+    <delete id="delete" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        ISDELETE = '1',
+        DELETOR = #{DELETOR},
+        DELETETIME = #{DELETETIME}
+        where
+        DRIVING_LOG_ID = #{DRIVING_LOG_ID}
+    </delete>
+</mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml

@@ -0,0 +1,168 @@
+<?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.TrafficSafetyMeetingMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_TRAFFIC_SAFETY_MEETING
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		SYS_DICTIONARIES
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.SAFETY_MEETING_ID,
+		f.MEETING_TITLE,
+		f.MEETING_TYPE,
+		f.MEETING_DATE_START,
+		f.MEETING_DATE_END,
+		f.MEETING_ADDRESS,
+		f.HOST_PERSON,
+		f.MEETING_PERSONS,
+		f.MEETING_CONTENT,
+		f.RELATED_DOCUMENTS,
+		f.NOTES,
+		f.ISDELETE,
+		f.DELETOR,
+		f.DELETORNAME,
+		f.DELETETIME,
+		f.CREATOR,
+		f.CREATORNAME,
+		f.CREATETIME,
+		f.OPERATOR,
+		f.OPERATORNAME,
+		f.OPERATTIME,
+		f.TRANSPORTATIONCOMPANY,
+		f.MEETING_STATUS,
+		f.PRACTITIONER_TYPE,
+		f.CONFIRM_MESSAGE_SIGN_ROUTE,
+		f.RECORDER
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		SAFETY_MEETING_ID,
+		MEETING_TITLE,
+		MEETING_TYPE,
+		MEETING_DATE_START,
+		MEETING_DATE_END,
+		MEETING_ADDRESS,
+		HOST_PERSON,
+		MEETING_PERSONS,
+		MEETING_CONTENT,
+		RELATED_DOCUMENTS,
+		NOTES,
+		ISDELETE,
+		DELETOR,
+		DELETORNAME,
+		DELETETIME,
+		CREATOR,
+		CREATORNAME,
+		CREATETIME,
+		OPERATOR,
+		OPERATORNAME,
+		OPERATTIME,
+		TRANSPORTATIONCOMPANY,
+		MEETING_STATUS,
+		PRACTITIONER_TYPE,
+		CONFIRM_MESSAGE_SIGN_ROUTE,
+		RECORDER
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{SAFETY_MEETING_ID},
+		#{MEETING_TITLE},
+		#{MEETING_TYPE},
+		#{MEETING_DATE_START},
+		#{MEETING_DATE_END},
+		#{MEETING_ADDRESS},
+		#{HOST_PERSON},
+		#{MEETING_PERSONS},
+		#{MEETING_CONTENT},
+		#{RELATED_DOCUMENTS},
+		#{NOTES},
+		#{ISDELETE},
+		#{DELETOR},
+		#{DELETORNAME},
+		#{DELETETIME},
+		#{CREATOR},
+		#{CREATORNAME},
+		#{CREATETIME},
+		#{OPERATOR},
+		#{OPERATORNAME},
+		#{OPERATTIME},
+		#{TRANSPORTATIONCOMPANY},
+		#{MEETING_STATUS},
+		#{PRACTITIONER_TYPE},
+		#{CONFIRM_MESSAGE_SIGN_ROUTE},
+		#{RECORDER}
+	</sql>
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+		<include refid="tableName"></include>
+		(
+		<include refid="Field2"></include>
+		) values (
+		<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		ISDELETE = '1',
+		DELETOR = #{DELETOR},
+		DELETETIME = #{DELETETIME}
+		where
+		SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
+	</delete>
+
+	<!--列表-->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="pd.MEETING_TITLE != null and pd.MEETING_TITLE != ''"><!-- 关键词检索-会议标题 -->
+			and f.MEETING_TITLE = #{pd.MEETING_TITLE}
+		</if>
+		<if test="pd.MEETING_TYPE != null and pd.MEETING_TYPE != ''"><!-- 关键词检索-会议类型 -->
+			and f.MEETING_TYPE = #{pd.MEETING_TYPE}
+		</if>
+	</select>
+
+
+	<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
+		select
+		<include refid="Field"></include>,
+		GROUP_CONCAT(
+		CONCAT_WS(',',
+		r.PRACTITIONER,
+		r.CONTACT_PHONE,
+		r.HOME_ADDRESS,
+		r.AVATAR,
+		r.SIGNATUREPICTURE  -- 移除了这里的逗号
+		)
+		SEPARATOR ';'
+		) as recipientsInfo
+		from
+		<include refid="tableName"/> f
+		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}
+		and r.ATTENDANCE_STATUS = '1'
+		group by f.SAFETY_MEETING_ID
+	</select>
+
+
+
+
+
+</mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingRecipientMapper.xml

@@ -0,0 +1,106 @@
+<?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.TrafficSafetyMeetingRecipientMapper">
+    <!-- 表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_SAFETY_MEETING_RECIPIENT
+    </sql>
+
+    <!-- 数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+
+    <!-- 字段 -->
+    <sql id="Field">
+        f.SAFETY_MEETING_RECIPIENT_ID,
+        f.SAFETY_MEETING_ID,
+        f.PRACTITIONER,
+        f.PRACTITIONER_TYPE,
+        f.CONTACT_PHONE,
+        f.ATTENDANCE_STATUS,
+        f.HOME_ADDRESS,
+        f.SIGNATUREPICTURE,
+        f.AVATAR,
+        f.IDENTITY_NUMBER
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        SAFETY_MEETING_RECIPIENT_ID,
+        SAFETY_MEETING_ID,
+        PRACTITIONER,
+        PRACTITIONER_TYPE,
+        CONTACT_PHONE,
+        ATTENDANCE_STATUS,
+        HOME_ADDRESS,
+        SIGNATUREPICTURE,
+        AVATAR,
+        IDENTITY_NUMBER
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{SAFETY_MEETING_RECIPIENT_ID},
+        #{SAFETY_MEETING_ID},
+        #{PRACTITIONER},
+        #{PRACTITIONER_TYPE},
+        #{CONTACT_PHONE},
+        #{ATTENDANCE_STATUS},
+        #{HOME_ADDRESS},
+        #{SIGNATUREPICTURE},
+        #{AVATAR},
+        #{IDENTITY_NUMBER}
+    </sql>
+
+    <!-- 新增-->
+    <insert id="save" parameterType="pd">
+        insert into
+        <include refid="tableName"></include>
+        (
+        <include refid="Field2"></include>
+        ) values (
+        <include refid="FieldValue"></include>
+        )
+    </insert>
+
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        <include refid="Field"></include>,
+        d.NAME as practitionerTypeName
+        from
+        <include refid="tableName"></include> f
+        left join <include refid="dicTableName"></include> d on f.PRACTITIONER_TYPE = d.PARENT_ID
+        where f.ISDELETE = '0'
+        <if test="pd.SAFETY_MEETING_ID != null and pd.SAFETY_MEETING_ID != ''"><!-- 关键词检索-从业人员 -->
+            and f.SAFETY_MEETING_ID = #{pd.SAFETY_MEETING_ID}
+        </if>
+        <if test="pd.PRACTITIONER != null and pd.PRACTITIONER != ''"><!-- 关键词检索-从业人员 -->
+            and f.PRACTITIONER = #{pd.PRACTITIONER}
+        </if>
+        <if test="pd.PRACTITIONER_TYPE != null and pd.PRACTITIONER_TYPE != ''"><!-- 关键词检索-从业类型 -->
+            and f.PRACTITIONER_TYPE = #{pd.PRACTITIONER_TYPE}
+        </if>
+        <if test="pd.CONTACT_PHONE != null and pd.CONTACT_PHONE != ''"><!-- 关键词检索-联系电话 -->
+            and f.CONTACT_PHONE = #{pd.CONTACT_PHONE}
+        </if>
+        <if test="pd.ATTENDANCE_STATUS != null and pd.ATTENDANCE_STATUS != ''"><!-- 关键词检索-参会状态 -->
+            and f.ATTENDANCE_STATUS = #{pd.ATTENDANCE_STATUS}
+        </if>
+        <if test="pd.IDENTITY_NUMBER != null and pd.IDENTITY_NUMBER != ''"><!-- 关键词检索-身份证号 -->
+            and f.IDENTITY_NUMBER = #{pd.IDENTITY_NUMBER}
+        </if>
+    </select>
+
+    <select id="listForSafetyMeetingRecipient" parameterType="page" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        where f.ISDELETE = '0'
+        <if test="SAFETY_MEETING_ID != null and SAFETY_MEETING_ID != ''">
+            and f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
+        </if>
+    </select>
+</mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml

@@ -1,6 +1,6 @@
 <?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.SecurityNoticeMapper">
+<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSecurityNoticeMapper">
 
 	<!--表名 -->
 	<sql id="tableName">
@@ -37,6 +37,7 @@
 		f.SIGNEDDATE,
 		f.REPLYDATE,
 		f.REPLYCONTENT,
+		f.CONFIRM_MESSAGE_SIGN_ROUTE,
 		f.POSTSTATUS
 	</sql>
 
@@ -66,6 +67,7 @@
 		SIGNEDDATE,
 		REPLYDATE,
 		REPLYCONTENT,
+		CONFIRM_MESSAGE_SIGN_ROUTE,
 		POSTSTATUS
 	</sql>
 
@@ -95,6 +97,7 @@
 		#{SIGNEDDATE},
 		#{REPLYDATE},
 		#{REPLYCONTENT},
+		#{CONFIRM_MESSAGE_SIGN_ROUTE},
 		#{POSTSTATUS}
 	</sql>
 

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml

@@ -1,6 +1,6 @@
 <?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.SecurityReadDetailMapper">
+<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSecurityReadDetailMapper">
     <!--表名 -->
     <sql id="tableName">
         BUS_TRAFFIC_READ_DETAIL
@@ -94,14 +94,19 @@
         <include refid="FieldValue"></include>
         )
     </insert>
+
+    <!--列表-->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
         <include refid="Field"></include>,
         d.NAME as practitionerTypeName
         from
         <include refid="tableName"></include> f
-        left join <include refid="dicTableName"></include> d on f.PRACTITIONERTYPE = d.DICTIONARIES_ID
+        left join <include refid="dicTableName"></include> d on f.PRACTITIONERTYPE = d.PARENT_ID
         where f.ISDELETE = '0'
+        <if test="pd.NOTIFICATION_ID != null and pd.NOTIFICATION_ID != ''"><!-- 关键词检索-当前通知-->
+            and f.NOTIFICATION_ID = #{NOTIFICATION_ID}
+        </if>
         <if test="pd.PERSON != null and pd.PERSON != ''"><!-- 关键词检索-从业人员 -->
             and f.PERSON = #{pd.PERSON}
         </if>

src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingMapper.xml

@@ -91,7 +91,8 @@
         SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
     </update>
     <select id="datalistPage" resultType="com.zcloud.entity.PageData">
-        select * from <include refid="tableName"></include> where ISDELETE = '0' and CORPINFO_ID = #{pd.CORPINFO_ID}
+        select * from <include refid="tableName"></include>
+                     where ISDELETE = '0' and CORPINFO_ID = #{pd.CORPINFO_ID}
         <if test="pd.SAFETY_MEETING_TITLE != null and pd.SAFETY_MEETING_TITLE != ''">
             and SAFETY_MEETING_TITLE like '%${pd.SAFETY_MEETING_TITLE}%'
         </if>

src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml

@@ -0,0 +1,131 @@
+<?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.dsno2.mq.MqErrorMessageLogMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		MQ_MESSAGE_ERROR_LOG
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		SYS_DICTIONARIES
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.MESSAGE_LOG_ID,
+		f.ERROR_MESSAGE,
+		f.TIME,
+		f.TYPE,
+		f.SOURCE,
+		f.MESSAGE_ERROR_LOG_ID
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		MESSAGE_LOG_ID,
+		ERROR_MESSAGE,
+		TIME,
+		TYPE,
+		SOURCE,
+		MESSAGE_ERROR_LOG_ID
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{MESSAGE_LOG_ID},
+		#{ERROR_MESSAGE},
+		#{TIME},
+		#{TYPE},
+		#{SOURCE},
+		#{MESSAGE_ERROR_LOG_ID}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			MESSAGE_LOG_ID = #{MESSAGE_LOG_ID},
+			ERROR_MESSAGE = #{ERROR_MESSAGE},
+			TIME = #{TIME},
+			TYPE = #{TYPE},
+			SOURCE = #{SOURCE},
+			MESSAGE_ERROR_LOG_ID = MESSAGE_ERROR_LOG_ID
+		where
+			MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+			f.MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID}
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+				(
+				<!--	根据需求自己加检索条件
+					字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+					 or
+					字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+				-->
+				)
+		</if>
+	</select>
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			MESSAGE_ERROR_LOG_ID in
+		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+
+</mapper>