From 852bdf5f77caf393c1c75e82c5dd86e79f4b87b8 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 19:47:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 7 ++++++- .../mapper/sarStandWarning/SarStandardWarningDao.xml | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index c87af9ea..0fde3f51 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -69,11 +69,16 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String itemsNum; - + @ApiModelProperty("条款(分解单)名称") + @TableField(exist = false) + private String itemsName; @TableField("POLICY_ID") private String policyId; + @TableField(exist = false) + private String policyName; + @TableField("MARK") private String mark; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index 4c21182a..9938db58 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -53,7 +53,8 @@ SELECT law_id as STAND_ID, '-1' AS itemsId, - 'stand' AS mark + 'stand' AS mark, + '1' as power FROM warning_date AS warning WHERE @@ -62,7 +63,8 @@ SELECT STAND_ID, ID AS itemsId, - 'item' AS mark + 'item' AS mark, + '1' as power FROM sar_stand_items AS item WHERE