fix(88325): 更换导入模板

This commit is contained in:
yjz
2024-08-09 10:58:38 +08:00
parent 7baba64b03
commit 60b565daa2
5 changed files with 27 additions and 6 deletions
@@ -6,9 +6,23 @@
SELECT *
FROM laws_tag tag
LEFT JOIN laws_area area ON tag.show_area = area.id
WHERE tag.table_name = #{tableName}
<choose>
<when test="tableName == 'laws_document_split_import'">
WHERE tag.table_name = 'laws_document_split'
</when>
<otherwise>
WHERE tag.table_name = #{tableName}
</otherwise>
</choose>
AND tag.del_flag = 0
ORDER BY area.sort ASC, tag.order_num ASC, tag.create_time ASC
<choose>
<when test="tableName == 'laws_document_split_import'">
ORDER BY import_sort
</when>
<otherwise>
ORDER BY area.sort ASC, tag.order_num ASC, tag.create_time ASC
</otherwise>
</choose>
</select>
<select id="getCommonPage" resultType="java.util.Map">
@@ -1372,7 +1372,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
//此处需要做各种验证,数据库操作
try {
// 查询全部字段列表
List<LawsTag> fieldLists = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
List<LawsTag> fieldLists = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName());
// 列表展示字段
List<LawsTag> fieldListSelect = fieldLists.stream().filter(v -> YesOrNoEnum.YES.getValue()
.equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList());
@@ -3688,7 +3688,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
private List<Map<String, Object>> getImportOnlField(String flag, String cut) {
// List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
// 查询全部字段列表
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName());
// 列表展示字段
fieldList = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
.equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList());
@@ -4392,7 +4392,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// 查询全部字段列表
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName());
// 列表展示字段
List<String> fieldListSelect = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
.equals(String.valueOf(v.getIsShowList()))).map(LawsTag::getDbFieldName).collect(Collectors.toList());
@@ -459,4 +459,10 @@ public class LawsTag implements Serializable {
@ApiModelProperty(value = "使用范围(1:国标 3:企标)")
@Dict(dicCode = "clause_usable_range")
private String usableRange;
/**
* 导入顺序
*/
@ApiModelProperty(value = "导入顺序")
private Integer importSort;
}
@@ -13,7 +13,8 @@ public enum TableNameEnum {
DOMESTIC_REGULATIONS("外部标准","laws_domestic_standard","1"),
ENTERPRISE_STANDARDS("企业标准","laws_enterprise_standard","3"),
DOCUMENT_SPLIT("条款拆分","laws_document_split","4"),
HOME_SEARCH("高级搜索(全部)","home_search","5")
HOME_SEARCH("高级搜索(全部)","home_search","5"),
DOCUMENT_SPLIT_IMPORT("条款拆分_导入用","laws_document_split_import",""),
;
String name;