Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
4acd4af0
Commit
4acd4af0
authored
5 years ago
by
dengshichuan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dsc' into 'develop'
Dsc See merge request 8timerv2/8timerapiv200!27
parents
b3f28de6
4a71cc4a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
src/main/java/cn/timer/api/controller/dzht/DzhtController.java
+5
-2
src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
+2
-1
src/test/.gitignore
+1
-0
No files found.
src/main/java/cn/timer/api/controller/dzht/DzhtController.java
View file @
4acd4af0
...
@@ -232,8 +232,8 @@ public class DzhtController {
...
@@ -232,8 +232,8 @@ public class DzhtController {
list
.
add
(
map13
);
list
.
add
(
map13
);
return
ResultUtil
.
data
(
list
);
return
ResultUtil
.
data
(
list
);
}
}
final
static
String
savePath
=
"
E:\\esignHtmb
"
;
// 本地服务器文件保存路径
final
static
String
savePath
=
"
esignTemplate
"
;
// 本地服务器文件保存路径
final
static
String
APP_ID
=
ConfigConstant
.
PROJECT_ID
;
// 项目id
final
static
String
APP_ID
=
ConfigConstant
.
PROJECT_ID
;
// 项目id
final
static
String
APP_SECRET
=
ConfigConstant
.
PROJECT_SECRET
;
// 项目密码
final
static
String
APP_SECRET
=
ConfigConstant
.
PROJECT_SECRET
;
// 项目密码
// final static String RE_TOKEN = "8b58973c290cc848b67ff0017cd424ff";
// final static String RE_TOKEN = "8b58973c290cc848b67ff0017cd424ff";
...
@@ -680,6 +680,9 @@ public class DzhtController {
...
@@ -680,6 +680,9 @@ public class DzhtController {
@GetMapping
(
"/queryName"
)
@GetMapping
(
"/queryName"
)
@ApiOperation
(
value
=
"查员工名字"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"查员工名字"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
getName
(
@RequestParam
String
empNum
)
{
public
Result
<
Object
>
getName
(
@RequestParam
String
empNum
)
{
System
.
err
.
println
(
System
.
getProperty
(
"os.name"
));
System
.
err
.
println
(
System
.
getProperty
(
"os.arch"
));
System
.
err
.
println
(
System
.
getProperty
(
"os.version"
));
return
ResultUtil
.
data
(
YgglMainEmp
.
builder
().
build
()
return
ResultUtil
.
data
(
YgglMainEmp
.
builder
().
build
()
.
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
eq
(
"emp_num"
,
empNum
)).
getName
());
.
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
eq
(
"emp_num"
,
empNum
)).
getName
());
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
View file @
4acd4af0
...
@@ -192,7 +192,8 @@ public class DzhtController2 {
...
@@ -192,7 +192,8 @@ public class DzhtController2 {
@ApiOperation
(
value
=
"创建机构模板印章"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"创建机构模板印章"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
orgTemplate
(
@CurrentUser
UserBean
userBean
,
@RequestBody
DzhtAssoQyyz
qyyz
)
{
public
Result
<
Object
>
orgTemplate
(
@CurrentUser
UserBean
userBean
,
@RequestBody
DzhtAssoQyyz
qyyz
)
{
String
orgId
=
DzhtAssoQyzc
.
builder
().
build
().
selectOne
(
String
orgId
=
DzhtAssoQyzc
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
DzhtAssoQyzc
>().
eq
(
"third_party_user_id"
,
qyyz
.
getThirdPartyUserId
()).
select
(
"org_id"
))
// new QueryWrapper<DzhtAssoQyzc>().eq("third_party_user_id", qyyz.getThirdPartyUserId()).select("org_id"))
new
QueryWrapper
<
DzhtAssoQyzc
>().
eq
(
"org_code"
,
userBean
.
getOrgCode
()).
select
(
"org_id"
))
.
getOrgId
();
// 查询orgId
.
getOrgId
();
// 查询orgId
// String orgId = "dfd84b9a58d345ea90f6711bad853435";// 测试公司账户
// String orgId = "dfd84b9a58d345ea90f6711bad853435";// 测试公司账户
// 印章参数
// 印章参数
...
...
This diff is collapsed.
Click to expand it.
src/test/.gitignore
0 → 100644
View file @
4acd4af0
/java/
This diff is collapsed.
Click to expand it.
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