From be67a2e0d516b4bde98d180630e6f90efa90f4e8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 23 六月 2025 17:25:24 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java | 8 ++++----
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 6 +++---
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java | 14 +++++++-------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java | 6 +++---
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
index 7c39357..1029716 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
@@ -284,9 +284,9 @@
List<VoCards> getLostCards(Map<?, ?> params);
/**
- * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�
- * @param clientNum
+ * 鏍规嵁姘村崱缂栧彿鑾峰彇鍗′俊鎭�
+ * @param cardNum
* @return
*/
- VoCardByClientNum getCardByClientNum(@Param("clientNum") String clientNum);
+ VoCardByClientNum getCardByCardNum(@Param("cardNum") String cardNum);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index a3901d4..f00cfd5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -839,8 +839,8 @@
</trim>
</select>
- <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�-->
- <select id="getCardByClientNum" resultType="com.dy.pipIrrGlobal.voSe.VoCardByClientNum">
+ <!--鏍规嵁姘村崱缂栧彿鑾峰彇鍗′俊鎭�-->
+ <select id="getCardByCardNum" resultType="com.dy.pipIrrGlobal.voSe.VoCardByClientNum">
SELECT
card.cardNum,
card.state AS cardState,
@@ -859,7 +859,7 @@
END) AS stateName
FROM se_client_card card
INNER JOIN se_client cli ON card.clientId = cli.id
- WHERE cli.clientNum = #{clientNum}
+ WHERE card.cardNum = #{cardNum}
AND card.state != 4
ORDER BY card.createDt DESC
LIMIT 1
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
index f376653..6720c46 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
@@ -317,11 +317,11 @@
}
/**
- * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�
- * @param clientNum 鍐滄埛缂栧彿
+ * 鏍规嵁姘村崱缂栧彿鑾峰彇鍗′俊鎭�
+ * @param cardNum 姘村崱缂栧彿
* @return
*/
- @Operation(summary = "鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�", description = "鏍规嵁鍐滄埛缂栧彿鑾峰彇瀵瑰簲鐨勫崱淇℃伅")
+ @Operation(summary = "鏍规嵁姘村崱缂栧彿鑾峰彇鍗′俊鎭�", description = "鏍规嵁姘村崱缂栧彿鑾峰彇瀵瑰簲鐨勫崱淇℃伅")
@ApiResponses(value = {
@ApiResponse(
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
@@ -330,17 +330,17 @@
schema = @Schema(implementation = VoCardByClientNum.class))}
)
})
- @GetMapping(path = "getcardbyclientnum")
+ @GetMapping(path = "getcardbycardnum")
@SsoAop()
- public BaseResponse<VoCardByClientNum> getCardByClientNum(@RequestParam String clientNum){
+ public BaseResponse<VoCardByClientNum> getCardByCardNum(@RequestParam String cardNum){
try {
- VoCardByClientNum res = cardSv.getCardByClientNum(clientNum);
+ VoCardByClientNum res = cardSv.getCardByCardNum(cardNum);
if (res == null) {
return BaseResponseUtils.buildFail("鏈壘鍒板搴旂殑鍗′俊鎭�");
}
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鏍规嵁鍐滄埛缂栧彿鏌ヨ鍗′俊鎭紓甯�", e);
+ log.error("鏍规嵁姘村崱缂栧彿鏌ヨ鍗′俊鎭紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
index 47a1f73..0aeff56 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
@@ -1242,11 +1242,11 @@
}
/**
- * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�
- * @param clientNum 鍐滄埛缂栧彿
+ * 鏍规嵁姘村崱缂栧彿鑾峰彇鍗′俊鎭�
+ * @param cardNum 姘村崱缂栧彿
* @return 鍗′俊鎭�
*/
- public VoCardByClientNum getCardByClientNum(String clientNum) {
- return seClientCardMapper.getCardByClientNum(clientNum);
+ public VoCardByClientNum getCardByCardNum(String cardNum) {
+ return seClientCardMapper.getCardByCardNum(cardNum);
}
}
--
Gitblit v1.8.0