diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java index c4a9dc8d..68b67dbc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java @@ -130,6 +130,9 @@ public class ESQueryCommonDTO { @ApiModelProperty(value = "复审计划-主起草单位") private String mainDraftingUnit; + @ApiModelProperty(value = "复审计划-复审结果") + private String recheckResult; + public void transIdsToList() { if (StrUtil.isBlank(this.selections)) { return; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml index ba24098b..4ee5321a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml @@ -71,9 +71,13 @@ AND s.main_drafting_unit = #{param.mainDraftingUnit} + + + AND p.recheck_result IN #{param.recheckResult} + GROUP BY s.standard_number, p.create_time ORDER BY p.create_time DESC - +