问题处理

hx-oa/src/main/java/com/fjhx/oa/entity/education/dto/EducationSubsidySelectDto.java

@@ -14,4 +14,6 @@ import lombok.Setter;
 @Setter
 public class EducationSubsidySelectDto extends BaseSelectDto {
 
+    private Integer status;
+
 }

hx-oa/src/main/java/com/fjhx/oa/entity/medical/dto/MedicalInsuranceSelectDto.java

@@ -14,4 +14,6 @@ import lombok.Setter;
 @Setter
 public class MedicalInsuranceSelectDto extends BaseSelectDto {
 
+    private Integer status;
+
 }

hx-oa/src/main/java/com/fjhx/oa/service/education/impl/EducationSubsidyServiceImpl.java

@@ -51,6 +51,7 @@ public class EducationSubsidyServiceImpl extends ServiceImpl<EducationSubsidyMap
         IWrapper<EducationSubsidy> wrapper = getWrapper();
 
         wrapper.keyword(dto.getKeyword(), new SqlField("es", EducationSubsidy::getCode));
+        wrapper.eq("es", EducationSubsidy::getStatus, dto.getStatus());
 
         wrapper.orderByDesc("es", EducationSubsidy::getId);
         Page<EducationSubsidyVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-oa/src/main/java/com/fjhx/oa/service/medical/impl/MedicalInsuranceServiceImpl.java

@@ -47,6 +47,7 @@ public class MedicalInsuranceServiceImpl extends ServiceImpl<MedicalInsuranceMap
         IWrapper<MedicalInsurance> wrapper = getWrapper();
 
         wrapper.keyword(dto.getKeyword(), new SqlField("mi", MedicalInsurance::getCode));
+        wrapper.eq("mi", MedicalInsurance::getStatus, dto.getStatus());
 
         wrapper.orderByDesc("mi", MedicalInsurance::getId);
         Page<MedicalInsuranceVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);