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-07 19:01:36 +08:00
parent 5ceb7d1da0
commit 9183603bbf
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,7 +413,8 @@ public class NewCardService {
+ " MAX(gc.IS_ENABLE_FACE) AS \"isEnableFace\",MAX(gc.APPLY_TIME) AS \"applyTime\"," + " MAX(gc.IS_ENABLE_FACE) AS \"isEnableFace\",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.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\"," + " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\","
+ " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\",MAX(gc.OPER_TYPE) AS \"operType\"" + " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\",MAX(gc.OPER_TYPE) AS \"operType\","
+ " MAX(gc.CARD_STATUS) AS \"cardStatus\""
+ " FROM GREEN_CARD gc" + " WHERE gc.DATA_ID = ?" + " GROUP BY gc.DATA_ID"; + " FROM GREEN_CARD gc" + " WHERE gc.DATA_ID = ?" + " GROUP BY gc.DATA_ID";
System.err.println(sql); System.err.println(sql);
parameter.add(vo.getDataId()); parameter.add(vo.getDataId());
@ -478,7 +479,7 @@ public class NewCardService {
+ " gc.APPLY_TYPE AS \"applyType\",gc.APPLY_TERM AS \"applyTerm\",gc.DATA_ID AS \"dataId\"," + " gc.APPLY_TYPE AS \"applyType\",gc.APPLY_TERM AS \"applyTerm\",gc.DATA_ID AS \"dataId\","
+ " gc.EXAMINE_BATCH AS \"examineBatch\",gc.EXAMINE_STATE AS \"examineState\"," + " gc.EXAMINE_BATCH AS \"examineBatch\",gc.EXAMINE_STATE AS \"examineState\","
+ " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\"," + " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\","
+ " gc.OPER_TYPE AS \"operType\",gc.USER_NAME AS \"userName\"" + " gc.OPER_TYPE AS \"operType\",gc.USER_NAME AS \"userName\",gc.CARD_STATUS AS \"cardStatus\""
+ " FROM GREEN_CARD gc" + " WHERE gc.DATA_ID = ?"; + " FROM GREEN_CARD gc" + " WHERE gc.DATA_ID = ?";
System.err.println(sql); System.err.println(sql);
parameter.add(vo.getDataId()); parameter.add(vo.getDataId());
@ -549,7 +550,7 @@ public class NewCardService {
+ " gc.LEND_TIME AS \"lendTime\",gc.BACK_TIME AS \"backTime\"," + " gc.LEND_TIME AS \"lendTime\",gc.BACK_TIME AS \"backTime\","
+ " gc.ACTUAL_BACK_TIME AS \"actualBackTime\",gc.REMARK AS \"remark\"," + " gc.ACTUAL_BACK_TIME AS \"actualBackTime\",gc.REMARK AS \"remark\","
+ " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\"," + " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\","
+ " gc.OPER_TYPE AS \"operType\",gc.USER_NAME AS \"userName\"" + " gc.OPER_TYPE AS \"operType\",gc.USER_NAME AS \"userName\",gc.CARD_STATUS AS \"cardStatus\""
+ " FROM GREEN_CARD gc" + " FROM GREEN_CARD gc"
+ " WHERE gc.DATA_ID = ?"; + " WHERE gc.DATA_ID = ?";
System.err.println(sql); System.err.println(sql);
@ -596,7 +597,8 @@ public class NewCardService {
+ " MAX(gc.CARD_START_TIME) AS \"cardStartTime\",MAX(gc.CARD_END_TIME) AS \"cardEndTime\"," + " MAX(gc.CARD_START_TIME) AS \"cardStartTime\",MAX(gc.CARD_END_TIME) AS \"cardEndTime\","
+ " MAX(gc.ACCESS_AREA) AS \"accessArea\",MAX(gc.BZ_NUM) AS \"bzNum\"," + " MAX(gc.ACCESS_AREA) AS \"accessArea\",MAX(gc.BZ_NUM) AS \"bzNum\","
+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\"," + " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\","
+ " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\",MAX(gc.OPER_TYPE) AS \"operType\"" + " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\",MAX(gc.OPER_TYPE) AS \"operType\","
+ " MAX(gc.CARD_STATUS) AS \"cardStatus\""
+ " FROM GREEN_CARD gc" + " FROM GREEN_CARD gc"
+ " WHERE gc.DATA_ID = ? GROUP BY gc.DATA_ID"; + " WHERE gc.DATA_ID = ? GROUP BY gc.DATA_ID";
parameter.add(vo.getDataId()); parameter.add(vo.getDataId());
@ -653,7 +655,7 @@ public class NewCardService {
+ " MAX(gc.ACCESS_AREA) AS \"accessArea\",MAX(gc.CAR_NUM) AS \"carNum\",MAX(gc.TICKET_NO) AS \"ticketNo\"," + " MAX(gc.ACCESS_AREA) AS \"accessArea\",MAX(gc.CAR_NUM) AS \"carNum\",MAX(gc.TICKET_NO) AS \"ticketNo\","
+ " MAX(gc.WORK_CONTENT) AS \"workContent\",MAX(gc.OPER_TYPE) AS \"operType\"," + " MAX(gc.WORK_CONTENT) AS \"workContent\",MAX(gc.OPER_TYPE) AS \"operType\","
+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\"," + " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\","
+ " MAX(gc.USER_NAME) AS \"userName\"" + " MAX(gc.USER_NAME) AS \"userName\",MAX(gc.CARD_STATUS) AS \"cardStatus\""
+ " FROM GREEN_CARD gc WHERE gc.DATA_ID = ? GROUP BY gc.DATA_ID"; + " FROM GREEN_CARD gc WHERE gc.DATA_ID = ? GROUP BY gc.DATA_ID";
parameter.add(vo.getDataId()); parameter.add(vo.getDataId());
dataList = iHibernateDao.queryForListWithSql(sql.toString(), parameter.toArray(), dataList = iHibernateDao.queryForListWithSql(sql.toString(), parameter.toArray(),