Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bb427b3669
|
|
@ -52,6 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
select dkfmc.id,dkfmc.classify_name,dkfmc.dimension,dkfmc.classify_desc,dkfmc.update_time,
|
||||
dkfmc.update_user_id,dkfmc.update_user_name
|
||||
from da_ky_files_multi_classify dkfmc
|
||||
where dkfmc.del_flag='1' = #{classifyName}
|
||||
where dkfmc.del_flag='1' and dkfmc.classify_name = #{classifyName}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<mapper namespace="com.bonus.system.mapper.KyDataClassifyMapper">
|
||||
<insert id="addKyDataClassify">
|
||||
insert into da_ky_data_classify
|
||||
(data_type_name,remark,create_time,update_time,create_user_id,create_user_name,update_user_id,update_user_name)
|
||||
values (#{dataTypeName},#{remark},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName})
|
||||
(data_type_name,remark,create_time,update_time,create_user_id,create_user_name,update_user_id,update_user_name,pid)
|
||||
values (#{dataTypeName},#{remark},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName},#{pid})
|
||||
</insert>
|
||||
<update id="updateKyDataClassify">
|
||||
update da_ky_data_classify
|
||||
|
|
@ -26,6 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="remark!=null">
|
||||
remark =#{remark},
|
||||
</if>
|
||||
<if test="pid!=null">
|
||||
pid =#{pid},
|
||||
</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
|
@ -36,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="selectKyDataClassifyList" resultType="com.bonus.system.domain.KyDataClassify">
|
||||
select dkdc.id as id ,dkdc.data_type_name as dataTypeName,dkdc.remark as remark,
|
||||
dkdc.update_time as updateTime, dkdc.update_user_id as createUserId,
|
||||
dkdc.update_user_name as updateUserName,dksdd.dict_label as pName,dksdd.dict_code as pid
|
||||
dkdc.update_user_name as updateUserName,dksdd.dict_label as pName,dksdd.dict_value as pid
|
||||
from da_ky_data_classify dkdc
|
||||
left join da_ky_sys_dict_data dksdd on dkdc.pid =dksdd.dict_value
|
||||
where del_flag='1'
|
||||
|
|
@ -57,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
from da_ky_data_classify where del_flag='1' and data_type_name = #{dataTypeName}
|
||||
</select>
|
||||
<select id="getParenList" resultType="com.bonus.system.domain.vo.KyDataClassifyVo">
|
||||
select dict_code as id,dict_label as name
|
||||
select dict_value as code,dict_label as name
|
||||
from da_ky_sys_dict_data where dict_type = 'data_class_type' and status='0'
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue