Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge rc-3.0 gitlab to rc-3.0 github (21-07-2021) #2622

Open
wants to merge 205 commits into
base: release-candidate-3.0
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
205 commits
Select commit Hold shift + click to select a range
fd18ba1
- Thanh toán qua POS
duongnguyen1996 Nov 23, 2020
9bc52cf
Check status thanh toán và hủy thanh toán
duongnguyen1996 Mar 5, 2021
24498d5
Merge branch 'rc-3.0-bng'
duongnguyen1996 Mar 8, 2021
3f1e2d1
Thanh toán qua POS VCB
duongnguyen1996 Mar 8, 2021
e3121ab
Thanh toán qua POS VCB
duongnguyen1996 Mar 10, 2021
41a3876
API tạo giao dịch thanh toán, Xác nhận thanh toán, Hủy thanh toán
duongnguyen1996 Mar 11, 2021
17e8d02
API hủy thanh toán
duongnguyen1996 Mar 12, 2021
44e4667
API Hủy thanh toán
duongnguyen1996 Mar 12, 2021
caf1161
Merge branch 'rc-3.0-bng' of http://hanoi.fds.vn:9999/opencpsv2/inter…
duongnguyen1996 Mar 26, 2021
f8eea51
API Hủy thanh toán
duongnguyen1996 Mar 26, 2021
74eb6a1
add
phucptit1991 Apr 4, 2021
083b693
Map dữ liệu Mofa2
duongnguyen1996 Apr 6, 2021
adb4019
add
phucptit1991 Apr 7, 2021
402a771
Mapping dữ liệu đẩy thêm cho PMNV Mofa2
duongnguyen1996 Apr 8, 2021
43839bb
add
phucptit1991 Apr 11, 2021
42cb15c
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/phuc…
phucptit1991 Apr 11, 2021
dea11cc
add
phucptit1991 Apr 14, 2021
4b7efb6
Tạo file theo Eforms
duongnguyen1996 Apr 19, 2021
6c1567d
KeypayV3
duongnguyen1996 Apr 28, 2021
8576cdf
Fix keyPay, văn bản hành chính
duongnguyen1996 Apr 28, 2021
4ed7075
add
phucptit1991 Apr 29, 2021
b5f336f
Fix log
duongnguyen1996 May 3, 2021
4634487
Fix log
duongnguyen1996 May 3, 2021
eacfa37
Merge branch 'POS-BNG-3.0' of http://hanoi.fds.vn:9999/duongnt/intern…
duongnguyen1996 May 3, 2021
299ef0e
Merge branch 'POS-BNG-3.0' of http://hanoi.fds.vn:9999/duongnt/intern…
duongnguyen1996 May 3, 2021
64c0436
add
phucptit1991 May 6, 2021
8178eed
Merge branch 'mofa2-3.0' into 'rc-3.0-bng'
May 10, 2021
f89815c
add
phucptit1991 May 17, 2021
fefe400
fix loi bao cao type 14, 16
phucptit1991 May 24, 2021
6bb5094
Merge branch 'rc-3.0-bxd_fix_baocao_type1416' into 'rc-3.0-bxd'
May 24, 2021
4d0caa4
quan ly api va thong ke truy cap
phucptit1991 May 27, 2021
3170ae8
add
phucptit1991 Jun 3, 2021
956de07
add
phucptit1991 Jun 3, 2021
f9cab86
add
phucptit1991 Jun 3, 2021
d5d8fd9
add
phucptit1991 Jun 3, 2021
fe735a2
a
phucptit1991 Jun 4, 2021
fda1ce6
add
phucptit1991 Jun 4, 2021
11cb895
add
phucptit1991 Jun 7, 2021
01b67fc
add
phucptit1991 Jun 7, 2021
d84ea46
add
phucptit1991 Jun 7, 2021
3fa13e3
thong ke api
phucptit1991 Jun 8, 2021
ed5f95b
bctk
phucptit1991 Jun 9, 2021
eb6212f
thong ke bao cao moi cho dvc bxd
phucptit1991 Jun 11, 2021
d7fa200
bao cao moi thong ke cho dvc bxd
phucptit1991 Jun 11, 2021
b0b8b43
Merge branch 'rc-3.0-bxd_fix_thongkecongdvc' into 'rc-3.0-bxd'
Jun 11, 2021
33f51f0
add
phucptit1991 Jun 14, 2021
68433ed
API: Nhận thông báo thuế, Nhận Chứng từ thuế
duongnguyen1996 Jun 14, 2021
3002c0c
add
phucptit1991 Jun 15, 2021
64c15b3
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jun 16, 2021
3ee9a9a
add
phucptit1991 Jun 16, 2021
a47c43a
Merge branch 'rc-3.0-dongthap_quanly_api' into 'rc-3.0-dongthap'
Jun 16, 2021
d64c05f
Tính lại count cho menuConfig
duongnguyen1996 Jun 16, 2021
91e9177
Merge branch 'rc-3.0-dongthap'
duongnguyen1996 Jun 16, 2021
dc57358
add
phucptit1991 Jun 16, 2021
554216b
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jun 17, 2021
bf10aed
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jun 18, 2021
5ad2f96
Merge branch 'release-candidate-3.0' of http://119.17.200.66:9999/ope…
phucptit1991 Jun 18, 2021
2c303f9
Fix build service
duongnguyen1996 Jun 18, 2021
71381f2
Merge branch 'quanlygiayphep-3.0' into 'rc-3.0-dongthap'
Jun 18, 2021
69b23c2
tables
duongnguyen1996 Jun 18, 2021
2bc3a13
tables
duongnguyen1996 Jun 18, 2021
f51c55b
Merge branch 'quanlygiayphep-3.0' into 'rc-3.0-dongthap'
Jun 18, 2021
0403aac
Merge branch 'release-candidate-3.0' into 'rc-3.0-dongthap'
Jun 18, 2021
33d79a0
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jun 18, 2021
a07b74b
MERGE CODE 3.0
duongnguyen1996 Jun 18, 2021
18ad3da
Merge branch 'release-candidate-3.0' of http://119.17.200.66:9999/ope…
phucptit1991 Jun 20, 2021
c36a483
fixloi in bien lai dien tu
phucptit1991 Jun 20, 2021
8f8ec04
fix conflict
phucptit1991 Jun 20, 2021
a39640e
Merge branch 'rc-3.0-bxd_fixloi_inbienlaidientu' into 'rc-3.0-bxd'
Jun 20, 2021
fb8d356
Merge branch 'rc-3.0-bxd' into 'release-candidate-3.0'
Jun 20, 2021
faae2b2
Fix build Service
duongnguyen1996 Jun 20, 2021
ed1a601
Fix build Service
duongnguyen1996 Jun 20, 2021
49a8458
Fix build Service
duongnguyen1996 Jun 20, 2021
b37d3cb
Merge branch 'build-service-3.0' into 'release-candidate-3.0'
Jun 20, 2021
bd9e34b
Mapping QLDC
Jun 20, 2021
53baa49
add
phucptit1991 Jun 20, 2021
cc62999
Merge branch 'release-candidate-3.0' of http://119.17.200.66:9999/ope…
phucptit1991 Jun 20, 2021
ac6d008
Fix QLCD
Jun 20, 2021
adf0a29
Merge branch 'rc-3.0-haugiang_cauhinhdong_inHDDT' into 'rc-3.0-haugiang'
Jun 20, 2021
34c176f
Merge branch 'rc-3.0-haugiang' into 'release-candidate-3.0'
Jun 20, 2021
6f6301b
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jun 21, 2021
6fd10d6
Add QLDC Dong Thap
Jun 21, 2021
29303b9
Merge remote-tracking branch 'origin/release-candidate-3.0' into rele…
Jun 21, 2021
132c6f6
Fix đính kèm kho tài liệu công dân
duongnguyen1996 Jun 21, 2021
170261f
Merge branch 'release-candidate-3.0'
duongnguyen1996 Jun 21, 2021
be63e9a
Fix QLDC DT
Jun 21, 2021
8b97cd2
Merge branch 'release-candidate-3.0'
duongnguyen1996 Jun 21, 2021
e10e7ab
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jun 21, 2021
58c75b9
Fix QLDC HG
Jun 21, 2021
d3cf733
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jun 21, 2021
49227ec
Fix QLDC HG
Jun 21, 2021
0fbcdc6
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jun 21, 2021
0613977
Fix import
duongnguyen1996 Jun 21, 2021
241b3c3
Fix import quản trị
duongnguyen1996 Jun 21, 2021
0021f99
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jun 21, 2021
9667793
Merge branch 'quanlygiayphep-3.0' into 'rc-3.0-dongthap'
Jun 21, 2021
486c7aa
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jun 21, 2021
add2d81
add
phucptit1991 Jun 22, 2021
8356072
Merge branch 'release-candidate-3.0' of http://119.17.200.66:9999/ope…
phucptit1991 Jun 22, 2021
21cd37a
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jun 22, 2021
ac2e4c3
Viết API SupportSearch
Jun 22, 2021
129032b
Tạo job thuế DVCQG
duongnguyen1996 Jun 23, 2021
47a4677
add
phucptit1991 Jun 24, 2021
3e943b5
Api support search trao đổi dịch vụ công và một cửa
Jun 24, 2021
402d155
Merge branch 'job-dvcqg-3.0' into 'rc-3.0-dongthap'
Jun 24, 2021
130778c
Cấu hình config job
duongnguyen1996 Jun 24, 2021
4ccb614
Import thủ tục hành chính, xóa thủ tục cũ nếu không có quy trình
duongnguyen1996 Jun 24, 2021
dbc5b7d
Merge branch 'job-dvcqg-3.0' into 'rc-3.0-dongthap'
Jun 24, 2021
de9abaa
Merge branch 'quanlygiayphep-3.0' into 'rc-3.0-dongthap'
Jun 24, 2021
5bd1ccf
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jun 24, 2021
2fceb16
Thêm DossierFIle vào API SupportSearch
Jun 25, 2021
9d7b4fb
Sửa lại groupId API SupportSearch
Jun 25, 2021
3802e7a
Bỏ type và isCallAgain trong SupportSearch API
Jun 25, 2021
42ce2b5
Merge branch 'release-candidate-3.0' into 'release-candidate-3.0'
Jun 25, 2021
15838a3
Import thủ tục hành chính, xóa thủ tục cũ nếu không có quy trình
duongnguyen1996 Jun 25, 2021
50456da
Merge branch 'import-quantri-3.0' into 'release-candidate-3.0'
Jun 25, 2021
6fdc75e
Import thủ tục hành chính, xóa thủ tục cũ nếu không có quy trình.
duongnguyen1996 Jun 27, 2021
73f5f26
Import thủ tục hành chính, xóa thủ tục cũ nếu không có quy trình.
duongnguyen1996 Jun 27, 2021
4228499
Merge branch 'thutuc-3.0' into 'release-candidate-3.0'
Jun 27, 2021
5fc63c1
Merge branch 'rc-3.0-bng'
duongnguyen1996 Jun 27, 2021
b7da154
Fix BNG ko dung duoc RestTemplate -> Http
duongnguyen1996 Jun 27, 2021
acd6e01
Fix thanh toán qua máy POS
duongnguyen1996 Jun 28, 2021
341c772
Sửa lại ActionCode, trả về dossier rỗng và định dạng ngày tháng API S…
Jun 28, 2021
b784530
Fix thanh toán qua máy POS
duongnguyen1996 Jun 28, 2021
aea6919
Merge branch 'bng-3.0-27062021' of http://hanoi.fds.vn:9999/duongnt/i…
duongnguyen1996 Jun 28, 2021
2873700
add
phucptit1991 Jun 28, 2021
8862a25
Merge branch 'thutuc-3.0' into 'rc-3.0-bng'
Jun 28, 2021
24055dd
Merge branch 'rc-3.0-bng' into 'release-candidate-3.0'
Jun 28, 2021
2184459
Thêm thuộc tính cho Dossier, sửa lại lỗi 403 khi send request APi Sup…
Jun 28, 2021
6029e4f
fix loi in bien nhan
phucptit1991 Jun 29, 2021
449426f
Thêm một số thuộc tính cho đầu API SupportSearch
Jun 29, 2021
2dea85c
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jun 30, 2021
41f39c9
Đính kèm file từ kho tài liệu công dân (DVC)
duongnguyen1996 Jun 30, 2021
399c9da
Add sequence for QLVB HG
Jun 30, 2021
2526563
Đính kèm file từ kho tài liệu công dân (DVC)
duongnguyen1996 Jun 30, 2021
8f6d1a4
Đặt log check lỗi
duongnguyen1996 Jul 1, 2021
3c77b96
Fix lỗi insert log
duongnguyen1996 Jul 1, 2021
538aa28
Merge branch 'rc-3.0-haugiang_fixloi_inbiennhan' into 'rc-3.0-haugiang'
Jul 1, 2021
146883f
Merge branch 'dvcqg-3.0' into 'release-candidate-3.0'
Jul 1, 2021
b2916b9
Merge branch 'haugiang-3.0' into 'rc-3.0-dongthap'
Jul 1, 2021
90d8b61
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jul 1, 2021
c6ffc06
Merge branch 'rc-3.0-haugiang' into 'release-candidate-3.0'
Jul 1, 2021
aa3d4dd
Merge branch 'release-candidate-3.0' into 'release-candidate-3.0'
Jul 1, 2021
6c56a4a
API lấy Count trong Scheduler và Cập nhật Count trong Scheduler
Jul 1, 2021
dd7bbfe
Thêm synchronized lỗi sinh mã hồ sơ trùng
duongnguyen1996 Jul 1, 2021
078b388
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jul 1, 2021
add9b30
Remove mic log
Jul 2, 2021
4808e36
Merge remote-tracking branch 'origin/release-candidate-3.0' into rele…
Jul 2, 2021
f9a5c45
Chuyển supportsearch sang method riêng, thêm đầu API cập nhật Email c…
Jul 2, 2021
539f2d9
Sửa lại thời gian 30 ngày cho UpdateEmail User
Jul 2, 2021
eb3805f
Đặt log check lỗi sau khi dossierSync update lại Pending dossierActi…
duongnguyen1996 Jul 5, 2021
1ac952b
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jul 5, 2021
3caed70
add
phucptit1991 Jul 5, 2021
c7c5c1b
Merge branch 'rc-3.0-haugiang_push_dossierfile_to_applicantData' into…
Jul 5, 2021
3013aff
Merge branch 'rc-3.0-haugiang' into 'release-candidate-3.0'
Jul 5, 2021
6c567fa
Fix search ngày cấp cho quản lý giấy phép
duongnguyen1996 Jul 5, 2021
b064244
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jul 5, 2021
472fcec
Merge branch 'release-candidate-3.0' into 'release-candidate-3.0'
Jul 6, 2021
6229ad8
Fix bug register user
Jul 6, 2021
89a073a
Merge remote-tracking branch 'origin/release-candidate-3.0' into rele…
Jul 6, 2021
3dd4757
Fix search ngày cấp cho quản lý giấy phép
duongnguyen1996 Jul 6, 2021
2b7777e
Fix bug register user 2
Jul 6, 2021
f4427da
Fix sinh giấy phép theo quy trình
duongnguyen1996 Jul 7, 2021
7ff34b7
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jul 7, 2021
0ce1d94
Tắt log
duongnguyen1996 Jul 7, 2021
f441945
Fix bug không lấy đc danh sách dossierMark
duongnguyen1996 Jul 8, 2021
83c0899
Fix bug scheduler not running
Jul 8, 2021
0696940
Fix bug không lấy đc danh sách dossierMark
duongnguyen1996 Jul 8, 2021
0ba321a
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jul 8, 2021
f29fae4
Merge branch 'hotfix-bng-3.0' into 'release-candidate-3.0'
Jul 8, 2021
80e3c4e
Cài đặt tra cứu hồ sơ trên Zalo
Jul 9, 2021
5f9cb77
merge
Jul 9, 2021
4dab2b8
Chỉnh sửa lại trả lời tin nhắn zalo
Jul 9, 2021
dc17864
Fix bug thông báo thuế + job DoAction + alter table opencps_dossier_t…
duongnguyen1996 Jul 11, 2021
92d08ca
Fix bug change call http and https
Jul 12, 2021
0082c25
Sửa lại cú pháp tra cứu hồ sơ Zalo
Jul 12, 2021
dee6ea3
Sửa nội dung tin nhắn Zalo
Jul 12, 2021
80b9813
Merge branch 'hotfix-bng-3.0' into 'rc-3.0-dongthap'
Jul 12, 2021
fbeff6a
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jul 12, 2021
fedac26
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jul 12, 2021
8e85715
Tắt log
duongnguyen1996 Jul 12, 2021
54ae7cc
Fix log
duongnguyen1996 Jul 13, 2021
f0be3ed
Merge branch 'job-dvcqg-3.0' into 'rc-3.0-dongthap'
Jul 13, 2021
3ae8ba2
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jul 13, 2021
a6e5b2d
Merge branch 'dvcqg-3.0' into 'rc-3.0-dongthap'
Jul 13, 2021
65860a5
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
duongnguyen1996 Jul 13, 2021
75803cf
Fix comment log
duongnguyen1996 Jul 13, 2021
869cd9a
Merge branch 'dvcqg-3.0' into 'rc-3.0-dongthap'
Jul 13, 2021
baae307
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jul 13, 2021
92ac406
Cấu hình thông tin vào phần ServerConfig của tra cứu Zalo
Jul 13, 2021
38b7583
fix version
duongnguyen1996 Jul 13, 2021
14d345a
Merge branch 'dvcqg-3.0' into 'rc-3.0-dongthap'
Jul 13, 2021
df8356b
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jul 13, 2021
e8de97f
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jul 13, 2021
0e0c4cc
Add log pgi
Jul 13, 2021
5f07054
Báo cáo Hồ sơ tạm dừng bổ sung điều kiện
duongnguyen1996 Jul 13, 2021
2253305
Merge branch 'baocao-3.0' into 'rc-3.0-dongthap'
Jul 13, 2021
e3e92e4
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jul 14, 2021
2d06c85
update bnd file
Jul 14, 2021
e8dea7f
Merge branch 'release-candidate-3.0' into 'release-candidate-3.0'
Jul 14, 2021
ed3ee31
Merge branch 'release-candidate-3.0' of http://hanoi.fds.vn:9999/open…
Jul 15, 2021
24a3703
API Cập nhật State, Retry cho Table PublishQueue và DossierSync
Jul 19, 2021
051f487
Sủa lại pg , ds
Jul 19, 2021
97a48a3
Merge branch 'release-candidate-3.0' into 'release-candidate-3.0'
Jul 19, 2021
1dfad92
Merge branch 'rc-3.0-dongthap' into 'release-candidate-3.0'
Jul 19, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Sủa lại pg , ds
  • Loading branch information
vietdd committed Jul 19, 2021
commit 051f4876f5a3db4ec948c13b002c32e5b3683b55
Original file line number Diff line number Diff line change
@@ -138,7 +138,7 @@ public Response getSupportSearchDossiers(HttpServletRequest request, HttpHeaders
@Override
public Response resetStateRetry(HttpServletRequest request, HttpHeaders header, Company company, Locale locale, User user, ServiceContext serviceContext, long id, int status, String table) {

if(table.equalsIgnoreCase(OPENCPS_DOSSIERSYNC)) {
if(table.equalsIgnoreCase(OPENCPS_PUBLISH_QUEUE)) {
PublishQueue publishQueue = null;
try {
publishQueue = PublishQueueLocalServiceUtil.getPublishQueue(id);
@@ -157,7 +157,7 @@ public Response resetStateRetry(HttpServletRequest request, HttpHeaders header,
return BusinessExceptionImpl.processException(e);
}
}
} else if(table.equalsIgnoreCase(OPENCPS_PUBLISH_QUEUE)) {
} else if(table.equalsIgnoreCase(OPENCPS_DOSSIERSYNC)) {
DossierSync dossierSync = null;
try {
dossierSync = DossierSyncLocalServiceUtil.getDossierSync(id);