feat: 法规合规评估库导出支持选中指定数据导出
This commit is contained in:
+4
@@ -84,6 +84,10 @@ public class LawsConformityAssessmentLibrary implements Serializable {
|
|||||||
@Dict(dicCode = "market_state")
|
@Dict(dicCode = "market_state")
|
||||||
private String applicableMarket;
|
private String applicableMarket;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
@ApiModelProperty(value = "多选用字段,逗号拼接")
|
||||||
|
private String ids;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
}
|
}
|
||||||
+3
@@ -78,6 +78,9 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
|
|||||||
if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())) {
|
if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())) {
|
||||||
queryWrapper.in("d.applicable_market", Arrays.asList(lawsConformityAssessmentLibrary.getApplicableMarket().split(",")));
|
queryWrapper.in("d.applicable_market", Arrays.asList(lawsConformityAssessmentLibrary.getApplicableMarket().split(",")));
|
||||||
}
|
}
|
||||||
|
if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getIds())) {
|
||||||
|
queryWrapper.in("cs.id", Arrays.asList(lawsConformityAssessmentLibrary.getIds().split(",")));
|
||||||
|
}
|
||||||
queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null,
|
queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null,
|
||||||
"valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime());
|
"valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime());
|
||||||
queryWrapper.orderByDesc("cs.create_time");
|
queryWrapper.orderByDesc("cs.create_time");
|
||||||
|
|||||||
Reference in New Issue
Block a user