From b5fbd89107c49777ff92a5b81797c56583949ca6 Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期一, 28 十月 2024 15:28:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index ec33ed7..83f1a1f 100644
--- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
@@ -918,7 +918,7 @@
String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n";
String strContent = "";
String contentFormatStr = "%s %s %s %s\r\n";
- List<Map> list = tdmxper.yRZcList("08");
+ List<Map> list = tdmxper.kjZcList("08");
int index = 1;
for (Map map : list) {
String numberplates = (String) map.get("numberplates"); // 杞︾墝鍙�
@@ -944,7 +944,7 @@
String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n";
String strContent = "";
String contentFormatStr = "%s %s %s %s\r\n";
- List<Map> list = tdmxper.yRZcList("04");
+ List<Map> list = tdmxper.kjZcList("04");
int index = 1;
for (Map map : list) {
String numberplates = (String) map.get("numberplates"); // 杞︾墝鍙�
@@ -1081,7 +1081,7 @@
}
@Override
- public ObjectResult<Map<String, Object>> getcInfo(String cardID) {
+ public ObjectResult<Map<String, Object>> getcInfo(String cardID,boolean needRecord) {
ObjectResult<Map<String, Object>> orr=new ObjectResult<Map<String,Object>>();
Map<String, Object> rem=new HashMap<String, Object>();
Map<String, Object> mp=this.yktper.getcardinuse(cardID);
@@ -1197,7 +1197,9 @@
}else {
mr.put("firstzxhtime", new Date());
}
- this.bsper.updateTaskTime(mr);
+ if(needRecord) { // 涓簍rue 鍒欐洿鏂扮涓�娆℃壂鍗℃椂闂达紝鍚﹀垯涓嶈褰�
+ this.bsper.updateTaskTime(mr);
+ }
}else {
orr.setCode(1);
orr.setErrmsg("鏈壘鍒拌杞﹁褰�");
--
Gitblit v1.9.3