diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index 2e90326a..1490fcfa 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -113,6 +113,20 @@ public class DocumentSplitController { return Result.OK("发布成功!"); } + /** + * 撤回 + * + * @param parameter + * @return + */ + @AutoLog(value = "文档拆分-撤回") + @ApiOperation(value="文档拆分-撤回", notes="文档拆分-撤回") + @PostMapping(value = "/revocation") + public Result revocation(@RequestBody Map parameter) { + documentSplitService.revocation(parameter); + return Result.OK("撤回成功!"); + } + /** * 通过id删除 * diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java index 214720c6..d8fa6b65 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java @@ -15,6 +15,9 @@ import org.jeecgframework.poi.excel.annotation.Excel; @EqualsAndHashCode(callSuper = true) @Data public class DocumentSplitInfo extends BaseEntity { + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; /**标准号*/ @Excel(name = "标准号", width = 15) @ApiModelProperty(value = "标准号") @@ -25,6 +28,11 @@ public class DocumentSplitInfo extends BaseEntity { @ApiModelProperty(value = "标准名称") private String title; + /**英文标题*/ + @Excel(name = "英文标题", width = 15) + @ApiModelProperty(value = "英文标题") + private String titleEn; + /**文件状态*/ @Excel(name = "文件状态", width = 15, dicCode = "file_type") @Dict(dicCode = "process_manuscript") @@ -67,6 +75,11 @@ public class DocumentSplitInfo extends BaseEntity { @ApiModelProperty(value = "标准关联id") private String standardId; + /**发布前id*/ + @Excel(name = "发布前id", width = 15) + @ApiModelProperty(value = "发布前id") + private String publishBeforeId; + @TableField(exist = false) private String cut; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java index 415301ad..6e5e74f4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java @@ -130,7 +130,7 @@ public interface DocumentSplitMapper { * 文档拆分根据id查询 * @param id */ - DocumentSplitInfo queryDocumentSplitInfoById(String id); + DocumentSplitInfo queryDocumentSplitInfoById(@Param("id") String id); /** * 文档拆分新增 @@ -143,7 +143,7 @@ public interface DocumentSplitMapper { * @param infoId * @return */ - List querySarFileSplitMenuByInfoId(String infoId); + List querySarFileSplitMenuByInfoId(@Param("infoId") String infoId); /** * 目录批量新增 @@ -157,14 +157,14 @@ public interface DocumentSplitMapper { * @param infoId * @return */ - List> queryLawsDocumentSplitByInfoId(String infoId); + List> queryLawsDocumentSplitByInfoId(@Param("infoId") String infoId); /** * 条目信息根据itemId查询 * @param itemId * @return */ - List querySarFileSplitItemsValByItemId(String itemId); + List querySarFileSplitItemsValByItemId(@Param("itemId") String itemId); /** * 条目信息批量新增 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 3c371206..971591c6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -24,23 +24,23 @@ - insert into sar_file_split_info(create_by, create_time, update_by, update_time, sys_org_code, serial_number, title, file_type, file_name, split_result, file_id, connect_id, title_en, author, split_status, standard_id, del_flag) - values (#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{sysOrgCode}, #{serialNumber}, #{title}, #{fileType}, #{fileName}, #{splitResult}, #{fileId}, #{connectId}, #{titleEn}, #{author}, #{splitStatus}, #{standardId}, #{delFlag}) + insert into sar_file_split_info(id, create_by, create_time, update_by, update_time, sys_org_code, serial_number, title, file_type, file_name, split_result, file_id, connect_id, title_en, author, split_status, standard_id, del_flag) + values (#{id}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{sysOrgCode}, #{serialNumber}, #{title}, #{fileType}, #{fileName}, #{splitResult}, #{fileId}, #{connectId}, #{titleEn}, #{author}, #{splitStatus}, #{standardId}, #{delFlag}) - insert into sar_file_split_menu(sys_org_code, info_id, name, parent_id, display_seq, valid_flag, remarks, item_name, creation_user, creation_time, modify_user, modify_time) + insert into sar_file_split_menu(id, sys_org_code, info_id, name, parent_id, display_seq, valid_flag, remarks, item_name, creation_user, creation_time, modify_user, modify_time) values - (#{entity.sysOrgCode}, #{entity.infoId}, #{entity.name}, #{entity.parentId}, #{entity.displaySeq}, #{entity.validFlag}, #{entity.remarks}, #{entity.itemName}, #{entity.creationUser}, #{entity.creationTime}, #{entity.modifyUser}, #{entity.modifyTime}) + (#{entity.id}, #{entity.sysOrgCode}, #{entity.infoId}, #{entity.name}, #{entity.parentId}, #{entity.displaySeq}, #{entity.validFlag}, #{entity.remarks}, #{entity.itemName}, #{entity.creationUser}, #{entity.creationTime}, #{entity.modifyUser}, #{entity.modifyTime}) - insert into sar_file_split_items_val(sys_org_code, item_id, type, item_content, display_seq, valid_flag, img_name, index_item, creation_time, modify_user, modify_time, creation_user) + insert into sar_file_split_items_val(id, sys_org_code, item_id, type, item_content, display_seq, valid_flag, img_name, index_item, creation_time, modify_user, modify_time, creation_user) values - (#{entity.sysOrgCode}, #{entity.itemId}, #{entity.type}, #{entity.itemContent}, #{entity.displaySeq}, #{entity.validFlag}, #{entity.imgName}, #{entity.indexItem}, #{entity.creationTime}, #{entity.modifyUser}, #{entity.modifyTime}, #{entity.creationUser}) + (#{entity.id}, #{entity.sysOrgCode}, #{entity.itemId}, #{entity.type}, #{entity.itemContent}, #{entity.displaySeq}, #{entity.validFlag}, #{entity.imgName}, #{entity.indexItem}, #{entity.creationTime}, #{entity.modifyUser}, #{entity.modifyTime}, #{entity.creationUser}) @@ -109,6 +109,7 @@ i.create_by, i.standard_id, i.del_flag, + publish_before_id, file_id, u.username as username from sar_file_split_info i @@ -177,7 +178,7 @@