From 22d12d3e196c98650b54a1116b84c27dbf7c27f7 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 2 Jul 2024 09:59:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E4=B8=BB=E8=AE=A1?= =?UTF-8?q?=E5=88=92):=20=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardmasterplan/entity/LawsStandardMasterPlan.java | 6 ++++++ .../mapper/xml/LawsStandardMasterPlanSublistMapper.xml | 3 ++- .../servicce/impl/LawsStandardMasterPlanServiceImpl.java | 2 +- .../standardmasterplan/vo/LawsStandardMasterPlanVO.java | 6 ++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlan.java index d7a275f1..15a93636 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlan.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.standardmasterplan.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.jero.modules.laws.documenttool.entity.BaseEntity; import io.swagger.annotations.ApiModel; @@ -25,7 +26,12 @@ public class LawsStandardMasterPlan extends BaseEntity { @ApiModelProperty(value = "标准id") private String standardId; + /**市场法规清单id*/ + @ApiModelProperty(value = "市场法规清单id") + private String marketStandardId; + /**适用市场*/ @ApiModelProperty(value = "适用市场") + @TableField(exist = false) private String applicableMarket; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml index 008254d1..4a6f59b8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml @@ -12,9 +12,10 @@ - select lsmp.id, lds.id standard_id, standard_number, standard_name, standard_state, lsmp.applicable_market + select lsmp.id, lds.id standard_id, standard_number, standard_name, standard_state, lms.country applicableMarket from laws_standard_master_plan lsmp left join laws_domestic_standard lds on lsmp.standard_id = lds.id and lds.del_flag = 0 + left join laws_market_standard lms on lsmp.market_standard_id = lms.id and lms.del_flag = 0 ${ew.customSqlSegment} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java index fd3905e5..781cbd28 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java @@ -90,7 +90,7 @@ public class LawsStandardMasterPlanServiceImpl queryWrapper.like(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getStandardName()), "lds.standard_name", lawsStandardMasterPlanVO.getStandardName()); queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getApplicableMarket()), - "lsmp.applicable_market", lawsStandardMasterPlanVO.getApplicableMarket()); + "lms.applicable_market", lawsStandardMasterPlanVO.getApplicableMarket()); queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()), "lsmp.id", lawsStandardMasterPlanVO.getId()); queryWrapper.eq("lsmp.del_flag", CommonConstant.DEL_FLAG_0); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java index 01e181ae..77efdeec 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.standardmasterplan.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,8 +37,13 @@ public class LawsStandardMasterPlanVO implements Serializable { @Dict(dicCode = "standard_state") private java.lang.String standardState; + /**市场法规清单id*/ + @ApiModelProperty(value = "市场法规清单id") + private String marketStandardId; + /** 适用市场 */ @ApiModelProperty(value = "适用市场") @Dict(dicCode = "market_state") + @TableField(exist = false) private java.lang.String applicableMarket; }