bonus
/
hz-zhhq-app-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

办卡、办证修改

This commit is contained in:
cwchen 2025-03-05 18:36:59 +08:00
parent 6e44920549
commit 2aee2c3744
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
greenH5modul/src/com/jysoft/card/service/NewCardService.java
View File

@ -1149,8 +1149,8 @@ public class NewCardService {
* @param vo * @param vo
*/ */
public void pushInfo2(CardVo vo) { public void pushInfo2(CardVo vo) {
String title = "" + vo.getCardType() + "申请"; String title = "" + vo.getCardType() + "审批通过";
String text = "您好，您有新的" + vo.getCardType() + "申请需要审批，请点击查看。"; String text = "您好，" + vo.getCardType() + "申请审批已通过，请点击查看。";
String url = "/pages/access-card/card-record"; String url = "/pages/access-card/card-record";
aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url); 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 = ?)" + " (gc.CARD_TYPE != '第三方人员' AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gc.OPER_CARD_ID = ?)"
+ " GROUP BY gc.DATA_ID" + " GROUP BY gc.DATA_ID"
+ ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?"; + ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?";
System.err.println(sql);
Integer pageSize = vo.getPageSize(); Integer pageSize = vo.getPageSize();
Integer pageNum = vo.getPageNum(); Integer pageNum = vo.getPageNum();
Integer page = (pageNum - 1) * pageSize; 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.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\","
+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\"" + " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\""
+ " FROM GREEN_CARD gc " + " 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" + " 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 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 = '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" + " GROUP BY gc.DATA_ID"
+ ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?"; + ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?";
System.err.println(sql);
Integer pageSize = vo.getPageSize(); Integer pageSize = vo.getPageSize();
Integer pageNum = vo.getPageNum(); Integer pageNum = vo.getPageNum();
Integer page = (pageNum - 1) * pageSize; Integer page = (pageNum - 1) * pageSize;