办卡办证修改
This commit is contained in:
parent
eedbb7a64c
commit
c55edce8ef
|
|
@ -1290,12 +1290,12 @@ 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\","
|
||||||
+ " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\""
|
+ " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\""
|
||||||
+ " FROM GREEN_CARD gc "
|
+ " FROM GREEN_CARD_EXAMINE gce "
|
||||||
+ " LEFT JOIN GREEN_CARD_EXAMINE gce ON gc.ID = gce.CARD_ID "
|
+ " LEFT JOIN GREEN_CARD gc ON gc.ID = gce.CARD_ID "
|
||||||
+ " WHERE (gc.CARD_TYPE IN ('职工卡','第三方人员') AND gce.USER_ID = ? ) OR"
|
+ " WHERE gce.USER_ID = ?"
|
||||||
+ " (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 = ? )"
|
// + " (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);
|
System.err.println(sql);
|
||||||
|
|
@ -1304,8 +1304,6 @@ public class NewCardService {
|
||||||
Integer page = (pageNum - 1) * pageSize;
|
Integer page = (pageNum - 1) * pageSize;
|
||||||
Integer limit = pageNum * pageSize;
|
Integer limit = pageNum * pageSize;
|
||||||
parameter.add(userId);
|
parameter.add(userId);
|
||||||
parameter.add(userId);
|
|
||||||
parameter.add(userId);
|
|
||||||
parameter.add(limit);
|
parameter.add(limit);
|
||||||
parameter.add(page);
|
parameter.add(page);
|
||||||
List<Map<String, Object>> list = iHibernateDao.queryForListWithSql(sql,
|
List<Map<String, Object>> list = iHibernateDao.queryForListWithSql(sql,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue