fix(文档拆分): 标准标识

This commit is contained in:
yjz
2023-10-23 15:39:08 +08:00
parent bcfe64047a
commit 37d9730b8a
3 changed files with 20 additions and 3 deletions
@@ -3,6 +3,8 @@ package com.jero.modules.laws.documenttool.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.documenttool.common.DocumentSplitCommon; import com.jero.modules.laws.documenttool.common.DocumentSplitCommon;
import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo;
import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView;
@@ -82,7 +84,7 @@ public class DocumentSplitController {
@PostMapping(value = "/updatePermissions") @PostMapping(value = "/updatePermissions")
public Result<T> updatePermissions(@Validated @RequestBody DocumentSplitInfo documentSplitInfo) { public Result<T> updatePermissions(@Validated @RequestBody DocumentSplitInfo documentSplitInfo) {
documentSplitService.updatePermissions(documentSplitInfo); documentSplitService.updatePermissions(documentSplitInfo);
return Result.OK("操作成功!"); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
/** /**
@@ -92,4 +92,10 @@ public class DocumentSplitInfo extends BaseEntity {
@ApiModelProperty(value = "标准编号/标准名称 搜索用") @ApiModelProperty(value = "标准编号/标准名称 搜索用")
@TableField(exist = false) @TableField(exist = false)
private String serialNumberOrName; private String serialNumberOrName;
/**标准标识(1:国内,3:企业)*/
@ApiModelProperty(value = "标准标识(1:国内,3:企业)")
@TableField(exist = false)
@Dict(dicCode = "split_standard_source")
private String splitStandardSource;
} }
@@ -97,9 +97,18 @@
<select id="queryByPage" resultType="com.jero.modules.laws.documenttool.entity.DocumentSplitInfo"> <select id="queryByPage" resultType="com.jero.modules.laws.documenttool.entity.DocumentSplitInfo">
select * select *
from (select i.id as id, from (select i.id as id,
serial_number, serial_number,
(IF(length(s.standard_name) > 0, s.standard_name, d.standard_name)) title, (CASE
WHEN length(s.standard_name) > 0 THEN s.standard_name
WHEN length(d.standard_name) > 0 THEN d.standard_name
ELSE title
END) title,
(CASE
WHEN length(s.id) > 0 THEN 1
WHEN length(d.id) > 0 THEN 3
ELSE ''
END) splitStandardSource,
file_type, file_type,
file_name, file_name,
split_status, split_status,