From faef2cdf591190c3f774bc7583f9dfed9299b376 Mon Sep 17 00:00:00 2001
From: zzy <2041873787@qq.com>
Date: Fri, 30 Jul 2021 16:45:23 +0800
Subject: [PATCH] =?UTF-8?q?Update=EF=BC=9A=E6=A0=87=E5=87=86=E8=A7=A3?=
=?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../standardSplit/entity/SarFileSplitInfoEO.java | 10 ++++++++++
.../standardSplit/entity/SarFileSplitInfoEOPage.java | 12 ++++++++++++
.../standardSplit/SarFileSplitInfoEOMapper.xml | 4 ++++
3 files changed, 26 insertions(+)
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java
index e77326e2..367f311a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java
@@ -13,6 +13,8 @@ import java.util.Date;
*/
public class SarFileSplitInfoEO extends BaseEntity {
+
+ private String standType;
private String sarType;
private String fileName;
private String id;
@@ -321,4 +323,12 @@ public class SarFileSplitInfoEO extends BaseEntity {
public void setInfoId(String infoId) {
this.infoId = infoId;
}
+
+ public String getStandType() {
+ return standType;
+ }
+
+ public void setStandType(String standType) {
+ this.standType = standType;
+ }
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java
index 68158eff..cda70bf7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java
@@ -10,6 +10,7 @@ import com.adc.da.base.page.BasePage;
*/
public class SarFileSplitInfoEOPage extends BasePage {
+ private String standType;
private String sarType;
private String sarTypeOperator = "=";
private String fileName;
@@ -49,6 +50,17 @@ public class SarFileSplitInfoEOPage extends BasePage {
private String shunxu;
+ public SarFileSplitInfoEOPage() {
+ }
+
+ public String getStandType() {
+ return standType;
+ }
+
+ public void setStandType(String standType) {
+ this.standType = standType;
+ }
+
public String getResult() {
return result;
}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml
index 491246ff..62a2d1d9 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml
@@ -238,6 +238,7 @@
select * from
(select tmp_tb.* from
(SELECT
+ SAR_STANDARDS_INFO.STAND_TYPE AS standType,
SAR_FILE_SPLIT_INFO.*,
if(
SAR_STANDARDS_INFO.STAND_YEAR='',
@@ -266,6 +267,9 @@
and SAR_TYPE = #{sarType}
+
+ and SAR_STANDARDS_INFO.STAND_TYPE = #{standType}
+
and SAR_FILE_SPLIT_INFO.id = #{id}