diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java index e324d19..5897fe9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java @@ -184,9 +184,6 @@ public class BPlanEnterprise extends BaseEntity { - - - /** * 0:未检查 1:已检查 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java index 8855bca..f77c08c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java @@ -1,5 +1,6 @@ package com.ruoyi.programManagement.entity.request; +import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import io.swagger.models.auth.In; import lombok.Data; @@ -29,7 +30,19 @@ public class checkResultRequest { @ApiModelProperty(value = "行政区划") private String district; + /** + * 企业名称 + */ + @Excel(name = "企业名称") + @ApiModelProperty(value = "企业名称") + private String enterpriseName; + + /** + * 0:未检查 1:已检查 + */ + @ApiModelProperty(value = "0:未检查 1:已检查") + private Integer checkStatus; } diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml index c765051..72cedc6 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml @@ -76,6 +76,12 @@ and s.enterprise_name like concat('%', #{enterpriseName}, '%') + + and s.district like concat('%',#{district}, '%') + + + and s.district like concat('%',#{district}, '%') + and s.district in diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index e516945..790463f 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml @@ -76,6 +76,12 @@ and a.update_id = #{updateId} and a.user_id = #{userId} and a.dept_id = #{deptId} + + and a.district like concat('%',#{district}, '%') + + + and a.district like concat('%',#{district}, '%') + and a.district in @@ -108,7 +114,7 @@