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 f2d70c7a..7c5cf181 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,8 +92,8 @@ public class BusProcessNew { @ApiModelProperty(value = "当前节点信息") private String nowTaskInfo; - @TableField("COMPLETE_STATUS") - @ApiModelProperty("完成状态 未完成,已接收,已完成") - private String completeStatus; + @TableField("RECEIVE_STATUS") + @ApiModelProperty("接收状态") + private String receiveStatus; } 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 c867af80..b01e64d2 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 @@ -309,6 +309,10 @@ 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,