Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChCfgAprempType.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * CH_CFG_APREMP_TYPE
+ */
+@Data
+@TableName("CH_CFG_APREMP_TYPE")
+public class ChCfgAprempType implements Serializable {
+    /**
+     * 鉴定人员类型ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long aprempTypeId;
+
+    /**
+     * 鉴定人员类型名称
+     */
+    private String aprempName;
+
+    /**
+     * 父级鉴定人员类型ID
+     */
+    private Long parAprempTypeId;
+
+    /**
+     * 基础参数配置ID
+     */
+    private Long paraId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChFndEducation.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * CH_FND_EDUCATION
+ *
+ * @author
+ */
+@Data
+@TableName("CH_FND_EDUCATION")
+public class ChFndEducation implements Serializable {
+    /**
+     * 学历ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long eduId;
+
+    /**
+     * 学历名称
+     */
+    private String eduCode;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/AprEmpVO.java

+package com.hungraim.ltc.pojo.vo.governance;
+
+import lombok.Data;
+
+/**
+ * 评定机构信息列表VO
+ */
+@Data
+public class AprEmpVO {
+    /**
+     * 评定机构id
+     */
+    private String aprOrganId;
+    /**
+     * 适用机构id
+     */
+    private String organId;
+    /**
+     * 适用机构名称
+     */
+    private String organName;
+    /**
+     * 机构代码
+     */
+    private String organCode;
+    /**
+     * 所在省市
+     */
+    private String districtProvincial;
+    private String districtCity;
+    private String districtArea;
+    /**
+     * 评定机构名称
+     */
+    private String aprOrganName;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifiedSocialCreditCode;
+    /**
+     * 机构类型名称
+     */
+    private String organTypeName;
+    /**
+     * 机构地址
+     */
+    private String acptProvincial;//省
+    private String acptCity;//市
+    private String acptArea;//区
+    private String acptStreet;//街道
+    private String acptAddress;//详细地址
+    /**
+     * 机构联系人姓名
+     */
+    private String linkName;
+    /**
+     * 机构联系人手机号
+     */
+    private String linkTel;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/AprOrganVO.java

@@ -3,7 +3,7 @@ package com.hungraim.ltc.pojo.vo.governance;
 import lombok.Data;
 
 /**
- * 评定机构信息列表VO
+ * 评定人员信息列表VO
  */
 @Data
 public class AprOrganVO {
@@ -38,23 +38,48 @@ public class AprOrganVO {
      */
     private String unifiedSocialCreditCode;
     /**
-     * 机构类型名称
+     * 评定人员姓名
      */
-    private String organTypeName;
+    private String realName;
     /**
-     * 机构地址
+     * 评定人员性别
      */
-    private String acptProvincial;//省
-    private String acptCity;//市
-    private String acptArea;//区
-    private String acptStreet;//街道
-    private String acptAddress;//详细地址
+    private String gender;
     /**
-     * 机构联系人姓名
+     * 评定人员年龄
      */
-    private String linkName;
+    private String age;
     /**
-     * 机构联系人手机号
+     * 评定人员证件类型
      */
-    private String linkTel;
+    private String certifTypeId;
+    /**
+     * 评定人员证件号码
+     */
+    private String certiCode;
+    /**
+     * 评定人员手机号码
+     */
+    private String tel;
+    /**
+     * 评定人员资质
+     */
+    private String aprempTypeF;//父类型
+    private String aprempTypeS;//子类型
+    /**
+     * 文化水平
+     */
+    private String eduCode;
+    /**
+     * 人员类型 鉴定人员：0；管理人员：1
+     */
+    private String empType;
+    /**
+     * 是否是组长 0组长，1非组长
+     */
+    private String groupLeader;
+    /**
+     * 状态 有效：0；失效：1
+     */
+    private String isLock;
 }

governance/src/main/java/com/hungraim/ltc/governance/controller/AprOrganController.java

@@ -2,9 +2,13 @@ package com.hungraim.ltc.governance.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.service.AprOrganService;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
 import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
+import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
@@ -189,4 +193,105 @@ public class AprOrganController {
         return Result.success(chCfgAprGroupDetails);
     }
 
+
+    /**
+     * 评定人员信息列表
+     *
+     * @param pageNum    页码
+     * @param pageSize   每页展示条数
+     * @param organId    适用机构id
+     * @param isIncluded 是否包含下级机构,值为true，则包含organId的下层机构
+     * @param organName  评定机构名称
+     * @param realName   评定人员姓名
+     * @param tel        评定人员手机号码
+     * @param certiCode  评定人员证件号码
+     * @param isLock     状态 有效：0；失效：1
+     * @param empType    评定人员类型 鉴定人员：0；管理人员：1
+     */
+    @RequestMapping("/aprEmpList")
+    public Result<Page<AprEmpVO>> aprEmpList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
+                                             Long organId, Boolean isIncluded, String organName, String realName, String tel, String certiCode, String isLock, String empType) {
+        Page<AprEmpVO> page = new Page<>(pageNum, pageSize);
+        page = aprOrganService.aprEmpList(page, organId, isIncluded, organName, realName, tel, certiCode, isLock, empType);
+        return Result.success(page);
+    }
+
+    /**
+     * 新增评定机构人员或更新评定机构人员信息(有emp_id就更新,没有就新增)
+     */
+    @DeleteMapping("/addOrUpdateAprEmp")
+    public Result addOrUpdateAprEmp(ChAprEmp chAprEmp) {
+        if (chAprEmp == null) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        if (chAprEmp.getEmpId() == null) {
+            //新增
+            if (chAprEmp.getAprOrganId() == null) {//评定机构id
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (StringUtils.isBlank(chAprEmp.getRealName())) {//评定人员姓名
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (StringUtils.isBlank(chAprEmp.getCertifTypeId())) {//评定人员证件类型
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (StringUtils.isBlank(chAprEmp.getCertiCode())) {//评定人员证件号码
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (StringUtils.isBlank(chAprEmp.getGender())) {//评定人员性别
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (chAprEmp.getAge() == null) {//评定人员年龄
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (StringUtils.isBlank(chAprEmp.getTel())) {//评定人员手机号码
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (StringUtils.isBlank(chAprEmp.getAprempTypeNameF()) || StringUtils.isBlank(chAprEmp.getAprempTypeNameS())) {//评定人员资质
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (chAprEmp.getEmpType() == null) {//评定人员类型
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (chAprEmp.getEduId() == null) {//评定人员文化水平
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (chAprEmp.getGroupLeader() == null) {//评定人员是否是组长
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+        } else {
+            //更新
+            if (StringUtils.isBlank(chAprEmp.getTel())) {//评定人员手机号码
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (chAprEmp.getAprempTypeIdF() == null || chAprEmp.getAprempTypeIdS() == null) {//评定人员资质
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+            if (chAprEmp.getEduId() == null) {//评定人员文化水平
+                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+            }
+        }
+        aprOrganService.addOrUpdateAprEmp(chAprEmp);
+        return Result.success();
+    }
+
+    /**
+     * 获取评定机构人员资质
+     *
+     * @param parAprempTypeId 父级鉴定人员类型ID(如果没有就查询所有父类型资质)
+     */
+    @GetMapping("/cfgAprEmpType")
+    public Result<List<ChCfgAprempType>> cfgAprEmpType(String parAprempTypeId) {
+        List<ChCfgAprempType> cfgAprEmpType = aprOrganService.cfgAprEmpType(parAprempTypeId);
+        return Result.success(cfgAprEmpType);
+    }
+
+    /**
+     * 获取学历信息
+     */
+    @GetMapping("/fndEducation")
+    public Result<List<ChFndEducation>> fndEducation() {
+        List<ChFndEducation> fndEducation = aprOrganService.fndEducation();
+        return Result.success(fndEducation);
+    }
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/AprEmpMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AprEmpMapper extends BaseMapper<ChAprEmp> {
+
+}

governance/src/main/java/com/hungraim/ltc/governance/dao/AprOrganMapper.java

@@ -3,6 +3,7 @@ package com.hungraim.ltc.governance.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
+import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
@@ -13,4 +14,6 @@ import java.util.List;
 @Repository
 public interface AprOrganMapper extends BaseMapper<ChAprOrgan> {
     Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, List<Long> organIds, String organName, String code);
+
+    Page<AprEmpVO> aprEmpList(Page<AprEmpVO> page, List<Long> organIds, String organName, String realName, String tel, String certiCode, String isLock, String empType);
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/CfgAprempMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CfgAprempMapper extends BaseMapper<ChCfgAprempType> {
+
+}

governance/src/main/java/com/hungraim/ltc/governance/dao/FndEducationMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FndEducationMapper extends BaseMapper<ChFndEducation> {
+
+}

governance/src/main/java/com/hungraim/ltc/governance/service/AprOrganService.java

 package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
 import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
+import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
 import org.springframework.stereotype.Service;
 
@@ -28,4 +32,11 @@ public interface AprOrganService {
 
     List<ChCfgAprGroupDetail> getCfgAprGroupDetail();
 
+    Page<AprEmpVO> aprEmpList(Page<AprEmpVO> page, Long organId, Boolean isIncluded, String organName, String realName, String tel, String certiCode, String isLock, String empType);
+
+    void addOrUpdateAprEmp(ChAprEmp chAprEmp);
+
+    List<ChCfgAprempType> cfgAprEmpType(String parAprempTypeId);
+
+    List<ChFndEducation> fndEducation();
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java

@@ -3,17 +3,20 @@ package com.hungraim.ltc.governance.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.api.OrganFeignService;
-import com.hungraim.ltc.governance.dao.AprOrganMapper;
-import com.hungraim.ltc.governance.dao.ChCfgAprGroupDetailMapper;
-import com.hungraim.ltc.governance.dao.ChCfgAprOrganTypeMapper;
+import com.hungraim.ltc.governance.dao.*;
 import com.hungraim.ltc.governance.service.AprOrganService;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
 import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
+import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
 import com.hungraim.ltc.util.Result;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -27,8 +30,11 @@ public class AprOrganServiceImpl implements AprOrganService {
 
     private final OrganFeignService organFeignService;
     private final AprOrganMapper aprOrganMapper;
+    private final AprEmpMapper aprEmpMapper;
     private final ChCfgAprOrganTypeMapper cfgAprOrganTypeMapper;
     private final ChCfgAprGroupDetailMapper cfgAprGroupDetailMapper;
+    private final CfgAprempMapper cfgAprempMapper;
+    private final FndEducationMapper fndEducationMapper;
 
     @Override
     public Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, Long organId, Boolean isIncluded, String organName, String code) {
@@ -99,4 +105,53 @@ public class AprOrganServiceImpl implements AprOrganService {
     public List<ChCfgAprGroupDetail> getCfgAprGroupDetail() {
         return cfgAprGroupDetailMapper.selectList(new QueryWrapper<ChCfgAprGroupDetail>().eq("STATUS", 0));
     }
+
+    @Override
+    public Page<AprEmpVO> aprEmpList(Page<AprEmpVO> page, Long organId, Boolean isIncluded, String organName, String realName, String tel, String certiCode, String isLock, String empType) {
+        Result<List<Long>> organChild = null;
+        List<Long> organIds = null;
+        if (organId != null) {
+            if (isIncluded == null) {
+                isIncluded = false;
+            }
+            organChild = organFeignService.getOrganChild(organId, isIncluded);
+            organIds = organChild.getData();
+        }
+        return aprOrganMapper.aprEmpList(page, organIds, organName, realName, tel, certiCode, isLock, empType);
+    }
+
+    @Override
+    public void addOrUpdateAprEmp(ChAprEmp chAprEmp) {
+        if (chAprEmp.getEmpId() == null) {
+            //新增
+            chAprEmp.setEffTime(new Date());
+            aprEmpMapper.insert(chAprEmp);
+        } else {
+            //更新
+            ChAprEmp aprEmp = aprEmpMapper.selectById(chAprEmp.getEmpId());
+            aprEmp.setTel(chAprEmp.getTel());
+            aprEmp.setAprempTypeIdF(chAprEmp.getAprempTypeIdF());
+            aprEmp.setAprempTypeIdS(chAprEmp.getAprempTypeIdS());
+            aprEmp.setEduId(chAprEmp.getEduId());
+            aprEmpMapper.updateById(aprEmp);
+        }
+    }
+
+    @Override
+    public List<ChCfgAprempType> cfgAprEmpType(String parAprempTypeId) {
+        if (StringUtils.isBlank(parAprempTypeId)) {
+            //父类型资质
+            QueryWrapper<ChCfgAprempType> queryWrapper = new QueryWrapper<ChCfgAprempType>();
+            queryWrapper.isNull("PAR_APREMP_TYPE_ID").or().eq("PAR_APREMP_TYPE_ID", "");
+            return cfgAprempMapper.selectList(queryWrapper);
+        } else {
+            //根据父类型资质查询子类型资质
+            return cfgAprempMapper.selectList(new QueryWrapper<ChCfgAprempType>().eq("PAR_APREMP_TYPE_ID", parAprempTypeId));
+        }
+    }
+
+    @Override
+    public List<ChFndEducation> fndEducation() {
+        return fndEducationMapper.selectList(new QueryWrapper<>());
+    }
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/AprOrganMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hungraim.ltc.governance.dao.AprOrganMapper">
 
-    <!--监管机构人员信息列表-->
+    <!--评定机构信息列表-->
     <select id="aprOrganList" resultType="com.hungraim.ltc.pojo.vo.governance.AprOrganVO">
         SELECT--评定机构id
         organ.APR_ORGAN_ID aprOrganId,
@@ -50,4 +50,82 @@
             and organ.UNIFIED_SOCIAL_CREDIT_CODE = #{code}
         </if>
     </select>
+
+    <!--评定人员信息列表-->
+    <select id="aprEmpList" resultType="com.hungraim.ltc.pojo.vo.governance.AprEmpVO">
+        SELECT--评定机构id
+        organ.APR_ORGAN_ID aprOrganId,
+        --适用机构
+        srvOrgan.ORGAN_ID organId,
+        srvOrgan.ORGAN_NAME organName,
+        --机构代码
+        organ.ORGAN_CODE organCode,
+        --所在省市区
+        organ.DISTRICT_PROVINCIAL districtProvincial,
+        organ.district_city districtCity,
+        organ.district_area districtArea,
+        --评定机构名称
+        organ.ORGAN_NAME aprOrganName,
+        --统一社会信用代码
+        organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
+        --评定人员姓名
+        emp.REAL_NAME realName,
+        --评定人员性别
+        emp.GENDER gender,
+        --评定人员年龄
+        emp.AGE age,
+        --评定人员证件类型
+        emp.CERTIF_TYPE_ID certifTypeId,
+        --评定人员证件号码
+        emp.CERTI_CODE certiCode,
+        --评定人员手机号码
+        emp.tel tel,
+        --评定人员资质
+        (select type.APREMP_NAME from CH_CFG_APREMP_TYPE type where type.APREMP_TYPE_ID = emp.APREMP_TYPE_ID_F) aprempTypeF,
+        (select type.APREMP_NAME from CH_CFG_APREMP_TYPE type where type.APREMP_TYPE_ID = emp.APREMP_TYPE_ID_S) aprempTypeS,
+        --文化水平
+        education.EDU_CODE eduCode,
+        --人员类型 鉴定人员：0；管理人员：1
+        emp.EMP_TYPE empType,
+        --是否是组长 0组长，1非组长
+        emp.Group_leader groupLeader,
+        --状态 有效：0；失效：1
+        emp.IS_LOCK isLock
+        FROM
+        --鉴定人员表
+        CH_APR_EMP emp
+        --评定机构表
+        LEFT JOIN CH_APR_ORGAN organ ON emp.APR_ORGAN_ID = organ.APR_ORGAN_ID
+        --适用机构定义表
+        LEFT JOIN CH_FND_ORGAN srvOrgan ON organ.organ_id = srvOrgan.organ_id
+        --学历表
+        LEFT JOIN CH_FND_EDUCATION education ON emp.EDU_ID = education.EDU_ID
+        --资质表
+        LEFT JOIN CH_CFG_APREMP_TYPE type ON emp.EDU_ID = education.EDU_ID
+        where organ.STATUS = 0
+        <if test="organIds != null">
+            and organ.organ_id in
+            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+                #{organId}
+            </foreach>
+        </if>
+        <if test="organName != null and organName != ''">
+            and organ.ORGAN_NAME LIKE CONCAT('%',CONCAT( #{organName} ,'%'))
+        </if>
+        <if test="realName != null and realName != ''">
+            and emp.real_name = #{realName}
+        </if>
+        <if test="tel != null and tel != ''">
+            and emp.tel = #{tel}
+        </if>
+        <if test="certiCode != null and certiCode != ''">
+            and emp.certi_code = #{certiCode}
+        </if>
+        <if test="isLock != null and isLock != ''">
+            and emp.is_lock = #{isLock}
+        </if>
+        <if test="empType != null and empType != ''">
+            and emp.emp_type = #{empType}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file