条款检索添加适用市场
This commit is contained in:
+5
-1
@@ -335,4 +335,8 @@ UPDATE `sys_dict_item` SET `item_text` = '市场法规清单发布流程' WHERE
|
|||||||
-- 2024-09-11 修改外部标准实施日期为多选日期
|
-- 2024-09-11 修改外部标准实施日期为多选日期
|
||||||
UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706';
|
UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706';
|
||||||
ALTER TABLE `laws_domestic_standard`
|
ALTER TABLE `laws_domestic_standard`
|
||||||
MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期';
|
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 '适用市场';
|
||||||
|
|||||||
+8
@@ -232,4 +232,12 @@ public interface DocumentSplitMapper extends BaseMapper<LawsDocumentSplit> {
|
|||||||
List<ProcessStandardInterpretClause> selectClauseList(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit);
|
List<ProcessStandardInterpretClause> selectClauseList(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit);
|
||||||
|
|
||||||
List<ProcessStandardComplianceCheckDetail> selectClauseListScc(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit);
|
List<ProcessStandardComplianceCheckDetail> selectClauseListScc(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据适用市场获取条款id
|
||||||
|
* @param countryList
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<String> getSplitSelectIds(List<String> countryList);
|
||||||
}
|
}
|
||||||
|
|||||||
+10
@@ -316,4 +316,14 @@
|
|||||||
SET ${updateSet}
|
SET ${updateSet}
|
||||||
WHERE ${updateCondition}
|
WHERE ${updateCondition}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
<select id="getSplitSelectIds" resultType="java.lang.String">
|
||||||
|
select l2.id from laws_domestic_standard l1
|
||||||
|
left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0
|
||||||
|
where l1.del_flag = 0 and l2.id is not null
|
||||||
|
and
|
||||||
|
<foreach collection="countryList" separator="or" item= "item" open="(" close=")">
|
||||||
|
CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%')
|
||||||
|
</foreach>
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
+13
@@ -82,6 +82,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
import org.springframework.transaction.support.DefaultTransactionDefinition;
|
import org.springframework.transaction.support.DefaultTransactionDefinition;
|
||||||
import org.springframework.web.util.HtmlUtils;
|
import org.springframework.web.util.HtmlUtils;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.File;
|
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 MENU_ID = "menu_id";
|
||||||
private static final String CREATE_TIME = "create_time";
|
private static final String CREATE_TIME = "create_time";
|
||||||
private static final String SPLIT_STATUS = "split_status";
|
private static final String SPLIT_STATUS = "split_status";
|
||||||
|
private static final String COUNTRY = "country";
|
||||||
|
|
||||||
private static final int NUMBER = 500;
|
private static final int NUMBER = 500;
|
||||||
|
|
||||||
@@ -1858,6 +1860,17 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
parameter.remove(MENU_ID);
|
parameter.remove(MENU_ID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 适用市场
|
||||||
|
if (parameter.containsKey(COUNTRY) && !StringUtils.isBlank(parameter.get(COUNTRY).toString())){
|
||||||
|
// 查询市场下的标准
|
||||||
|
List<String> countryList = Arrays.asList(parameter.get(COUNTRY).toString().split(","));
|
||||||
|
List<String> ids = documentSplitMapper.getSplitSelectIds(countryList);
|
||||||
|
if(!CollectionUtils.isEmpty(ids)){
|
||||||
|
// in查询
|
||||||
|
selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
|
||||||
|
}
|
||||||
|
parameter.remove(COUNTRY);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user