From b2d7340671341be9809bfd688f141aff77fd3f1e Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 21 Sep 2023 11:47:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81=EF=BC=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=B7=B2=E6=8E=A5=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/BusProcessNew.java | 6 +++--- .../mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) 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,