feat(staff-enterprise-relation): 列表查询添加员工姓名JOIN
This commit is contained in:
@@ -8,6 +8,7 @@
|
|||||||
<resultMap type="com.ruoyi.ccdi.domain.vo.CcdiStaffEnterpriseRelationVO" id="CcdiStaffEnterpriseRelationVOResult">
|
<resultMap type="com.ruoyi.ccdi.domain.vo.CcdiStaffEnterpriseRelationVO" id="CcdiStaffEnterpriseRelationVOResult">
|
||||||
<id property="id" column="id"/>
|
<id property="id" column="id"/>
|
||||||
<result property="personId" column="person_id"/>
|
<result property="personId" column="person_id"/>
|
||||||
|
<result property="personName" column="person_name"/>
|
||||||
<result property="relationPersonPost" column="relation_person_post"/>
|
<result property="relationPersonPost" column="relation_person_post"/>
|
||||||
<result property="socialCreditCode" column="social_credit_code"/>
|
<result property="socialCreditCode" column="social_credit_code"/>
|
||||||
<result property="enterpriseName" column="enterprise_name"/>
|
<result property="enterpriseName" column="enterprise_name"/>
|
||||||
@@ -27,35 +28,41 @@
|
|||||||
<!-- 分页查询员工实体关系列表 -->
|
<!-- 分页查询员工实体关系列表 -->
|
||||||
<select id="selectRelationPage" resultMap="CcdiStaffEnterpriseRelationVOResult">
|
<select id="selectRelationPage" resultMap="CcdiStaffEnterpriseRelationVOResult">
|
||||||
SELECT
|
SELECT
|
||||||
id, person_id, relation_person_post, social_credit_code, enterprise_name,
|
ser.id, ser.person_id, bs.name as person_name, ser.relation_person_post,
|
||||||
status, remark, data_source, is_employee, is_emp_family, is_customer, is_cust_family,
|
ser.social_credit_code, ser.enterprise_name, ser.status, ser.remark,
|
||||||
created_by, create_time, updated_by, update_time
|
ser.data_source, ser.is_employee, ser.is_emp_family, ser.is_customer,
|
||||||
FROM ccdi_staff_enterprise_relation
|
ser.is_cust_family, ser.created_by, ser.create_time, ser.updated_by,
|
||||||
|
ser.update_time
|
||||||
|
FROM ccdi_staff_enterprise_relation ser
|
||||||
|
LEFT JOIN ccdi_base_staff bs ON ser.person_id = bs.id_card
|
||||||
<where>
|
<where>
|
||||||
<if test="query.personId != null and query.personId != ''">
|
<if test="query.personId != null and query.personId != ''">
|
||||||
AND person_id LIKE CONCAT('%', #{query.personId}, '%')
|
AND ser.person_id LIKE CONCAT('%', #{query.personId}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="query.socialCreditCode != null and query.socialCreditCode != ''">
|
<if test="query.socialCreditCode != null and query.socialCreditCode != ''">
|
||||||
AND social_credit_code LIKE CONCAT('%', #{query.socialCreditCode}, '%')
|
AND ser.social_credit_code LIKE CONCAT('%', #{query.socialCreditCode}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="query.enterpriseName != null and query.enterpriseName != ''">
|
<if test="query.enterpriseName != null and query.enterpriseName != ''">
|
||||||
AND enterprise_name LIKE CONCAT('%', #{query.enterpriseName}, '%')
|
AND ser.enterprise_name LIKE CONCAT('%', #{query.enterpriseName}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="query.status != null">
|
<if test="query.status != null">
|
||||||
AND status = #{query.status}
|
AND ser.status = #{query.status}
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
ORDER BY create_time DESC
|
ORDER BY ser.create_time DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 查询员工实体关系详情 -->
|
<!-- 查询员工实体关系详情 -->
|
||||||
<select id="selectRelationById" resultMap="CcdiStaffEnterpriseRelationVOResult">
|
<select id="selectRelationById" resultMap="CcdiStaffEnterpriseRelationVOResult">
|
||||||
SELECT
|
SELECT
|
||||||
id, person_id, relation_person_post, social_credit_code, enterprise_name,
|
ser.id, ser.person_id, bs.name as person_name, ser.relation_person_post,
|
||||||
status, remark, data_source, is_employee, is_emp_family, is_customer, is_cust_family,
|
ser.social_credit_code, ser.enterprise_name, ser.status, ser.remark,
|
||||||
created_by, create_time, updated_by, update_time
|
ser.data_source, ser.is_employee, ser.is_emp_family, ser.is_customer,
|
||||||
FROM ccdi_staff_enterprise_relation
|
ser.is_cust_family, ser.created_by, ser.create_time, ser.updated_by,
|
||||||
WHERE id = #{id}
|
ser.update_time
|
||||||
|
FROM ccdi_staff_enterprise_relation ser
|
||||||
|
LEFT JOIN ccdi_base_staff bs ON ser.person_id = bs.id_card
|
||||||
|
WHERE ser.id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 判断身份证号和统一社会信用代码的组合是否已存在 -->
|
<!-- 判断身份证号和统一社会信用代码的组合是否已存在 -->
|
||||||
|
|||||||
Reference in New Issue
Block a user