diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/entity/LawsDocumentSplit.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/entity/LawsDocumentSplit.java index 3e7ff00..b27d9a3 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/entity/LawsDocumentSplit.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/entity/LawsDocumentSplit.java @@ -1,11 +1,16 @@ package com.jero.modules.documenttool.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.*; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** * @Author: yjz @@ -18,6 +23,12 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) @ApiModel(value="laws_document_split对象", description="文档拆分") public class LawsDocumentSplit extends BaseEntity { + /** + * 主键id + */ + @ApiModelProperty("主键id") + private String id; + /** * 条文号 */ @@ -36,6 +47,12 @@ public class LawsDocumentSplit extends BaseEntity { @ApiModelProperty("条文内容") private String itemContent; + /** + * 条文解读 + */ + @ApiModelProperty("条文解读") + private String interpretationArticles; + /** * 展示顺序 */ @@ -48,93 +65,37 @@ public class LawsDocumentSplit extends BaseEntity { @ApiModelProperty("拆分目录id") private String menuId; - /** - * 技术领域 - */ - @ApiModelProperty("技术领域") - private String technicalField; - - /** - * 信息类别 - */ - @ApiModelProperty("信息类别") - private String infoType; - - /** - * 法规要求类型 - */ - @ApiModelProperty("法规要求类型") - private String lawsRequireType; - - /** - * 功能分类 - */ - @ApiModelProperty("功能分类") - private String functionClassification; - - /** - * 功能专业 - */ - @ApiModelProperty("功能专业") - private String functionProfessional; - - /** - * 功能分组编码 - */ - @ApiModelProperty("功能分组编码") - private String functionGroupCode; - - /** - * 功能分组名称 - */ - @ApiModelProperty("功能分组名称") - private String functionGroupName; - - /** - * 新认证实施时间 - */ - @ApiModelProperty("新认证实施时间") - private String newCerImplementDate; - - /** - * 已认证实施时间 - */ - @ApiModelProperty("已认证实施时间") - private String cerImplementDate; - - /** - * 新注册实施时间 - */ - @ApiModelProperty("新注册实施时间") - private String newRegisterImplementDate; - - /** - * 适用车型 - */ - @ApiModelProperty("适用车型") - private String applications; - - /** - * 动力类型 - */ - @ApiModelProperty("动力类型") - private String dynamicType; - - /** - * 适用零部件 - */ - @ApiModelProperty("适用零部件") - private String applicableComponents; - - /** - * 条文解读 - */ - @ApiModelProperty("条文解读") - private String interpretationArticles; - /** * 拆分信息记录id */ @ApiModelProperty("拆分信息记录id") private String infoId; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**拆分时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "拆分时间") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /** + * 逻辑删除标识 0未删 1已删 + */ + @TableLogic +// @TableField(value = "del_flag") + @ApiModelProperty(value = "逻辑删除标识 0未删 1已删") + private Integer delFlag; } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/DocumentSplitMapper.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/DocumentSplitMapper.java index b522e17..527c668 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/DocumentSplitMapper.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/DocumentSplitMapper.java @@ -37,11 +37,10 @@ public interface DocumentSplitMapper { /** * 文档拆分详情-分页列表查询 * @param mapPage - * @param selectColumn - * @param selectCondition + * @param params * @return */ - IPage> queryDocumentSplitDetail(Page> mapPage, @Param("selectColumn") String selectColumn, @Param("selectCondition") String selectCondition); + IPage> queryDocumentSplitDetail(Page> mapPage, @Param("params") Map params); /** * 文档拆分详情-列表查询 diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/xml/DocumentSplitMapper.xml b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/xml/DocumentSplitMapper.xml index bc8bda4..e7af0ed 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -2,6 +2,40 @@ + + + id, + item_num, + item_title, + item_content, + interpretation_articles, + sort_number, + menu_id, + info_id, + create_by, + create_time, + update_by, + update_time, + del_flag + + + + + lds.id, + lds.item_num, + lds.item_title, + lds.item_content, + lds.interpretation_articles, + lds.sort_number, + lds.menu_id, + lds.info_id, + lds.create_by, + lds.create_time, + lds.update_by, + lds.update_time, + lds.del_flag + + insert into SAR_FILE_SPLIT_ITEMS_VAL (id, type, item_id, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq, img_name, item_content, index_item) @@ -132,12 +166,71 @@ + + + where lds.del_flag = 0 + + + and lds.info_id = #{params.info_id} + + + and lds.menu_id = #{params.menu_id} + + + + +