Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/resources/mapper/SysDictTypeMapper.xml

@@ -7,9 +7,33 @@
                    <id column="id" property="id" />
                    <result column="name" property="name" />
                    <result column="desc" property="desc" />
                    <result column="system" property="system" />
                    <result column="create_time" property="createTime" />
                    <result column="update_time" property="updateTime" />
                    <result column="is_delete" property="isDelete" />
        </resultMap>
    <select id="selectCodeList" resultType="com.moral.api.entity.SysDictData">
        select t1.id,t1.dict_type_id,t1.dataKey,t1.dataValue from sys_dict_type t
                             left join sys_dict_data t1 on t1.dict_type_id = t.id
        where t.is_delete = 0 and t.name = #{code} and t1.dataKey = #{id} and t1.is_delete = 0
        order by t1.create_time desc
    </select>

    <select id="selectIdList" resultType="com.moral.api.entity.SysDictData">
        select DISTINCT t1.id,t1.dict_type_id,t1.dataKey,t1.dataValue from sys_dict_type t
        left join sys_dict_data t1 on t1.dict_type_id = t.id
        where t.is_delete = 0 and t.name = #{code} and
        t1.dataKey in
        <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
         and t1.is_delete = 0
        order by t1.create_time desc
    </select>

    <select id="selectFind" resultType="com.moral.api.entity.SysDictType">
        select * from sys_dict_type
        where sys_dict_type.name= #{name} AND  is_delete = 0
    </select>

</mapper>