新增从业人员管理相关接口

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

@@ -40,6 +40,7 @@ public class TrafficSafetyMeetingController extends BaseController {
         pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
         pd.put("SAFETY_MEETING_ID", safety_meeting_id); // 主键
         pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
+        pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业
         pd.put("MEETING_STATUS", "0"); // 会议状态
         pd.put("MEETING_PERSONS", "0"); // 参会人数
         pd.put("ISDELETE", "0");

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

@@ -0,0 +1,64 @@
+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.TrafficSecurityEmployeesDetailsService;
+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("/employeesdetails")
+public class TrafficSecurityEmployeesDetailsController extends BaseController {
+    @Autowired
+    private TrafficSecurityEmployeesDetailsService detailsService;
+
+    //新增
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = this.getPageData();
+        String employeesdetails_id = this.get32UUID();
+
+        pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
+        pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
+        pd.put("EMPLOYEESDETAILS_ID", employeesdetails_id); // 主键
+        pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
+        pd.put("ISDELETE", "0");
+
+        detailsService.save(pd);
+
+        map.put("result", errInfo);
+        map.put("pd", pd);
+        return map;
+    }
+
+    @RequestMapping(value = "/listForEmployeesDetails")
+    @ResponseBody
+    public Object listForEmployeesDetails(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+
+        page.setPd(pd);
+        List<PageData> varList = detailsService.listForEmployeesDetails(page);
+
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+}

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

@@ -0,0 +1,152 @@
+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.TrafficSecurityEmployeesDetailsService;
+import com.zcloud.service.comprehensive.TrafficSecurityPractitionerManagementService;
+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("/practitionermanagement")
+public class TrafficSecurityPractitionerManagementController extends BaseController {
+    @Autowired
+    private TrafficSecurityPractitionerManagementService providerManagementService;
+    @Autowired
+    private TrafficSecurityEmployeesDetailsService detailsService;
+    //新增
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = this.getPageData();
+        String practitionerId = this.get32UUID();
+        String employeesdetails_id = this.get32UUID();
+
+        pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id
+        pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名
+        pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业
+        pd.put("PRACTITIONER_ID", practitionerId); // 主键
+        pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
+        pd.put("ISDELETE", "0");
+
+        providerManagementService.save(pd);
+
+        pd.put("EMPLOYEESDETAILS_ID", employeesdetails_id);
+
+        detailsService.save(pd);
+
+        map.put("result", errInfo);
+        map.put("pd", pd);
+        return map;
+    }
+
+    @RequestMapping(value = "/listForPractitionerManagement")
+    @ResponseBody
+    public Object listForPractitionerManagement(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 CONTACTPHONE = pd.getString("CONTACTPHONE"); // 关键词检索条件
+        if (Tools.notEmpty(CONTACTPHONE))
+            pd.put("CONTACTPHONE", CONTACTPHONE.trim());
+
+        String IDNUMBER = pd.getString("IDNUMBER"); // 关键词检索条件
+        if (Tools.notEmpty(IDNUMBER))
+            pd.put("IDNUMBER", IDNUMBER.trim());
+
+        String DRIVINGVEHICLE = pd.getString("DRIVINGVEHICLE"); // 关键词检索条件
+        if (Tools.notEmpty(DRIVINGVEHICLE))
+            pd.put("DRIVINGVEHICLE", DRIVINGVEHICLE.trim());
+
+        String EMPLOYMENTTYPE = pd.getString("EMPLOYMENTTYPE"); // 关键词检索条件
+        if (Tools.notEmpty(EMPLOYMENTTYPE))
+            pd.put("EMPLOYMENTTYPE", EMPLOYMENTTYPE.trim());
+
+        String PERSONNELSTATUS = pd.getString("PERSONNELSTATUS"); // 关键词检索条件
+        if (Tools.notEmpty(PERSONNELSTATUS))
+            pd.put("PERSONNELSTATUS", PERSONNELSTATUS.trim());
+
+        String FACEAUTHENTICATION = pd.getString("FACEAUTHENTICATION"); // 关键词检索条件
+        if (Tools.notEmpty(FACEAUTHENTICATION))
+            pd.put("FACEAUTHENTICATION", FACEAUTHENTICATION.trim());
+
+        String DRIVINGLICENSEAUTHENTICATION = pd.getString("DRIVINGLICENSEAUTHENTICATION"); // 关键词检索条件
+        if (Tools.notEmpty(DRIVINGLICENSEAUTHENTICATION))
+            pd.put("DRIVINGLICENSEAUTHENTICATION", DRIVINGLICENSEAUTHENTICATION.trim());
+
+        String PROFESSIONALQUALIFICATION = pd.getString("PROFESSIONALQUALIFICATION"); // 关键词检索条件
+        if (Tools.notEmpty(PROFESSIONALQUALIFICATION))
+            pd.put("PROFESSIONALQUALIFICATION", PROFESSIONALQUALIFICATION.trim());
+
+        String OPERATINGCOMPANY = pd.getString("OPERATINGCOMPANY"); // 关键词检索条件
+        if (Tools.notEmpty(OPERATINGCOMPANY))
+            pd.put("OPERATINGCOMPANY", OPERATINGCOMPANY.trim());
+
+        page.setPd(pd);
+        List<PageData> varList = providerManagementService.listForPractitionerManagement(page);
+
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**
+     * 修改详情
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/goEdit")
+    // @RequiresPermissions("traininginfo:edit")
+    @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 = providerManagementService.findById(pd);	//根据ID读取
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**解聘
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/delete")
+    // @RequiresPermissions("traininginfo:del")
+    @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()));	//删除时间
+        providerManagementService.delete(pd);
+        map.put("result", errInfo);				//返回结果
+        return map;
+    }
+
+}

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityEmployeesDetailsMapper.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 TrafficSecurityEmployeesDetailsMapper {
+    /**
+     * 新增
+     * @param page
+     * @return
+     */
+    void save(PageData pd);
+
+    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    List<PageData> datalistPage(Page page);
+}

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

@@ -20,4 +20,12 @@ public interface TrafficSecurityPractitionerManagementMapper {
      * @return
      */
     List<PageData> datalistPage(Page page);
+
+    /**通过id获取数据
+     * @param pd
+     * @throws Exception
+     */
+    PageData findById(PageData pd);
+
+    void delete(PageData pd);
 }

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

@@ -0,0 +1,25 @@
+package com.zcloud.service.comprehensive;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityEmployeesDetailsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficSecurityEmployeesDetailsImpl implements TrafficSecurityEmployeesDetailsService{
+    @Autowired
+    private TrafficSecurityEmployeesDetailsMapper ecoDetailsMapper;
+
+    @Override
+    public void save(PageData pd) {
+        ecoDetailsMapper.save(pd);
+    }
+
+    @Override
+    public List<PageData> listForEmployeesDetails(Page page) {
+        return ecoDetailsMapper.datalistPage(page);
+    }
+}

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

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

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

@@ -0,0 +1,18 @@
+package com.zcloud.service.comprehensive;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+public interface TrafficSecurityPractitionerManagementService {
+
+    void save(PageData pd);
+
+    List<PageData> listForPractitionerManagement(Page page);
+
+    PageData findById(PageData pd) throws Exception;
+
+    void delete(PageData pd);
+}

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

@@ -0,0 +1,39 @@
+package com.zcloud.service.comprehensive.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityPractitionerManagementMapper;
+import com.zcloud.service.comprehensive.TrafficSecurityPractitionerManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TrafficSecurityPractitionerManagementServiceImpl implements TrafficSecurityPractitionerManagementService {
+    @Autowired
+    private TrafficSecurityPractitionerManagementMapper practitionerManagementMapper;
+
+    @Override
+    public void save(PageData pd) {
+        practitionerManagementMapper.save(pd);
+    }
+
+    @Override
+    public List<PageData> listForPractitionerManagement(Page page) {
+        return practitionerManagementMapper.datalistPage(page);
+    }
+
+    /**通过id获取数据
+     * @param pd
+     */
+    @Override
+    public PageData findById(PageData pd)throws Exception {
+        return practitionerManagementMapper.findById(pd);
+    }
+
+    @Override
+    public void delete(PageData pd) {
+        practitionerManagementMapper.delete(pd);
+    }
+}

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

@@ -0,0 +1,160 @@
+<?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.TrafficSecurityEmployeesDetailsMapper">
+    <sql id="tableName">
+        BUS_TRAFFIC_EMPLOYEES_DETAILS
+    </sql>
+
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+    <!-- 字段用于查询 -->
+    <sql id="Field">
+        f.EMPLOYEEDETAILS_ID,
+        f.PRACTITIONER_ID,
+        f.EMPLOYEENAME,
+        f.GENDER,
+        f.EMPLOYMENTTYPE,
+        f.INDUSTRY,
+        f.ENTRYDATE,
+        f.HOMEADDRESS,
+        f.OPERATINGCOMPANY,
+        f.BUSINESSTYPE,
+        f.DATEOFBIRTH,
+        f.VALIDUNTIL,
+        f.IDCARDFRONT,
+        f.IDCARDBACK,
+        f.DRIVINGLICENSENUMBER,
+        f.VEHICLETYPE,
+        f.NATIONALITY,
+        f.VALIDYEARS,
+        f.EXPIRYDATE,
+        f.LICENSEFIRSTISSUEDDATE,
+        f.ISSUINGUNIT,
+        f.CERTIFICATESTATUS,
+        f.IDENTITYTYPE,
+        f.CERTIFICATEFIRSTISSUEDATE,
+        f.CERTIFICATEEXPIRYDATE,
+        f.DRIVINGVEHICLE,
+        f.EMAIL,
+        f.EDUCATIONALLEVEL,
+        f.ADDRESS,
+        f.ISDELETE,
+        f.DELETOR,
+        f.DELETETIME,
+        f.CREATOR,
+        f.CREATETIME,
+        f.OPERATOR,
+        f.OPERATTIME
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        EMPLOYEEDETAILS_ID,
+        PRACTITIONER_ID,
+        EMPLOYEENAME,
+        GENDER,
+        EMPLOYMENTTYPE,
+        INDUSTRY,
+        ENTRYDATE,
+        HOMEADDRESS,
+        OPERATINGCOMPANY,
+        BUSINESSTYPE,
+        DATEOFBIRTH,
+        VALIDUNTIL,
+        IDCARDFRONT,
+        IDCARDBACK,
+        DRIVINGLICENSENUMBER,
+        VEHICLETYPE,
+        NATIONALITY,
+        VALIDYEARS,
+        EXPIRYDATE,
+        LICENSEFIRSTISSUEDDATE,
+        ISSUINGUNIT,
+        CERTIFICATESTATUS,
+        IDENTITYTYPE,
+        CERTIFICATEFIRSTISSUEDATE,
+        CERTIFICATEEXPIRYDATE,
+        DRIVINGVEHICLE,
+        EMAIL,
+        EDUCATIONALLEVEL,
+        ADDRESS,
+        ISDELETE,
+        DELETOR,
+        DELETETIME,
+        CREATOR,
+        CREATETIME,
+        OPERATOR,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{EMPLOYEEDETAILS_ID},
+        #{PRACTITIONER_ID},
+        #{EMPLOYEENAME},
+        #{GENDER},
+        #{EMPLOYMENTTYPE},
+        #{INDUSTRY},
+        #{ENTRYDATE},
+        #{HOMEADDRESS},
+        #{OPERATINGCOMPANY},
+        #{BUSINESSTYPE},
+        #{DATEOFBIRTH},
+        #{VALIDUNTIL},
+        #{IDCARDFRONT},
+        #{IDCARDBACK},
+        #{DRIVINGLICENSENUMBER},
+        #{VEHICLETYPE},
+        #{NATIONALITY},
+        #{VALIDYEARS},
+        #{EXPIRYDATE},
+        #{LICENSEFIRSTISSUEDDATE},
+        #{ISSUINGUNIT},
+        #{CERTIFICATESTATUS},
+        #{IDENTITYTYPE},
+        #{CERTIFICATEFIRSTISSUEDATE},
+        #{CERTIFICATEEXPIRYDATE},
+        #{DRIVINGVEHICLE},
+        #{EMAIL},
+        #{EDUCATIONALLEVEL},
+        #{ADDRESS},
+        #{ISDELETE},
+        #{DELETOR},
+        #{DELETETIME},
+        #{CREATOR},
+        #{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>
+
+    <!--列表-->
+    <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.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
+        where f.ISDELETE = '0'
+        <if test="pd.PRACTITIONER != null and pd.PRACTITIONER != ''"><!-- 关键词检索-从业人员 -->
+            and f.PRACTITIONER = #{pd.PRACTITIONER}
+        </if>
+        <if test="pd.CONTACTPHONE != null and pd.CONTACTPHONE != ''"><!-- 关键词检索-联系电话 -->
+            and f.CONTACTPHONE = #{pd.CONTACTPHONE}
+        </if>
+    </select>
+</mapper>

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

@@ -13,22 +13,15 @@
     <!-- 字段用于查询 -->
     <sql id="Field">
         f.PRACTITIONER_ID,
-        f.PRACTITIONER,
-        f.PRACTITIONERSTATUS,
-        f.PRACTITIONERTYPE,
-        f.CONTACTPHONE,
-        f.DRIVINGVEHICLE,
-        f.IDNUMBER,
-        f.ENTRYTIME,
-        f.EXPIRATIONTIME,
-        f.BELONGINGDEPARTMENT,
         f.TRANSPORTENTERPRISE,
+        f.PERSONNELSTATUS,
         f.FACEAUTHENTICATION,
         f.IDENTITYAUTHENTICATION,
         f.DRIVINGLICENSEAUTHENTICATION,
         f.PROFESSIONALQUALIFICATION,
-        f.CONTRACTAUTHENTICATION,
+        f.REASONDISMISSAL,
         f.ISDELETE,
+        f.PHYSICALCERTIFICATION,
         f.DELETOR,
         f.DELETORNAME,
         f.DELETETIME,
@@ -43,22 +36,15 @@
     <!-- 字段用于新增 -->
     <sql id="Field2">
         PRACTITIONER_ID,
-        PRACTITIONER,
-        PRACTITIONERSTATUS,
-        PRACTITIONERTYPE,
-        CONTACTPHONE,
-        DRIVINGVEHICLE,
-        IDNUMBER,
-        ENTRYTIME,
-        EXPIRATIONTIME,
-        BELONGINGDEPARTMENT,
         TRANSPORTENTERPRISE,
+        PERSONNELSTATUS,
         FACEAUTHENTICATION,
         IDENTITYAUTHENTICATION,
         DRIVINGLICENSEAUTHENTICATION,
         PROFESSIONALQUALIFICATION,
-        CONTRACTAUTHENTICATION,
+        REASONDISMISSAL,
         ISDELETE,
+        PHYSICALCERTIFICATION,
         DELETOR,
         DELETORNAME,
         DELETETIME,
@@ -73,22 +59,15 @@
     <!-- 字段值 -->
     <sql id="FieldValue">
         #{PRACTITIONER_ID},
-        #{PRACTITIONER},
-        #{PRACTITIONERSTATUS},
-        #{PRACTITIONERTYPE},
-        #{CONTACTPHONE},
-        #{DRIVINGVEHICLE},
-        #{IDNUMBER},
-        #{ENTRYTIME},
-        #{EXPIRATIONTIME},
-        #{BELONGINGDEPARTMENT},
         #{TRANSPORTENTERPRISE},
+        #{PERSONNELSTATUS},
         #{FACEAUTHENTICATION},
         #{IDENTITYAUTHENTICATION},
         #{DRIVINGLICENSEAUTHENTICATION},
         #{PROFESSIONALQUALIFICATION},
-        #{CONTRACTAUTHENTICATION},
+        #{REASONDISMISSAL},
         #{ISDELETE},
+        #{PHYSICALCERTIFICATION},
         #{DELETOR},
         #{DELETORNAME},
         #{DELETETIME},
@@ -100,7 +79,6 @@
         #{OPERATTIME}
     </sql>
 
-
     <!-- 新增-->
     <insert id="save" parameterType="pd">
         insert into
@@ -112,20 +90,69 @@
         )
     </insert>
 
+    <!-- 删除-->
+    <delete id="delete" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        ISDELETE = '1',
+        DELETOR = #{DELETOR},
+        DELETETIME = #{DELETETIME}
+        where
+        PRACTITIONER_ID = #{PRACTITIONER_ID}
+    </delete>
+
     <!--列表-->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
-        f.*,
+        e.*,
         i.CORP_NAME
         from
         <include refid="tableName"></include> f
+        left join bus_traffic_employees_details e on f.PRACTITIONER_ID = e.PRACTITIONER_ID
         left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
         where f.ISDELETE = '0'
         <if test="pd.PRACTITIONER != null and pd.PRACTITIONER != ''"><!-- 关键词检索-从业人员 -->
             and f.PRACTITIONER = #{pd.PRACTITIONER}
         </if>
         <if test="pd.CONTACTPHONE != null and pd.CONTACTPHONE != ''"><!-- 关键词检索-联系电话 -->
-            and f.CONTACTPHONE = #{pd.CONTACTPHONE}
+            and e.CONTACTPHONE = #{pd.CONTACTPHONE}
+        </if>
+        <if test="pd.IDNUMBER != null and pd.IDNUMBER != ''"><!-- 关键词检索-身份证号 -->
+            and e.IDNUMBER = #{pd.IDNUMBER}
+        </if>
+        <if test="pd.DRIVINGVEHICLE != null and pd.DRIVINGVEHICLE != ''"><!-- 关键词检索-驾乘车辆 -->
+            and e.DRIVINGVEHICLE = #{pd.DRIVINGVEHICLE}
+        </if>
+        <if test="pd.EMPLOYMENTTYPE != null and pd.EMPLOYMENTTYPE != ''"><!-- 关键词检索-从业类型 -->
+            and e.EMPLOYMENTTYPE = #{pd.EMPLOYMENTTYPE}
+        </if>
+        <if test="pd.PERSONNELSTATUS != null and pd.PERSONNELSTATUS != ''"><!-- 关键词检索-授权状态 -->
+            and f.PERSONNELSTATUS = #{pd.PERSONNELSTATUS}
+        </if>
+        <if test="pd.FACEAUTHENTICATION != null and pd.FACEAUTHENTICATION != ''"><!-- 关键词检索-人脸认证 -->
+            and f.FACEAUTHENTICATION = #{pd.FACEAUTHENTICATION}
+        </if>
+        <if test="pd.DRIVINGLICENSEAUTHENTICATION != null and pd.DRIVINGLICENSEAUTHENTICATION != ''"><!-- 关键词检索-驾驶认证 -->
+            and f.DRIVINGLICENSEAUTHENTICATION = #{pd.DRIVINGLICENSEAUTHENTICATION}
+        </if>
+        <if test="pd.PROFESSIONALQUALIFICATION != null and pd.PROFESSIONALQUALIFICATION != ''"><!-- 关键词检索-从业资格认证 -->
+            and f.PROFESSIONALQUALIFICATION = #{pd.PROFESSIONALQUALIFICATION}
+        </if>
+        <if test="pd.OPERATINGCOMPANY != null and pd.OPERATINGCOMPANY != ''"><!-- 关键词检索-经营企业 -->
+            and e.OPERATINGCOMPANY = #{pd.OPERATINGCOMPANY}
         </if>
     </select>
+
+    <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
+        select
+        e.*,
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        left join bus_traffic_employees_details e on f.PRACTITIONER_ID = e.PRACTITIONER_ID
+        where
+        f.PRACTITIONER_ID = #{PRACTITIONER_ID}
+    </select>
+
 </mapper>