diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java index c53e34e..b97a004 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterpriseRequest.java @@ -190,7 +190,7 @@ public class BPlanEnterpriseRequest { * 检查id */ @ApiModelProperty(value = "检查id") - private Integer checkId; + private String checkId; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java index 5747f18..676484a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java @@ -195,7 +195,7 @@ public class BPlanEnterpriseResponse { * 检查id */ @ApiModelProperty(value = "检查id") - private Integer checkId; + private String checkId; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java index 6f76d7d..432930d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java @@ -183,7 +183,7 @@ public class BPlanEnterpriseZhifaResponse { * 检查id */ @ApiModelProperty(value = "检查id") - private Integer checkId; + private String checkId; /** diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index 69c04cb..aeb61a5 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml @@ -142,7 +142,6 @@ c.RISK_LEVEL as riskLevel, c.STAND_LEVEL as standLevel, c.EXAMINE_END_TIME as examineEndTime, - CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS isPoint FROM b_plan_enterprise a LEFT JOIN b_key_enterprise b ON a.enterprise_id = b.ent_code @@ -152,7 +151,7 @@ and a.planned_year =#{req.plannedYear} - and a.enterprise_name =#{req.enterpriseName} + and a.enterprise_name like concat('%', #{req.enterpriseName}, '%') and a.check_status =#{req.checkStatus}