qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 普通纪念币，功能完善修复。

Browse Source
This commit is contained in:
tianyongbao
2026-02-22 16:53:13 +08:00
parent e7609723e2
commit 8be3f3b155
3 changed files with 87 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
intc-modules/intc-collect/src/main/java/com/intc/collect/domain/CommemorativeCoin.java
View File

@@ -67,6 +67,34 @@ public class CommemorativeCoin extends BaseEntity
@Excel(name = "系列")
private String series;
/** 系列 */
@NotNull(message="发行量")
@Excel(name = "发行量")
private String mintage;
/** 材质 */
private String composition;
/** 重量 */
@ApiModelProperty(value="重量")
@Excel(name = "重量")
private String weight;
/** 规格尺寸 */
@ApiModelProperty(value="规格尺寸")
@Excel(name = "规格尺寸")
private String dimension;
/** 厚度 */
@ApiModelProperty(value="厚度")
@Excel(name = "厚度")
private String thickness;
/** 币齿 */
@ApiModelProperty(value="币齿")
@Excel(name = "币齿")
private String coinTeeth;
/** 套装编号 */
private String setNumber;
@@ -103,6 +131,12 @@ public class CommemorativeCoin extends BaseEntity
.append("delFlag", getDelFlag())
.append("remark", getRemark())
.append("collectFileList", getCollectFileList())
.append("mintage", getMintage())
.append("composition", getComposition())
.append("weight", getWeight())
.append("dimension", getDimension())
.append("thickness", getThickness())
.append("coinTeeth", getCoinTeeth())
.toString();
}
}

12
intc-modules/intc-collect/src/main/java/com/intc/collect/domain/dto/CommemorativeCoinDto.java
View File

@@ -28,7 +28,7 @@ public class CommemorativeCoinDto implements Serializable
/** 简称 */
@ApiModelProperty(value="简称")
private String shortName;
private String name;
/** 发行时间 */
@ApiModelProperty(value="发行时间")
@@ -51,4 +51,14 @@ public class CommemorativeCoinDto implements Serializable
@ApiModelProperty(value="形状")
private String shape;
/** 开始时间 */
@ApiModelProperty(value="开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** 结束时间 */
@ApiModelProperty(value="结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
}

53
intc-modules/intc-collect/src/main/resources/mapper/collect/CommemorativeCoinMapper.xml
View File

@@ -22,6 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
<result property="remark" column="remark" />
<result property="mintage" column="mintage" />
<result property="composition" column="composition" />
<result property="weight" column="weight" />
<result property="dimension" column="dimension" />
<result property="thickness" column="thickness" />
<result property="coinTeeth" column="coin_teeth" />
</resultMap>
<resultMap id="CommemorativeCoinCollectFileResult" type="CommemorativeCoinVo" extends="CommemorativeCoinResult">
@@ -29,20 +35,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<resultMap type="CollectFileVo" id="CollectFileResult">
<result property="id" column="id" />
<result property="collectId" column="collect_id" />
<result property="catelog" column="catelog" />
<result property="fileName" column="file_name" />
<result property="name" column="name" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="url" column="url" />
<result property="id" column="sub_id" />
<result property="collectId" column="sub_collect_id" />
<result property="catelog" column="sub_catelog" />
<result property="fileName" column="sub_file_name" />
<result property="name" column="sub_name" />
<result property="createTime" column="sub_create_time" />
<result property="createBy" column="sub_create_by" />
<result property="url" column="sub_url" />
</resultMap>
<sql id="selectCommemorativeCoinVo">
select a.id, a.type, a.full_name, a.short_name, a.face_value, a.issue_date,
select a.id, a.type, a.full_name, a.short_name, a.face_value, a.issue_date,a.mintage,a.composition,
a.issue_year, a.series, a.set_number, a.block_type, a.shape, a.create_by,
a.create_time, a.update_by, a.update_time, a.del_flag, a.remark,
a.weight, a.dimension, a.thickness, a.coin_teeth,
b.id as sub_id, b.collect_id as sub_collect_id, b.catelog as sub_catelog, b.file_name as sub_file_name,
b.name as sub_name, b.create_by as sub_create_by, b.create_time as sub_create_time, b.url as sub_url
from col_commemorative_coin a
@@ -56,12 +63,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.del_flag='0'
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="fullName != null and fullName != ''"> and a.full_name like '%'|| #{fullName}||'%'</if>
<if test="shortName != null and shortName != ''"> and a.short_name like '%'|| #{shortName}||'%'</if>
<if test="name != null and name != ''"> and (a.short_name like '%'|| #{name}||'%' or a.full_name like '%'|| #{name}||'%') </if>
<if test="issueDate != null "> and a.issue_date = #{issueDate}</if>
<if test="issueYear != null and issueYear != ''"> and a.issue_year = #{issueYear}</if>
<if test="issueYear != null and issueYear != ''"> and a.issue_year like '%'|| #{issueYear}||'%'</if>
<if test="series != null and series != ''"> and a.series = #{series}</if>
<if test="blockType != null and blockType != ''"> and a.block_type = #{blockType}</if>
<if test="shape != null and shape != ''"> and a.shape = #{shape}</if>
<if test="endTime!=null and endTime !=''">
and #{endTime}>=to_char(a.issue_date, 'yyyy-MM-dd')
</if>
<if test="startTime!=null and startTime !=''">
and to_char(a.issue_date, 'yyyy-MM-dd')>=#{startTime}
</if>
</where>
order by a.issue_date desc
</select>
@@ -91,6 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="delFlag != null">del_flag,</if>
<if test="remark != null">remark,</if>
<if test="mintage != null">mintage,</if>
<if test="composition != null">composition,</if>
<if test="weight != null">weight,</if>
<if test="dimension != null">dimension,</if>
<if test="thickness != null">thickness,</if>
<if test="coinTeeth != null">coin_teeth,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -110,6 +129,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="remark != null">#{remark},</if>
<if test="mintage != null">#{mintage},</if>
<if test="composition != null">#{composition},</if>
<if test="weight != null">#{weight},</if>
<if test="dimension != null">#{dimension},</if>
<if test="thickness != null">#{thickness},</if>
<if test="coinTeeth != null">#{coinTeeth},</if>
</trim>
</insert>
@@ -132,6 +157,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="mintage != null">mintage = #{mintage},</if>
<if test="composition != null">composition = #{composition},</if>
<if test="weight != null">weight = #{weight},</if>
<if test="dimension != null">dimension = #{dimension},</if>
<if test="thickness != null">thickness = #{thickness},</if>
<if test="coinTeeth != null">coin_teeth = #{coinTeeth},</if>
</trim>
where id = #{id}
</update>