Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
dc6320a5
Commit
dc6320a5
authored
Jul 15, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加照片海康下载
parent
a74e3019
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java
...com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java
+2
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
.../com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
+2
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java
...xhx/module/feedback/service/impl/FeedbackServiceImpl.java
+13
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java
View file @
dc6320a5
...
@@ -105,14 +105,14 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
...
@@ -105,14 +105,14 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
}
}
if
(
ObjectUtils
.
isEmpty
(
personRest
.
getData
()))
if
(
ObjectUtils
.
isEmpty
(
personRest
.
getData
()))
throw
new
AppException
(
REGISTER_AUTH_FAIL
,
"不存在当前匹配的钉钉关联
用户!"
);
throw
new
AppException
(
1012
,
"未找到响应的钉钉
用户!"
);
//根据钉钉的用户查询系统绑定的用户,获取
//根据钉钉的用户查询系统绑定的用户,获取
UserQuery
userQuery
=
new
UserQuery
();
UserQuery
userQuery
=
new
UserQuery
();
userQuery
.
setDingUserId
(
personRest
.
getData
());
userQuery
.
setDingUserId
(
personRest
.
getData
());
userEntity
=
userService
.
selectOne
(
userQuery
);
userEntity
=
userService
.
selectOne
(
userQuery
);
if
(
ObjectUtils
.
isEmpty
(
userEntity
))
{
if
(
ObjectUtils
.
isEmpty
(
userEntity
))
{
ret
.
put
(
"openId"
,
personRest
.
getData
());
ret
.
put
(
"openId"
,
personRest
.
getData
());
throw
new
AppException
(
REGISTER_AUTH_FAIL
,
"不存在当前匹配的钉钉关联用户!"
);
throw
new
AppException
(
REGISTER_AUTH_FAIL
,
"不存在当前匹配的钉钉关联用户
2
!"
);
}
}
data
.
put
(
"id"
,
userEntity
.
getId
());
data
.
put
(
"id"
,
userEntity
.
getId
());
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
View file @
dc6320a5
...
@@ -23,4 +23,6 @@ public class FeedbackVo extends BaseEntityLong {
...
@@ -23,4 +23,6 @@ public class FeedbackVo extends BaseEntityLong {
private
Long
feedbackId
;
private
Long
feedbackId
;
/** 反馈状态 */
/** 反馈状态 */
private
Integer
backStatus
;
private
Integer
backStatus
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java
View file @
dc6320a5
package
com.mortals.xhx.module.feedback.service.impl
;
package
com.mortals.xhx.module.feedback.service.impl
;
import
cn.hutool.core.date.DateUtil
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.Result
;
import
com.mortals.framework.model.Result
;
import
com.mortals.xhx.module.feedback.model.*
;
import
com.mortals.xhx.module.feedback.model.*
;
...
@@ -37,6 +38,18 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
...
@@ -37,6 +38,18 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
@Autowired
@Autowired
private
FeedbackStaffService
feedbackStaffService
;
private
FeedbackStaffService
feedbackStaffService
;
@Override
protected
void
findAfter
(
FeedbackEntity
entity
,
Context
context
,
List
<
FeedbackEntity
>
list
)
throws
AppException
{
list
.
stream
().
forEach
(
item
->{
Date
feedbackTimeStart
=
item
.
getFeedbackTimeStart
();
Date
feedbackTimeEnd
=
item
.
getFeedbackTimeEnd
();
// if(DateUtil.compare())
});
}
@Override
@Override
protected
void
saveBefore
(
FeedbackEntity
entity
,
Context
context
)
throws
AppException
{
protected
void
saveBefore
(
FeedbackEntity
entity
,
Context
context
)
throws
AppException
{
super
.
saveBefore
(
entity
,
context
);
super
.
saveBefore
(
entity
,
context
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment