From 2aee2c3744a94c09460de083ad4d857476701a3b Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 5 Mar 2025 18:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E5=8D=A1=E3=80=81=E5=8A=9E=E8=AF=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/jysoft/card/service/NewCardService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/greenH5modul/src/com/jysoft/card/service/NewCardService.java b/greenH5modul/src/com/jysoft/card/service/NewCardService.java index 2f34fe2..bb37d2d 100644 --- a/greenH5modul/src/com/jysoft/card/service/NewCardService.java +++ b/greenH5modul/src/com/jysoft/card/service/NewCardService.java @@ -1149,8 +1149,8 @@ public class NewCardService { * @param vo */ public void pushInfo2(CardVo vo) { - String title = "" + vo.getCardType() + "申请"; - String text = "您好，您有新的" + vo.getCardType() + "申请需要审批，请点击查看。"; + String title = "" + vo.getCardType() + "审批通过"; + String text = "您好，" + vo.getCardType() + "申请审批已通过，请点击查看。"; String url = "/pages/access-card/card-record"; aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url); } @@ -1196,6 +1196,7 @@ public class NewCardService { + " (gc.CARD_TYPE != '第三方人员' AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gc.OPER_CARD_ID = ?)" + " GROUP BY gc.DATA_ID" + ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?"; + System.err.println(sql); Integer pageSize = vo.getPageSize(); Integer pageNum = vo.getPageNum(); Integer page = (pageNum - 1) * pageSize; @@ -1223,13 +1224,14 @@ public class NewCardService { + " MAX(gc.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\"," + " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\"" + " FROM GREEN_CARD gc " - + " LEFT JOIN GREEN_CARD_EXAMINE gce ON gc.ID = ghcd.CARD_ID " + + " LEFT JOIN GREEN_CARD_EXAMINE gce ON gc.ID = gce.CARD_ID " + " WHERE (gc.CARD_TYPE IN ('职工卡','第三方人员') AND gce.USER_ID = ? ) OR" + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH IN ('1','2','3') AND gce.USER_ID = ? ) OR" + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gce.USER_ID = '0' ) OR" - + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '1' AND gce.USER_ID = ? ) OR" + + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '1' AND gce.USER_ID = ? )" + " GROUP BY gc.DATA_ID" + ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?"; + System.err.println(sql); Integer pageSize = vo.getPageSize(); Integer pageNum = vo.getPageNum(); Integer page = (pageNum - 1) * pageSize;