新增劳务聘用合同，岗位安全责任书，职业危害告知书

安全例会优化

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

@@ -18,6 +18,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/app/safetymeeting")
@@ -27,6 +28,8 @@ public class AppTrafficSafetyMeetingController extends BaseController {
     private TrafficSafetyMeetingService trafficSafetyMeetingService;
     @Autowired
     private TrafficSafetyMeetingRecipienService meetingRecipienService;
+    @Autowired
+    private Smb smb;
     //列表
     @RequestMapping(value = "/listForSafetyMeeting")
     @ResponseBody
@@ -78,22 +81,19 @@ public class AppTrafficSafetyMeetingController extends BaseController {
         Map<String, Object> map = new HashMap<>();
         String errInfo = "success";
         PageData pd = this.getPageData();
-        pd = trafficSafetyMeetingService.findById(pd); // 根据ID读取
+        pd = trafficSafetyMeetingService.getInfo(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;
+        List<PageData> filteredList = varList.stream()
-        for (PageData pageData : varList) {
+                .filter(pageData -> "1".equals(pageData.getString("ATTENDANCE_STATUS")))
-            if ("1".equals(pageData.getString("ATTENDANCE_STATUS"))) {
+                .collect(Collectors.toList());
-                realPersonNum++;
+        pd.put("totalPersonNum", varList.size());//应参会人数
-            }
+        pd.put("realPersonNum", filteredList.size());//实际参会人数
-        }
+        pd.put("recipientsList", filteredList);
-        pd.put("totalPersonNum", varList.size());
-        pd.put("realPersonNum", realPersonNum);
-        pd.put("recipientsList", varList);
         map.put("pd", pd);
         map.put("result", errInfo);
         return map;
@@ -102,7 +102,7 @@ public class AppTrafficSafetyMeetingController extends BaseController {
     //修改
     @RequestMapping(value = "/edit")
     @ResponseBody
-    public Object edit() throws Exception {
+    public Object edit(@RequestParam(value="livePhoto",required=false) MultipartFile file) throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = this.getPageData();
@@ -112,6 +112,22 @@ public class AppTrafficSafetyMeetingController extends BaseController {
         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"))){
+            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("LIVEPHOTOS", 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);

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/safetymeeting")
@@ -186,21 +187,15 @@ public class TrafficSafetyMeetingController extends BaseController {
             return map;
         }
         List<PageData> varList = trafficSafetyMeetingService.listForSafetyMeetingRecipient(pd);
-        int realPersonNum = 0;
+        List<PageData> filteredList = varList.stream().filter(item -> "1".equals(item.getString("ATTENDANCE_STATUS"))).collect(Collectors.toList());
-        for (PageData pageData : varList) {
-            if ("1".equals(pageData.getString("ATTENDANCE_STATUS"))) {
-                realPersonNum++;
-            }
-        }
         pd.put("totalPersonNum", varList.size());
-        pd.put("realPersonNum", realPersonNum);
+        pd.put("realPersonNum", filteredList.size());
-        pd.put("recipientsList", varList);
+        pd.put("recipientsList", filteredList);
         map.put("pd", pd);
         map.put("result", errInfo);
         return map;
     }
 
-
     //参会人员
     @RequestMapping(value = "/getAllRecipient")
     @ResponseBody

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

@@ -0,0 +1,169 @@
+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.TrafficSafetyOccupationalHazardsService;
+import com.zcloud.service.comprehensive.TrafficSafetyResponsibilityService;
+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("/occupationalhazards")
+public class TrafficSafetyOccupationalHazardsController extends BaseController {
+    @Autowired
+    private TrafficSafetyOccupationalHazardsService occupationalHazardsService;
+    @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 occupationalhazards_Id = this.get32UUID();
+
+        pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
+        pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
+        pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
+        pd.put("OCCUPATIONALHAZARDS_ID", occupationalhazards_Id); // 主键
+        pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
+        pd.put("COMPLETIONSTATUS", "0");
+        pd.put("ISDELETE", "0");
+        pd.put("ISSIGNED", "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()));
+        }
+
+        occupationalHazardsService.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");
+        pd.put("COMPLETIONSTATUS", "1");
+        pd.put("VALIDSTATUS", "1");
+        pd.put("ISSIGNED", "1");
+        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()));
+        }
+
+        occupationalHazardsService.edit(pd);
+
+        map.put("result", errInfo);
+        map.put("pd", pd);
+        return map;
+    }
+
+    /**
+     * 列表
+     * @param page
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/listForSecurityOccupationalHazards")
+    @ResponseBody
+    public Object listForSecurityWaybillRegistra(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+
+        String OCCUPATIONALNAME = pd.getString("OCCUPATIONALNAME"); // 关键词检索条件
+        if (Tools.notEmpty(OCCUPATIONALNAME))
+            pd.put("OCCUPATIONALNAME", OCCUPATIONALNAME.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 ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件
+        if (Tools.notEmpty(ISSIGNED))
+            pd.put("ISSIGNED", ISSIGNED.trim());
+
+        page.setPd(pd);
+        List<PageData> varList = occupationalHazardsService.listForSecurityStaffing(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 = occupationalHazardsService.findById(pd);	//根据ID读取
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+}

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

@@ -0,0 +1,168 @@
+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.TrafficSafetyResponsibilityService;
+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("/responsibility")
+public class TrafficSafetyResponsibilityController extends BaseController {
+    @Autowired
+    private TrafficSafetyResponsibilityService responseService;
+    @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 safetyresponsibilityId = this.get32UUID();
+
+        pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
+        pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
+        pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
+        pd.put("SAFETYRESPONSIBILITY_ID", safetyresponsibilityId); // 主键
+        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()));
+        }
+
+        responseService.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");
+        pd.put("COMPLETIONSTATUS", "1");
+        pd.put("VALIDSTATUS", "1");
+        pd.put("ISSIGNED", "1");
+        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()));
+        }
+
+        responseService.edit(pd);
+
+        map.put("result", errInfo);
+        map.put("pd", pd);
+        return map;
+    }
+
+    /**
+     * 列表
+     * @param page
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/listForSecurityResponsibility")
+    @ResponseBody
+    public Object listForSecurityWaybillRegistra(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+
+        String RESPONSIBILITYNAME = pd.getString("RESPONSIBILITYNAME"); // 关键词检索条件
+        if (Tools.notEmpty(RESPONSIBILITYNAME))
+            pd.put("RESPONSIBILITYNAME", RESPONSIBILITYNAME.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 ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件
+        if (Tools.notEmpty(ISSIGNED))
+            pd.put("ISSIGNED", ISSIGNED.trim());
+
+        page.setPd(pd);
+        List<PageData> varList = responseService.listForSecurityStaffing(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 = responseService.findById(pd);	//根据ID读取
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+}

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

@@ -0,0 +1,150 @@
+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.TrafficSecurityCommitmentService;
+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("/commitment")
+public class TrafficSecurityCommitmentController extends BaseController {
+    @Autowired
+    private Smb smb;
+    @Autowired
+    private TrafficSecurityCommitmentService securityCommitmentService;
+    //新增
+    @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 SecurityCommitmentId = this.get32UUID();
+
+        pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
+        pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
+        pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
+        pd.put("SECURITYCOMMITMENT_ID", SecurityCommitmentId); // 主键
+        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()));
+        }
+
+        securityCommitmentService.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()); // 经营企业
+        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()));
+        }
+
+        securityCommitmentService.edit(pd);
+
+        map.put("result", errInfo);
+        map.put("pd", pd);
+        return map;
+    }
+
+    /**
+     * 列表
+     * @param page
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/listForSecurityCommitment")
+    @ResponseBody
+    public Object listForSecurityWaybillRegistra(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+
+        String COMMITMENTNAME = pd.getString("COMMITMENTNAME"); // 关键词检索条件
+        if (Tools.notEmpty(COMMITMENTNAME))
+            pd.put("COMMITMENTNAME", COMMITMENTNAME.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 ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件
+        if (Tools.notEmpty(ISSIGNED))
+            pd.put("ISSIGNED", ISSIGNED.trim());
+
+        page.setPd(pd);
+        List<PageData> varList = securityCommitmentService.listForSecurityStaffing(page);
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+
+}

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

@@ -0,0 +1,167 @@
+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.TrafficSecurityLaborContractService;
+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("/laborcontract")
+public class TrafficSecurityLaborContractController extends BaseController {
+    @Autowired
+    private TrafficSecurityLaborContractService laborContractService;
+    @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 laborcontractId = this.get32UUID();
+
+        pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
+        pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
+        pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业
+        pd.put("LABORCONTRACT_ID", laborcontractId); // 主键
+        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()));
+        }
+
+        laborContractService.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");
+        pd.put("COMPLETIONSTATUS", "1");
+        pd.put("VALIDSTATUS", "1");
+        pd.put("ISSIGNED", "1");
+        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()));
+        }
+
+        laborContractService.edit(pd);
+
+        map.put("result", errInfo);
+        map.put("pd", pd);
+        return map;
+    }
+
+    /**
+     * 列表
+     * @param page
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/listForSecurityStaffing")
+    @ResponseBody
+    public Object listForSecurityWaybillRegistra(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+
+        String CONTRACTNAME = pd.getString("CONTRACTNAME"); // 关键词检索条件
+        if (Tools.notEmpty(CONTRACTNAME))
+            pd.put("CONTRACTNAME", CONTRACTNAME.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 ISSIGNED = pd.getString("ISSIGNED"); // 关键词检索条件
+        if (Tools.notEmpty(ISSIGNED))
+            pd.put("ISSIGNED", ISSIGNED.trim());
+
+        page.setPd(pd);
+        List<PageData> varList = laborContractService.listForSecurityStaffing(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 = laborContractService.findById(pd);	//根据ID读取
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+}

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

@@ -30,4 +30,5 @@ public interface TrafficSafetyMeetingMapper {
 
     void save(PageData pd);
 
+    PageData getInfo(PageData pd);
 }

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

@@ -0,0 +1,18 @@
+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 TrafficSafetyOccupationalHazardsMapper {
+    void save(PageData pd);
+
+    List<PageData> datalistPage(Page page);
+
+    void edit(PageData pd);
+
+    PageData findById(PageData pd);
+}

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

@@ -0,0 +1,18 @@
+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 TrafficSafetyResponsibilityMapper {
+    void save(PageData pd);
+
+    List<PageData> datalistPage(Page page);
+
+    void edit(PageData pd);
+
+    PageData findById(PageData pd);
+}

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

@@ -0,0 +1,17 @@
+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 TrafficSecurityCommitmentMapper {
+    void save(PageData pd);
+
+    List<PageData> datalistPage(Page page);
+
+    void edit(PageData pd);
+
+}

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

@@ -0,0 +1,18 @@
+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 TrafficSecurityLaborContractMapper {
+    void save(PageData pd);
+
+    List<PageData> datalistPage(Page page);
+
+    void edit(PageData pd);
+
+    PageData findById(PageData pd);
+}

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

@@ -15,4 +15,6 @@ public interface TrafficSafetyMeetingService {
     List<PageData> listForSafetyMeetingRecipient(PageData pd);
 
     void save(PageData pd);
+
+    PageData getInfo(PageData pd);
 }

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

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

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

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

src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentService.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 TrafficSecurityCommitmentService {
+    void save(PageData pd);
+
+    void edit(PageData pd);
+
+    List<PageData> listForSecurityStaffing(Page page);
+
+}

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

@@ -0,0 +1,30 @@
+package com.zcloud.service.comprehensive;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCommitmentMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityCommitmentService{
+    @Autowired
+    private TrafficSecurityCommitmentMapper securityCommitmentMapper;
+
+    @Override
+    public void save(PageData pd) {
+        securityCommitmentMapper.save(pd);
+    }
+
+    @Override
+    public void edit(PageData pd) {
+        securityCommitmentMapper.edit(pd);
+    }
+
+    @Override
+    public List<PageData> listForSecurityStaffing(Page page) {
+        return securityCommitmentMapper.datalistPage(page);
+    }
+}

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

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

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

@@ -54,4 +54,9 @@ public class TrafficSafetyMeetingServiceImpl implements TrafficSafetyMeetingServ
         trafficSafetyMeetingMapper.save(pd);
     }
 
+    @Override
+    public PageData getInfo(PageData pd) {
+        return trafficSafetyMeetingMapper.getInfo(pd);
+    }
+
 }

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

@@ -0,0 +1,36 @@
+package com.zcloud.service.comprehensive.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyOccupationalHazardsMapper;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyResponsibilityMapper;
+import com.zcloud.service.comprehensive.TrafficSafetyOccupationalHazardsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficSafetyOccupationalHazardsServiceImpl implements TrafficSafetyOccupationalHazardsService {
+    @Autowired
+    private TrafficSafetyOccupationalHazardsMapper occupationalHazardsMapper;
+    @Override
+    public void save(PageData pd) {
+        occupationalHazardsMapper.save(pd);
+    }
+
+    @Override
+    public void edit(PageData pd) {
+        occupationalHazardsMapper.edit(pd);
+    }
+
+    @Override
+    public List<PageData> listForSecurityStaffing(Page page) {
+        return occupationalHazardsMapper.datalistPage(page);
+    }
+
+    @Override
+    public PageData findById(PageData pd) {
+        return occupationalHazardsMapper.findById(pd);
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.zcloud.service.comprehensive.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyResponsibilityMapper;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityLaborContractMapper;
+import com.zcloud.service.comprehensive.TrafficSafetyResponsibilityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficSafetyResponsibilityServiceImpl implements TrafficSafetyResponsibilityService {
+    @Autowired
+    private TrafficSafetyResponsibilityMapper responseMapper;
+    @Override
+    public void save(PageData pd) {
+        responseMapper.save(pd);
+    }
+
+    @Override
+    public void edit(PageData pd) {
+        responseMapper.edit(pd);
+    }
+
+    @Override
+    public List<PageData> listForSecurityStaffing(Page page) {
+        return responseMapper.datalistPage(page);
+    }
+
+    @Override
+    public PageData findById(PageData pd) {
+        return responseMapper.findById(pd);
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.zcloud.service.comprehensive.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityLaborContractMapper;
+import com.zcloud.service.comprehensive.TrafficSecurityLaborContractService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficSecurityLaborContractServiceImpl implements TrafficSecurityLaborContractService {
+    @Autowired
+    private TrafficSecurityLaborContractMapper laborContractMapper;
+    @Override
+    public void save(PageData pd) {
+        laborContractMapper.save(pd);
+    }
+
+    @Override
+    public void edit(PageData pd) {
+        laborContractMapper.edit(pd);
+    }
+
+    @Override
+    public List<PageData> listForSecurityStaffing(Page page) {
+        return laborContractMapper.datalistPage(page);
+    }
+
+    @Override
+    public PageData findById(PageData pd) {
+        return laborContractMapper.findById(pd);
+    }
+}

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

@@ -144,13 +144,28 @@
 		left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
 		where f.ISDELETE = '0'
 		<if test="pd.MEETING_TITLE != null and pd.MEETING_TITLE != ''"><!-- 关键词检索-会议标题 -->
-			and f.MEETING_TITLE = #{pd.MEETING_TITLE}
+			and f.MEETING_TITLE like CONCAT('%',#{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="getInfo" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
+		select
+		f.*,
+		i.CORP_NAME,
+		r.ATTENDANCE_STATUS
+		from
+		<include refid="tableName"></include> f
+		left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
+		left join bus_traffic_safety_meeting_recipient r on f.SAFETY_MEETING_ID = r.SAFETY_MEETING_ID
+		where
+		f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
+		AND
+		r.PRACTITIONER = #{USER_ID}
+	</select>
+
 	<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
 		select
 		f.*,

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

@@ -22,6 +22,8 @@
         f.ATTENDANCE_STATUS,
         f.HOME_ADDRESS,
         f.IDENTITY_NUMBER,
+        f.LATITUDE,
+        f.LONGITUDE,
         f.ISDELETE,
         f.DELETOR,
         f.DELETORNAME,
@@ -33,6 +35,7 @@
         f.OPERATORNAME,
         f.OPERATTIME,
         f.SIGNATUREPICTURE,
+        f.LOCATIONADDRESS,
         f.LIVEPHOTOS
     </sql>
 
@@ -47,6 +50,8 @@
         ATTENDANCE_STATUS,
         HOME_ADDRESS,
         IDENTITY_NUMBER,
+        LATITUDE,
+        LONGITUDE,
         ISDELETE,
         DELETOR,
         DELETORNAME,
@@ -58,6 +63,7 @@
         OPERATORNAME,
         OPERATTIME,
         SIGNATUREPICTURE,
+        LOCATIONADDRESS,
         LIVEPHOTOS
     </sql>
 
@@ -72,6 +78,8 @@
         #{ATTENDANCE_STATUS},
         #{HOME_ADDRESS},
         #{IDENTITY_NUMBER},
+        #{LATITUDE},
+        #{LONGITUDE},
         #{ISDELETE},
         #{DELETOR},
         #{DELETORNAME},
@@ -83,6 +91,7 @@
         #{OPERATORNAME},
         #{OPERATTIME},
         #{SIGNATUREPICTURE},
+        #{LOCATIONADDRESS},
         #{LIVEPHOTOS}
     </sql>
 
@@ -108,7 +117,10 @@
         f.OPERATTIME = #{OPERATTIME},
         f.SIGNATUREPICTURE = #{SIGNATUREPICTURE},
         f.LIVEPHOTOS = #{LIVEPHOTOS},
-        f.ATTENDANCE_STATUS = #{ATTENDANCE_STATUS}
+        f.ATTENDANCE_STATUS = #{ATTENDANCE_STATUS},
+        f.LOCATIONADDRESS = #{LOCATIONADDRESS},
+        f.LATITUDE = #{LATITUDE},
+        f.LONGITUDE = #{LONGITUDE}
         where
         f.SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
         and f.PRACTITIONER = #{OPERATOR}

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

@@ -0,0 +1,137 @@
+<?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.TrafficSafetyOccupationalHazardsMapper">
+    <!-- 表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_OCCUPATIONAL_HAZARDS
+    </sql>
+
+    <!-- 数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+
+    <!-- 字段 -->
+    <sql id="Field">
+        f.OCCUPATIONALHAZARDS_ID,
+        f.OCCUPATIONALNAME,
+        f.COMPLETIONSTATUS,
+        f.VALIDSTATUS,
+        f.ISSIGNED,
+        f.OPERATINGCOMPANY,
+        f.EXPIRYDATE,
+        f.ATTACHMENT_ROUTE,
+        f.USER_ID,
+        f.ISDELETE,
+        f.DELETOR,
+        f.DELETORNAME,
+        f.DELETETIME,
+        f.CREATOR,
+        f.CREATORNAME,
+        f.CREATETIME,
+        f.OPERATOR,
+        f.OPERATORNAME,
+        f.OPERATTIME
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        OCCUPATIONALHAZARDS_ID,
+        OCCUPATIONALNAME,
+        COMPLETIONSTATUS,
+        VALIDSTATUS,
+        ISSIGNED,
+        OPERATINGCOMPANY,
+        EXPIRYDATE,
+        ATTACHMENT_ROUTE,
+        USER_ID,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATORNAME,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{OCCUPATIONALHAZARDS_ID},
+        #{OCCUPATIONALNAME},
+        #{COMPLETIONSTATUS},
+        #{VALIDSTATUS},
+        #{ISSIGNED},
+        #{OPERATINGCOMPANY},
+        #{EXPIRYDATE},
+        #{ATTACHMENT_ROUTE},
+        #{USER_ID},
+        #{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},
+        ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
+        where
+        OCCUPATIONALHAZARDS_ID = #{OCCUPATIONALHAZARDS_ID}
+    </update>
+
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+            u.NAME,
+            u.USER_ID,
+            i.CORP_NAME,
+            c.OCCUPATIONALNAME,
+            c.COMPLETIONSTATUS,
+            c.VALIDSTATUS,
+            c.EXPIRYDATE,
+            c.CREATETIME,
+            c.OPERATTIME,
+            c.OCCUPATIONALHAZARDS_ID,
+            c.ISSIGNED
+        from
+            sys_user u
+                left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
+                left join BUS_TRAFFIC_OCCUPATIONAL_HAZARDS c on u.USER_ID = c.USER_ID
+        where u.ISDELETE = '0'
+          and u.ISMAIN != '1'
+    </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.OCCUPATIONALHAZARDS_ID = #{OCCUPATIONALHAZARDS_ID}
+    </select>
+</mapper>

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

@@ -0,0 +1,137 @@
+<?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.TrafficSafetyResponsibilityMapper">
+    <!-- 表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_SAFETY_RESPONSIBILITY
+    </sql>
+
+    <!-- 数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+
+    <!-- 字段 -->
+    <sql id="Field">
+        f.SAFETYRESPONSIBILITY_ID,
+        f.RESPONSIBILITYNAME,
+        f.COMPLETIONSTATUS,
+        f.VALIDSTATUS,
+        f.ISSIGNED,
+        f.OPERATINGCOMPANY,
+        f.EXPIRYDATE,
+        f.ATTACHMENT_ROUTE,
+        f.USER_ID,
+        f.ISDELETE,
+        f.DELETOR,
+        f.DELETORNAME,
+        f.DELETETIME,
+        f.CREATOR,
+        f.CREATORNAME,
+        f.CREATETIME,
+        f.OPERATOR,
+        f.OPERATORNAME,
+        f.OPERATTIME
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        SAFETYRESPONSIBILITY_ID,
+        RESPONSIBILITYNAME,
+        COMPLETIONSTATUS,
+        VALIDSTATUS,
+        ISSIGNED,
+        OPERATINGCOMPANY,
+        EXPIRYDATE,
+        ATTACHMENT_ROUTE,
+        USER_ID,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATORNAME,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{SAFETYRESPONSIBILITY_ID},
+        #{RESPONSIBILITYNAME},
+        #{COMPLETIONSTATUS},
+        #{VALIDSTATUS},
+        #{ISSIGNED},
+        #{OPERATINGCOMPANY},
+        #{EXPIRYDATE},
+        #{ATTACHMENT_ROUTE},
+        #{USER_ID},
+        #{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},
+        ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
+        where
+        SAFETYRESPONSIBILITY_ID = #{SAFETYRESPONSIBILITY_ID}
+    </update>
+
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+            u.NAME,
+            u.USER_ID,
+            i.CORP_NAME,
+            c.RESPONSIBILITYNAME,
+            c.COMPLETIONSTATUS,
+            c.VALIDSTATUS,
+            c.EXPIRYDATE,
+            c.CREATETIME,
+            c.OPERATTIME,
+            c.SAFETYRESPONSIBILITY_ID,
+            c.ISSIGNED
+        from
+            sys_user u
+                left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
+                left join BUS_TRAFFIC_SAFETY_RESPONSIBILITY c on u.USER_ID = c.USER_ID
+        where u.ISDELETE = '0'
+          and u.ISMAIN != '1'
+    </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.SAFETYRESPONSIBILITY_ID = #{SAFETYRESPONSIBILITY_ID}
+    </select>
+</mapper>

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

@@ -0,0 +1,152 @@
+<?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.TrafficSecurityCommitmentMapper">
+    <!--表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_SECURITY_COMMITMENT
+    </sql>
+
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+
+    <!-- 字段 -->
+    <sql id="Field">
+        f.SECURITYCOMMITMENT_ID,
+        f.COMMITMENTNAME,
+        f.COMPLETIONSTATUS,
+        f.VALIDSTATUS,
+        f.ISSIGNED,
+        f.OPERATINGCOMPANY,
+        f.OPERATINGTYPE,
+        f.EXPIRYDATE,
+        f.PRACTITIONER,
+        f.ATTACHMENT_ROUTE,
+        f.USER_ID,
+        f.ISDELETE,
+        f.DELETOR,
+        f.DELETORNAME,
+        f.DELETETIME,
+        f.CREATOR,
+        f.CREATORNAME,
+        f.CREATETIME,
+        f.OPERATOR,
+        f.OPERATORNAME,
+        f.OPERATTIME
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        SECURITYCOMMITMENT_ID,
+        COMMITMENTNAME,
+        COMPLETIONSTATUS,
+        VALIDSTATUS,
+        ISSIGNED,
+        OPERATINGCOMPANY,
+        OPERATINGTYPE,
+        EXPIRYDATE,
+        PRACTITIONER,
+        ATTACHMENT_ROUTE,
+        USER_ID,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATORNAME,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{SECURITYCOMMITMENT_ID},
+        #{COMMITMENTNAME},
+        #{COMPLETIONSTATUS},
+        #{VALIDSTATUS},
+        #{ISSIGNED},
+        #{OPERATINGCOMPANY},
+        #{OPERATINGTYPE},
+        #{EXPIRYDATE},
+        #{PRACTITIONER},
+        #{ATTACHMENT_ROUTE},
+        #{USER_ID},
+        #{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},
+        ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
+        where
+        SECURITYCOMMITMENT_ID = #{SECURITYCOMMITMENT_ID}
+    </update>
+
+    <!--列表-->
+<!--    <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.COMMITMENTNAME != null and pd.COMMITMENTNAME != ''">&lt;!&ndash; 关键词检索-制度名称 &ndash;&gt;-->
+<!--            and f.COMMITMENTNAME like CONCAT('%',#{pd.COMMITMENTNAME},'%')-->
+<!--        </if>-->
+<!--        <if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''">&lt;!&ndash; 关键词检索-完成状态 &ndash;&gt;-->
+<!--            and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}-->
+<!--        </if>-->
+<!--        <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">&lt;!&ndash; 关键词检索-有效状态 &ndash;&gt;-->
+<!--            and f.VALIDSTATUS = #{pd.VALIDSTATUS}-->
+<!--        </if>-->
+<!--    </select>-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+            u.NAME,
+            u.USER_ID,
+            i.CORP_NAME,
+            c.COMMITMENTNAME,
+            c.COMPLETIONSTATUS,
+            c.VALIDSTATUS,
+            c.EXPIRYDATE,
+            c.CREATETIME,
+            c.OPERATTIME,
+            c.SECURITYCOMMITMENT_ID,
+            c.ISSIGNED
+        from
+            sys_user u
+                left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
+                left join BUS_TRAFFIC_SECURITY_COMMITMENT c on u.USER_ID = c.USER_ID
+        where u.ISDELETE = '0'
+          and u.ISMAIN != '1'
+    </select>
+</mapper>

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

@@ -0,0 +1,162 @@
+<?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.TrafficSecurityLaborContractMapper">
+    <!--表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_LABOR_CONTRACT
+    </sql>
+
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+
+    <!-- 字段 -->
+    <sql id="Field">
+        f.LABORCONTRACT_ID,
+        f.CONTRACTNAME,
+        f.COMPLETIONSTATUS,
+        f.VALIDSTATUS,
+        f.ISSIGNED,
+        f.OPERATINGCOMPANY,
+        f.EXPIRYDATE,
+        f.PRACTITIONER,
+        f.ATTACHMENT_ROUTE,
+        f.USER_ID,
+        f.ISDELETE,
+        f.DELETOR,
+        f.DELETORNAME,
+        f.DELETETIME,
+        f.CREATOR,
+        f.CREATORNAME,
+        f.CREATETIME,
+        f.OPERATOR,
+        f.OPERATORNAME,
+        f.OPERATTIME
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        LABORCONTRACT_ID,
+        CONTRACTNAME,
+        COMPLETIONSTATUS,
+        VALIDSTATUS,
+        ISSIGNED,
+        OPERATINGCOMPANY,
+        EXPIRYDATE,
+        PRACTITIONER,
+        ATTACHMENT_ROUTE,
+        USER_ID,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATORNAME,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{LABORCONTRACT_ID},
+        #{CONTRACTNAME},
+        #{COMPLETIONSTATUS},
+        #{VALIDSTATUS},
+        #{ISSIGNED},
+        #{OPERATINGCOMPANY},
+        #{EXPIRYDATE},
+        #{PRACTITIONER},
+        #{ATTACHMENT_ROUTE},
+        #{USER_ID},
+        #{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},
+        ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE}
+        where
+        LABORCONTRACT_ID = #{LABORCONTRACT_ID}
+    </update>
+
+    <!--列表-->
+<!--    <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.CONTRACTNAME != null and pd.CONTRACTNAME != ''">&lt;!&ndash; 关键词检索-制度名称 &ndash;&gt;-->
+<!--            and f.CONTRACTNAME like CONCAT('%',#{pd.CONTRACTNAME},'%')-->
+<!--        </if>-->
+<!--        <if test="pd.COMPLETIONSTATUS != null and pd.COMPLETIONSTATUS != ''">&lt;!&ndash; 关键词检索-完成状态 &ndash;&gt;-->
+<!--            and f.COMPLETIONSTATUS = #{pd.COMPLETIONSTATUS}-->
+<!--        </if>-->
+<!--        <if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">&lt;!&ndash; 关键词检索-有效状态 &ndash;&gt;-->
+<!--            and f.VALIDSTATUS = #{pd.VALIDSTATUS}-->
+<!--        </if>-->
+<!--        <if test="pd.ISSIGNED != null and pd.ISSIGNED != ''">&lt;!&ndash; 关键词检索-经营类型 &ndash;&gt;-->
+<!--            and f.ISSIGNED = #{pd.ISSIGNED}-->
+<!--        </if>-->
+<!--    </select>-->
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+            u.NAME,
+            u.USER_ID,
+            i.CORP_NAME,
+            c.CONTRACTNAME,
+            c.COMPLETIONSTATUS,
+            c.VALIDSTATUS,
+            c.EXPIRYDATE,
+            c.CREATETIME,
+            c.OPERATTIME,
+            c.LABORCONTRACT_ID,
+            c.ISSIGNED
+        from
+            sys_user u
+                left join bus_corp_info i on u.CORPINFO_ID = i.CORPINFO_ID
+                left join BUS_TRAFFIC_LABOR_CONTRACT c on u.USER_ID = c.USER_ID
+        where u.ISDELETE = '0'
+          and u.ISMAIN != '1'
+    </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.STAFFING_ID = #{STAFFING_ID}
+    </select>
+</mapper>

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

@@ -20,6 +20,7 @@
         f.OPERATIONTYPE,
         f.EXPIRYDATE,
         f.ATTACHMENT_ROUTE,
+        f.USER_ID,
         f.ISDELETE,
         f.DELETOR,
         f.DELETORNAME,
@@ -42,6 +43,7 @@
         OPERATIONTYPE,
         EXPIRYDATE,
         ATTACHMENT_ROUTE,
+        USER_ID,
         ISDELETE,
         DELETOR,
         DELETORNAME,
@@ -64,6 +66,7 @@
         #{OPERATIONTYPE},
         #{EXPIRYDATE},
         #{ATTACHMENT_ROUTE},
+        #{USER_ID},
         #{ISDELETE},
         #{DELETOR},
         #{DELETORNAME},

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

@@ -135,7 +135,7 @@
 		left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
 		where f.ISDELETE = '0'
 		<if test="pd.TITLE != null and pd.TITLE != ''"><!-- 关键词检索-通知标题 -->
-			and f.TITLE = #{pd.TITLE}
+			and f.TITLE like CONCAT ('%',#{pd.TITLE},'%')
 		</if>
 		<if test="pd.REPLYSTATUS != null and pd.REPLYSTATUS != ''"><!-- 关键词检索-回复情况 -->
 			and f.REPLYSTATUS = #{pd.REPLYSTATUS}