Merge branch '20230508_workState' into develop

This commit is contained in:
2023-06-20 14:06:59 +09:00
23 changed files with 1008 additions and 85 deletions

View File

@@ -28,6 +28,14 @@ app.props:
header: Authorization
prefix: "Bearer "
# file
hubeasy_file_info:
send-message-location: /efs/home/sendMessage
rsv-message-location: /efs/home/rsvMessage
caller-id-location: /efs/home/callidDoc
consult-location: /efs/home/consult
work-location: /efs/admin/workState/workStatefile.txt
logging:
config: classpath:logback-spring.xml

View File

@@ -1253,9 +1253,11 @@
, ecm.USE_YN
, eci.BIZRNO
, ecm.CHRG_SEQ
, esi.JOIN_DIV
FROM hubez_admin.EZ_CHARGE_MNG ecm
INNER JOIN hubez_common.EZ_SVC_USER esu ON esu.USER_SEQ = ecm.USER_SEQ
INNER JOIN hubez_common.EZ_CUST_INFO eci ON eci.CUST_SEQ = esu.CUST_SEQ
INNER JOIN hubez_common.EZ_SUBS_INFO esi ON esi.USER_SEQ = ecm.USER_SEQ
WHERE 1 = 1
AND ecm.USE_YN ='Y'
AND ecm.CHRG_SEQ = #{chrgSeq}
@@ -1285,6 +1287,7 @@
, esu.USER_SEQ
, esu.USER_STTUS_CD
, esu.USER_TP_CD
, esi.JOIN_DIV
FROM hubez_common.EZ_SVC_USER esu
INNER JOIN hubez_common.EZ_SUBS_INFO esi ON esi.USER_SEQ = esu.USER_SEQ
INNER JOIN hubez_common.EZ_CUST_INFO eci ON eci.CUST_SEQ = esu.CUST_SEQ