From 02b3d183f55ed5366421fe4104b93d021da86ee9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 19:39:12 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
index 95e930c..8e7d2d2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
@@ -67,20 +67,18 @@
*/
@RequestMapping("/tHuiminCard_detail/{id}")
public String tHuiminCardDetail(@PathVariable("id") Integer id) {
- THuiminCard byId = huiminCardClient.getById(id);
- Date startTime = byId.getStartTime();
- if (startTime != null){
- byId.setStartTimeStr(DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"));
- }
- Date endTime = byId.getEndTime();
- if (endTime != null){
- byId.setEndTimeStr(DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"));
- }
- String jsonString = JSONObject.toJSONString(byId);
- setAttr("tHuiminCard", jsonString);
return PREFIX + "tHuiminCard_detail.html";
}
+ /**
+ * 获取惠民卡详情
+ */
+ @RequestMapping("/getDetail")
+ @ResponseBody
+ public THuiminCard getDetail(Integer id) {
+ return huiminCardClient.getById(id);
+ }
+
/**
* 获取惠民卡列表
--
Gitblit v1.7.1