Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

huangh

2024-10-29 c1a463b9f1c0a7160dbd0ac1c7490eef13861a5e

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml

@@ -5,7 +5,7 @@
 * @description: 自定义sql，请自行实现业务逻辑
 * @company: hugeinfo
 * @author: liyj
 * @time:2024-08-19 20:04:19
 * @time:2024-10-17 16:41:35
 * @version 1.0.0
-->
<mapper namespace="cn.huge.module.ctuser.dao.mapper.CtUnitMapper">
@@ -51,7 +51,8 @@
            <result property="workTimeWeek" column="work_time_week"/>
            <result property="workTimeAm" column="work_time_am"/>
            <result property="workTimePm" column="work_time_pm"/>

            <result property="unitFun" column="unit_fun"/>
            <result property="courtStatus" column="court_status"/>
    </resultMap>
    <!-- 表 -->
    <sql id='table-name'>dyh_ct_unit</sql>
@@ -96,7 +97,9 @@
        telephone,
        work_time_week,
        work_time_am,
        work_time_pm
        work_time_pm,
        unit_fun,
        court_status
    </sql>
    <!-- 更新实体字段 -->
    <sql id="set-part">
@@ -139,16 +142,13 @@
            <if test="entity.workTimeWeek != null">work_time_week = #{entity.workTimeWeek},</if>
            <if test="entity.workTimeAm != null">work_time_am = #{entity.workTimeAm},</if>
            <if test="entity.workTimePm != null">work_time_pm = #{entity.workTimePm},</if>


            <if test="entity.unitFun != null">unit_fun = #{entity.unitFun},</if>
            <if test="entity.courtStatus != null">court_status = #{entity.courtStatus}</if>
    </sql>
    <!-- 条件 -->
    <sql id="where-part">
        <if test="terms != null">
            <where>
                <if test="terms.keyword != null and terms.keyword !=''">
                    and unit_name like CONCAT('%', #{terms.keyword}, '%')
                </if>
                <if test="terms.id != null and terms.id !=''">
                    and id = #{terms.id}
                </if>
@@ -166,12 +166,6 @@
                </if>
                <if test="terms.unitType != null and terms.unitType !=''">
                    and unit_type = #{terms.unitType}
                </if>
                <if test="terms.unitTypes != null and terms.unitTypes.size > 0 ">
                    and unit_type in
                    <foreach item="unitType" collection="terms.unitTypes" separator="," open="(" close=")" index="">
                        #{unitType}
                    </foreach>
                </if>
                <if test="terms.unitCode != null and terms.unitCode !=''">
                    and unit_code = #{terms.unitCode}
@@ -270,6 +264,27 @@
                <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
                    and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
                        and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
                </if>
                <if test="terms.postalCode != null and terms.postalCode !=''">
                    and postal_code = #{terms.postalCode}
                </if>
                <if test="terms.telephone != null and terms.telephone !=''">
                    and telephone = #{terms.telephone}
                </if>
                <if test="terms.workTimeWeek != null and terms.workTimeWeek !=''">
                    and work_time_week = #{terms.workTimeWeek}
                </if>
                <if test="terms.workTimeAm != null and terms.workTimeAm !=''">
                    and work_time_am = #{terms.workTimeAm}
                </if>
                <if test="terms.workTimePm != null and terms.workTimePm !=''">
                    and work_time_pm = #{terms.workTimePm}
                </if>
                <if test="terms.unitFun != null and terms.unitFun !=''">
                    and unit_fun = #{terms.unitFun}
                </if>
                <if test="terms.courtStatus != null and terms.courtStatus !=''">
                    and court_status = #{terms.courtStatus}
                </if>
            </where>
        </if>
@@ -384,4 +399,12 @@
        FROM
        unit_hierarchy;
    </select>
</mapper> 

    <!--  根据条件分页查询  -->
    <select id="selectUnitByGridId" resultMap="dataResult">
        SELECT
            t1.*
        FROM dyh_ct_unit t1 left join dyh_ct_unit_grid t2 on t1.id = t2.dyh_unit_id
        where t2.third_unit_id = #{gridUnitId} limit 1
    </select>
</mapper>