diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java index 04005416..f2d70c7a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java @@ -92,4 +92,8 @@ public class BusProcessNew { @ApiModelProperty(value = "当前节点信息") private String nowTaskInfo; + @TableField("COMPLETE_STATUS") + @ApiModelProperty("完成状态 未完成,已接收,已完成") + private String completeStatus; + } 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 4b6117db..0730aca6 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 @@ -45,6 +45,22 @@ public class SarLawsStandInfo extends BaseEntity { @TableField("LAWS_TYPE") private String lawsType; + @ApiModelProperty(value = "一级政策分类") + @TableField("LAWS_TYPE_FIRST_LEVEL") + private String lawsTypeFirstLevel; + + @ApiModelProperty(value = "二级政策份分类") + @TableField("LAWS_TYPE_SECOND_LEVEL") + private String lawsTypeSecondLevel; + + @ApiModelProperty(value = "三级政策分类") + @TableField("LAWS_TYPE_THIRD_LEVEL") + private String lawsTypeThirdLevel; + + @ApiModelProperty(value = "四级政策分类") + @TableField("LAWS_TYPE_FOURTH_LEVEL") + private String lawsTypeFourthLevel; + @ApiModelProperty(value = "政策编号") @TableField("LAWS_NUMBER") private String lawsNumber; @@ -104,6 +120,10 @@ public class SarLawsStandInfo extends BaseEntity { @TableField("LAWS_NOTISYNC_NUM") private String lawsNotisyncNum; + @ApiModelProperty(value = "通知文号链接") + @TableField("NOTISYNC_NUM_LINK") + private String NotisyncNumLink; + @ApiModelProperty(value = "信息简报 xxx期次xxx板块") @TableField("LAWS_BULLETIN") private String lawsBulletin; 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 8bd79aca..c867af80 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 @@ -351,6 +351,10 @@ SELECT DISTINCT SAR_LAWS_STAND_INFO.ID, SAR_LAWS_STAND_INFO.LAWS_TYPE, + SAR_LAWS_STAND_INFO.LAWS_TYPE_FIRST_LEVEL, + SAR_LAWS_STAND_INFO.LAWS_TYPE_SECOND_LEVEL, + SAR_LAWS_STAND_INFO.LAWS_TYPE_THIRD_LEVEL, + SAR_LAWS_STAND_INFO.LAWS_TYPE_FOURTH_LEVEL, SAR_LAWS_STAND_INFO.LAWS_NUMBER, SAR_LAWS_STAND_INFO.LAWS_NAME, SAR_LAWS_STAND_INFO.LAWS_EN_NAME,