odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upd: 编码规范

Browse Source
This commit is contained in:
odboy
2025-03-24 20:22:27 +08:00
parent ca2bed6aaf
commit 501222efa8
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class Dict extends MyEntity {
@NotNull(groups = Update.class)
@ApiModelProperty(value = "ID", hidden = true)
@TableId(value = "dict_id", type = IdType.AUTO)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotBlank
cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class DictDetail extends MyEntity {
@NotNull(groups = Update.class)
@ApiModelProperty(value = "ID", hidden = true)
@TableId(value = "detail_id", type = IdType.AUTO)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@TableField(value = "dict_id")
cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml
+6 -9
View File
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="cn.odboy.modules.system.mapper.DictDetailMapper">
<resultMap id="BaseResultMap" type="cn.odboy.model.system.domain.DictDetail">
<id column="detail_id" property="id" jdbcType="BIGINT"/>
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="label" property="label" jdbcType="VARCHAR"/>
<result column="value" property="value" jdbcType="VARCHAR"/>
<result column="dict_sort" property="dictSort" jdbcType="INTEGER"/>
@@ -12,24 +12,21 @@
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<!-- 一对一关联 -->
<association property="dict" javaType="cn.odboy.model.system.domain.Dict">
<id column="dict_id" property="id" jdbcType="BIGINT"/>
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
</association>
</resultMap>
<sql id="Base_Column_List">
dd
.
detail_id
, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
d.dict_id, d.name
dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
d.id as dict_id, d.name
</sql>
<select id="findAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from sys_dict_detail dd, sys_dict d
where dd.dict_id = d.dict_id
where dd.dict_id = d.id
<if test="criteria.dictName != null and criteria.dictName != ''">
and d.name = #{criteria.dictName}
</if>
@@ -43,7 +40,7 @@
select
<include refid="Base_Column_List"/>
from sys_dict_detail dd, sys_dict d
where dd.dict_id = d.dict_id
where dd.dict_id = d.id
<if test="name != null and name != ''">
and d.name = #{name}
</if>
cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml
+1 -1
View File
@@ -13,6 +13,6 @@
)
</if>
</where>
order by d.dict_id desc
order by d.id desc
</select>
</mapper>