diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 6e62860e..8984185c 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -335,4 +335,8 @@ UPDATE `sys_dict_item` SET `item_text` = '市场法规清单发布流程' WHERE -- 2024-09-11 修改外部标准实施日期为多选日期 UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706'; ALTER TABLE `laws_domestic_standard` - MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期'; \ No newline at end of file + MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期'; + +-- 2024-09-11 外来标准 +ALTER TABLE `laws_domestic_standard` + MODIFY COLUMN `applicable_market` longtext NULL DEFAULT NULL COMMENT '适用市场'; 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 d0c82e63..0c345c31 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 @@ -232,4 +232,12 @@ public interface DocumentSplitMapper extends BaseMapper { List selectClauseList(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit); List selectClauseListScc(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit); + + + /** + * 根据适用市场获取条款id + * @param countryList + * @return + */ + List getSplitSelectIds(List countryList); } 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 3dbcb421..285b2043 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 @@ -316,4 +316,14 @@ SET ${updateSet} WHERE ${updateCondition} + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index f5ebdb3f..73b18b02 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -82,6 +82,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.web.util.HtmlUtils; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; @@ -194,6 +195,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { private static final String MENU_ID = "menu_id"; private static final String CREATE_TIME = "create_time"; private static final String SPLIT_STATUS = "split_status"; + private static final String COUNTRY = "country"; private static final int NUMBER = 500; @@ -1858,6 +1860,17 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { parameter.remove(MENU_ID); } } + // 适用市场 + if (parameter.containsKey(COUNTRY) && !StringUtils.isBlank(parameter.get(COUNTRY).toString())){ + // 查询市场下的标准 + List countryList = Arrays.asList(parameter.get(COUNTRY).toString().split(",")); + List ids = documentSplitMapper.getSplitSelectIds(countryList); + if(!CollectionUtils.isEmpty(ids)){ + // in查询 + selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')"); + } + parameter.remove(COUNTRY); + } } /**