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
546ec2de
Commit
546ec2de
authored
Dec 23, 2021
by
龙于生
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增是否签字字段和签字图片字段
parent
2771cd5f
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
4 deletions
+18
-4
src/main/java/cn/timer/api/bean/spmk/SpmkExecutor.java
+4
-0
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+4
-2
src/main/java/cn/timer/api/dto/spmk/ApprovingDto.java
+3
-0
src/main/java/cn/timer/api/dto/spmk/User.java
+2
-0
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+2
-1
src/main/resources/mapping/spmk/SpmkExecutorMapper.xml
+3
-1
No files found.
src/main/java/cn/timer/api/bean/spmk/SpmkExecutor.java
View file @
546ec2de
...
...
@@ -69,4 +69,7 @@ public class SpmkExecutor extends Model<SpmkExecutor> {
@ApiModelProperty
(
value
=
"创建时间 "
,
example
=
"创建时间"
)
private
Date
updateTime
;
@ApiModelProperty
(
value
=
"签字图片 "
,
example
=
"签字图片"
)
private
String
signatureImg
;
}
\ No newline at end of file
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
546ec2de
...
...
@@ -13,6 +13,7 @@ import cn.timer.api.dao.spmk.*;
import
cn.timer.api.dto.spmk.*
;
import
cn.timer.api.utils.redis.RedisUtil
;
import
com.baomidou.mybatisplus.core.toolkit.SerializationUtils
;
import
net.sf.json.JSON
;
import
net.sf.json.JSONArray
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -332,7 +333,7 @@ public class SpmkController {
@ApiOperation
(
value
=
"11.查询列表-审批组-个人审批"
,
httpMethod
=
"GET"
,
notes
=
"查询列表-审批组-个人审批"
)
@ApiOperationSupport
(
order
=
11
)
public
Result
<
Object
>
selectListAg
(
@CurrentUser
UserBean
userBean
){
List
<
SpmkApprovalG
>
spmkApprovalGS
=
spmkService
.
selectListAg
(
userBean
);
return
ResultUtil
.
data
(
spmkService
.
selectListAg
(
userBean
));
}
...
...
@@ -806,7 +807,8 @@ public class SpmkController {
approvingDto
.
getExecutorId
(),
approvingDto
.
getOpinion
(),
approvingDto
.
getSts
(),
approvingDto
.
getUser
()
approvingDto
.
getUser
(),
approvingDto
.
getSignatureImg
()
);
// 更新 flowChildren
...
...
src/main/java/cn/timer/api/dto/spmk/ApprovingDto.java
View file @
546ec2de
...
...
@@ -37,4 +37,7 @@ public class ApprovingDto {
@ApiModelProperty
(
value
=
"被转派人 "
,
example
=
"对象"
)
private
User
user
;
@ApiModelProperty
(
value
=
"签字图片 "
,
example
=
"签字图片"
)
private
String
signatureImg
;
}
src/main/java/cn/timer/api/dto/spmk/User.java
View file @
546ec2de
...
...
@@ -26,4 +26,6 @@ public class User implements Serializable{
private
String
headUrl
;
private
Integer
signature
;
}
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
546ec2de
...
...
@@ -536,7 +536,7 @@ public class RouterUtils {
* @param opinion 意见
* @param sts 状态 1执行中 2通过 3拒绝
*/
public
static
void
approving
(
List
<
FlowChildren
>
listFlowChildren
,
Integer
asId
,
Integer
executeRecordId
,
Integer
executorId
,
String
opinion
,
Integer
sts
,
User
redeployUser
)
throws
Exception
{
public
static
void
approving
(
List
<
FlowChildren
>
listFlowChildren
,
Integer
asId
,
Integer
executeRecordId
,
Integer
executorId
,
String
opinion
,
Integer
sts
,
User
redeployUser
,
String
signatureImg
)
throws
Exception
{
boolean
hasNextApprover
=
false
;
...
...
@@ -563,6 +563,7 @@ public class RouterUtils {
.
executorName
(
listUser
.
get
(
i_user
).
getName
())
.
operatorHeaderUrl
(
listUser
.
get
(
i_user
).
getHeadUrl
())
.
sts
(
sts
)
.
signatureImg
(
signatureImg
)
.
build
()
.
updateById
();
listUser
.
get
(
i_user
).
setExecute
(
EXECUTED
);
...
...
src/main/resources/mapping/spmk/SpmkExecutorMapper.xml
View file @
546ec2de
...
...
@@ -13,6 +13,7 @@
<result
column=
"sts"
property=
"sts"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
<result
column=
"signature_img"
property=
"signatureImg"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -24,7 +25,8 @@
opinion,
sts,
create_time,
update_time
update_time,
signature_img,
</sql>
<sql
id=
"Base_Column_List_Alias"
>
...
...
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