From b1bc6228bdea6470355e3e5eb16e66ff27b0fb94 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 7 Mar 2025 19:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E5=8D=A1=E5=8A=9E=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/jysoft/card/service/NewCardService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/greenH5modul/src/com/jysoft/card/service/NewCardService.java b/greenH5modul/src/com/jysoft/card/service/NewCardService.java index 6b96be5..6978b0f 100644 --- a/greenH5modul/src/com/jysoft/card/service/NewCardService.java +++ b/greenH5modul/src/com/jysoft/card/service/NewCardService.java @@ -366,8 +366,8 @@ public class NewCardService { * @param vo */ public void pushInfo(CardVo vo) { - String title = "" + vo.getCardType() + "申请"; - String text = "您好，您有新的" + vo.getCardType() + "申请需要审批，请点击查看。"; + String title = vo.getTypeName()+"-" + vo.getCardType() + "申请"; + String text = "您好，您有新的" + vo.getTypeName() + "-"+ vo.getCardType() + "申请需要审批，请点击查看。"; // String url = "/pages/access-card/card-record?currentTabIndex=1"; String url = "/pages/access-card/card-record"; aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url); @@ -1218,8 +1218,8 @@ public class NewCardService { * @param vo */ public void pushInfo2(CardVo vo) { - String title = "" + vo.getCardType() + "审批通过"; - String text = "您好，" + vo.getCardType() + "申请审批已通过，请点击查看。"; + String title = vo.getTypeName()+"-" + vo.getCardType() + "审批通过"; + String text = "您好，" +vo.getTypeName()+"-" + vo.getCardType() + "申请审批已通过，请点击查看。"; String url = "/pages/access-card/card-record?currentTabIndex=1"; aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url); } @@ -1256,7 +1256,7 @@ public class NewCardService { List parameter = new ArrayList(); String sql = " SELECT * FROM (SELECT ROWNUM num,A.* FROM ( " + " SELECT * FROM (" - + " SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\"," + + " SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"cardType\"," + " MAX(gc.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\"," + " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\"," + " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\"" @@ -1301,7 +1301,7 @@ public class NewCardService { String userId = vo.getUserId(); String sql = " SELECT * FROM (SELECT ROWNUM num,A.* FROM ( " + " SELECT * FROM (" - + " SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\"," + + " SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"cardType\"," + " MAX(gc.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\"," + " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\"," + " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\""