From 1eb30c29ec9de9fb344574e35521cfd7ef1ea91b Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 21 Sep 2023 15:06:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarLawsStandInfo.java | 20 +++++++++++++++++++ .../SarLawsStandInfoMapper.xml | 5 +++++ 2 files changed, 25 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java index 0730aca6..9d9a52ea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java @@ -49,18 +49,34 @@ public class SarLawsStandInfo extends BaseEntity { @TableField("LAWS_TYPE_FIRST_LEVEL") private String lawsTypeFirstLevel; + @ApiModelProperty(value = "一级政策分类名称") + @TableField(exist = false) + private String lawTypeFirstLevelName; + @ApiModelProperty(value = "二级政策份分类") @TableField("LAWS_TYPE_SECOND_LEVEL") private String lawsTypeSecondLevel; + @ApiModelProperty(value = "二级政策分类名称") + @TableField(exist = false) + private String lawTypeSecondLevelName; + @ApiModelProperty(value = "三级政策分类") @TableField("LAWS_TYPE_THIRD_LEVEL") private String lawsTypeThirdLevel; + @ApiModelProperty(value = "三级政策分类名称") + @TableField(exist = false) + private String lawTypeThirdLevelName; + @ApiModelProperty(value = "四级政策分类") @TableField("LAWS_TYPE_FOURTH_LEVEL") private String lawsTypeFourthLevel; + @ApiModelProperty(value = "四级政策分类名称") + @TableField(exist = false) + private String lawTypeFourthLevelName; + @ApiModelProperty(value = "政策编号") @TableField("LAWS_NUMBER") private String lawsNumber; @@ -116,6 +132,10 @@ public class SarLawsStandInfo extends BaseEntity { @TableField("LAWS_YEAR") private String lawsYear; + @ApiModelProperty(value = "年度值") + @TableField(exist = false) + private String lawsYearValue; + @ApiModelProperty(value = "福田转发通知文号") @TableField("LAWS_NOTISYNC_NUM") private String lawsNotisyncNum; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml index b01e64d2..258fad84 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml @@ -310,9 +310,13 @@ DISTINCT SAR_LAWS_STAND_INFO.ID, SAR_LAWS_STAND_INFO.LAWS_TYPE, SAR_LAWS_STAND_INFO.LAWS_TYPE_FIRST_LEVEL, + (select DIC_TYPE_NAME from ts_dictype where DIC_TYPE_CODE = SAR_LAWS_STAND_INFO.LAWS_TYPE_FIRST_LEVEL) as lawTypeFirstLevelName, SAR_LAWS_STAND_INFO.LAWS_TYPE_SECOND_LEVEL, + (select DIC_TYPE_NAME from ts_dictype where DIC_TYPE_CODE = SAR_LAWS_STAND_INFO.LAWS_TYPE_SECOND_LEVEL) as lawTypeSecondLevelName, SAR_LAWS_STAND_INFO.LAWS_TYPE_THIRD_LEVEL, + (select DIC_TYPE_NAME from ts_dictype where DIC_TYPE_CODE = SAR_LAWS_STAND_INFO.LAWS_TYPE_THIRD_LEVEL) as lawTypeThirdLevelName, SAR_LAWS_STAND_INFO.LAWS_TYPE_FOURTH_LEVEL, + (select DIC_TYPE_NAME from ts_dictype where DIC_TYPE_CODE = SAR_LAWS_STAND_INFO.LAWS_TYPE_FOURTH_LEVEL) as lawTypeFourthLevelName, SAR_LAWS_STAND_INFO.LAWS_NUMBER, SAR_LAWS_STAND_INFO.LAWS_NAME, SAR_LAWS_STAND_INFO.LAWS_EN_NAME, @@ -326,6 +330,7 @@ SAR_LAWS_STAND_INFO.LAWS_SYCX, SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS, SAR_LAWS_STAND_INFO.LAWS_YEAR, + (select DIC_TYPE_NAME from ts_dictype where DIC_TYPE_CODE = SAR_LAWS_STAND_INFO.LAWS_YEAR) as lawsYearValue, SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM, SAR_LAWS_STAND_INFO.LAWS_BULLETIN, SAR_LAWS_STAND_INFO.LAWS_LABEL,