From f1c1d5b90efda2d20a3b622ac35719e8352ca08f Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 11 May 2023 17:02:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/DomesticExportCustomsMapper.xml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
index 880bcd20..fba0ac57 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
@@ -359,10 +359,14 @@
and p.glzt = #{queryParams.glzt}
-
+
and p.rzh_yesorno = #{queryParams.rzhYesorno}
+
+ and (p.rzh_yesorno = '1' or p.rzh_yesorno = '2')
+
+
and p.bdk_status = #{queryParams.bdkStatus}
@@ -463,10 +467,14 @@
and p.glzt = #{queryParams.glzt}
-
+
and p.rzh_yesorno = #{queryParams.rzhYesorno}
+
+ and (p.rzh_yesorno = '1' and p.rzh_yesorno = '2')
+
+
and p.bdk_status = #{queryParams.bdkStatus}
From 5be98e33b72229b554ecafaf79420224b1a9eadf Mon Sep 17 00:00:00 2001
From: yefei
Date: Thu, 11 May 2023 18:40:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?ariesy=20=E5=8E=BB=E6=8E=89=E6=9F=A5?=
=?UTF-8?q?=E9=AA=8C=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/dxhy/erp/service/SNPushCheckRecordService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
index cdf54155..104df6fd 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
@@ -299,7 +299,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
log.info("查验的结果为:{}", apiResponse.getContent());
jsonObject = convertToSnObject(apiResponse.getContent(), jsonObject, fplxdm);
}
- saveCheckRecord(pramsMap, apiResponse);
+// saveCheckRecord(pramsMap, apiResponse);
return jsonObject;
}
From 8fd9a357e80b9f6722ab38bd2f2fed034f7ac7c9 Mon Sep 17 00:00:00 2001
From: yefei
Date: Thu, 11 May 2023 18:48:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ariesy=20=E5=8E=BB=E6=8E=89=E6=9F=A5?=
=?UTF-8?q?=E9=AA=8C=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=20V2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/dxhy/erp/controller/SDNYMainProcessController.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
index 30873607..05620a1d 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
@@ -188,7 +188,7 @@ public class SDNYMainProcessController extends AbstractController {
data.put("data", checkInvoice);
//查验结果保存
- saveCheckLog(pramsMap, checkInvoice);
+// saveCheckLog(pramsMap, checkInvoice);
return ResponseEntity.ok(JSONObject.toJSONString(data));
} else {
@@ -203,7 +203,7 @@ public class SDNYMainProcessController extends AbstractController {
data.put("data", checkInvoice);
//查验结果保存
- saveCheckLog(pramsMap,checkInvoice);
+// saveCheckLog(pramsMap,checkInvoice);
return ResponseEntity.ok(JSONObject.toJSONString(data));