Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
Grievance
Commits
ee80aca7
Commit
ee80aca7
authored
1 year ago
by
shishir suman
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/UPHRH_7903_mobile_otp' into UPHRH_quartz_scheduler
parents
23c48b7e
16d5cb69
UPHRH_quartz_scheduler
No related merge requests found
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
src/main/java/org/upsmf/grievance/controller/SchedulerConfigController.java
+1
-1
...upsmf/grievance/controller/SchedulerConfigController.java
src/main/java/org/upsmf/grievance/controller/UserController.java
+2
-2
...n/java/org/upsmf/grievance/controller/UserController.java
src/main/java/org/upsmf/grievance/model/reponse/Response.java
+4
-0
...main/java/org/upsmf/grievance/model/reponse/Response.java
src/main/java/org/upsmf/grievance/scheduler/NightlyJobScheduler.java
+31
-11
...va/org/upsmf/grievance/scheduler/NightlyJobScheduler.java
src/main/java/org/upsmf/grievance/service/SearchService.java
+2
-0
src/main/java/org/upsmf/grievance/service/SearchService.java
src/main/java/org/upsmf/grievance/service/impl/IntegrationServiceImpl.java
+18
-11
.../upsmf/grievance/service/impl/IntegrationServiceImpl.java
src/main/java/org/upsmf/grievance/service/impl/SchedulerConfigServiceImpl.java
+4
-0
...mf/grievance/service/impl/SchedulerConfigServiceImpl.java
src/main/java/org/upsmf/grievance/service/impl/SearchServiceImpl.java
+39
-0
...a/org/upsmf/grievance/service/impl/SearchServiceImpl.java
src/main/java/org/upsmf/grievance/service/impl/TicketServiceImpl.java
+1
-2
...a/org/upsmf/grievance/service/impl/TicketServiceImpl.java
src/main/java/org/upsmf/grievance/util/ErrorCode.java
+3
-1
src/main/java/org/upsmf/grievance/util/ErrorCode.java
src/main/resources/templates/admin_create_ticket.vm
+1
-1
src/main/resources/templates/admin_create_ticket.vm
with
106 additions
and
29 deletions
+106
-29
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets