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
7403f169
Commit
7403f169
authored
4 years ago
by
tangzhaoqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
员工、审批bug
parent
0aaa12b6
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
36 additions
and
10 deletions
+36
-10
src/main/java/cn/timer/api/Application.java
+1
-1
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+1
-1
src/main/java/cn/timer/api/controller/yggl/service/YgglServiceImpl.java
+1
-1
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+8
-3
src/main/java/cn/timer/api/utils/router/business/RegularizationBusiness.java
+11
-2
src/main/java/cn/timer/api/utils/router/business/SpmkAssoBusinessFactory.java
+9
-1
src/main/resources/mapping/yggl/YgglMainEmpMapper.xml
+5
-1
No files found.
src/main/java/cn/timer/api/Application.java
View file @
7403f169
...
...
@@ -18,7 +18,7 @@ import org.springframework.web.filter.CorsFilter;
import
cn.hutool.core.net.NetUtil
;
@MapperScan
(
"cn.timer.api.dao"
)
// 扫描的mapper
@MapperScan
(
{
"cn.timer.api.dao"
}
)
// 扫描的mapper
@ComponentScan
(
basePackages
=
{
"cn.timer.api"
})
@SpringBootApplication
@EnableScheduling
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
7403f169
...
...
@@ -671,7 +671,7 @@ public class SpmkController {
jSONObject
.
set
(
"approveId"
,
FromData
.
builder
().
value
(
String
.
valueOf
(
asId
)));
//审批完成后 业务
SpmkAssoBusiness
sab
=
SpmkAssoBusinessFactory
.
createSpmkAssoType
(
ApproveEnum
.
getEnums
(
aSummary
.
getAssoType
()));
SpmkAssoBusiness
sab
=
SpmkAssoBusinessFactory
.
getFactory
().
createSpmkAssoType
(
ApproveEnum
.
getEnums
(
aSummary
.
getAssoType
()));
if
(
sab
!=
null
)
sab
.
handleApprove
(
jSONObject
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/yggl/service/YgglServiceImpl.java
View file @
7403f169
...
...
@@ -98,7 +98,7 @@ public class YgglServiceImpl implements YgglService {
return
leaderId
;
}
p
rivate
ZzglBmgwM
getLeaderEmp
(
List
<
ZzglBmgwM
>
listBM
,
Integer
baseBmgwId
)
{
p
ublic
ZzglBmgwM
getLeaderEmp
(
List
<
ZzglBmgwM
>
listBM
,
Integer
baseBmgwId
)
{
ZzglBmgwM
zzglBmgwM
=
baseBmgwId
!=
null
?
CollUtil
.
getFirst
(
listBM
.
stream
()
.
filter
(
bM
->
bM
.
getId
().
equals
(
baseBmgwId
)).
collect
(
Collectors
.
toList
()))
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
7403f169
...
...
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.convert.ConvertException
;
import
cn.hutool.core.lang.Console
;
...
...
@@ -420,10 +421,14 @@ public class RouterUtils {
for
(
int
i
=
0
,
n
=
listFlowChildren
.
size
();
i
<
n
;
i
++)
{
// 新增 执行人
List
<
User
>
listUser
=
listFlowChildren
.
get
(
i
).
getRelation
().
get
(
0
).
getUsers
();
if
(
EXECUTED
.
equals
(
listFlowChildren
.
get
(
i
).
getExecute
()))
{
List
<
User
>
listUser
=
CollUtil
.
toList
();
List
<
Relation
>
listR
=
listFlowChildren
.
get
(
i
).
getRelation
();
if
(
CollectionUtil
.
isNotEmpty
(
listR
))
{
listUser
=
listR
.
get
(
0
).
getUsers
();
}
}
else
if
(
EXECUTING
.
equals
(
listFlowChildren
.
get
(
i
).
getExecute
()))
{
if
(
EXECUTING
.
equals
(
listFlowChildren
.
get
(
i
).
getExecute
()))
{
for
(
int
i_user
=
0
,
n_user
=
listUser
.
size
();
i_user
<
n_user
;
i_user
++)
{
if
(
EXECUTED
.
equals
(
listUser
.
get
(
i_user
).
getExecute
()))
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/utils/router/business/RegularizationBusiness.java
View file @
7403f169
package
cn
.
timer
.
api
.
utils
.
router
.
business
;
import
java.
text.ParseException
;
import
java.
util.Date
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.json.JSONObject
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.controller.yggl.service.YgglService
;
import
cn.timer.api.dto.spmk.FromData
;
import
cn.timer.api.dto.yggl.YgzzDto
;
...
...
@@ -60,7 +63,13 @@ public class RegularizationBusiness extends SpmkAssoBusiness {
.
build
();
// 调 员工管理 业务
ygglService
.
applicationRegularization
(
ygzzDto
);
YgglMainEmp
.
builder
()
.
jobStatus
(
2
)
.
zzTime
(
ygzzDto
.
getZzTime
())
.
sjzzTime
(
new
Date
())
.
zzRemark
(
ygzzDto
.
getZzRemark
())
.
build
().
update
(
new
UpdateWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getEmpNum
,
ygzzDto
.
getEmpNum
()));
// ygglService.applicationRegularization(ygzzDto);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/utils/router/business/SpmkAssoBusinessFactory.java
View file @
7403f169
...
...
@@ -9,7 +9,15 @@ import cn.timer.api.utils.router.enums.ApproveEnum;
*/
public
class
SpmkAssoBusinessFactory
{
public
static
SpmkAssoBusiness
createSpmkAssoType
(
ApproveEnum
assotype
)
{
static
SpmkAssoBusinessFactory
factory
;
public
static
SpmkAssoBusinessFactory
getFactory
()
{
return
factory
==
null
?
new
SpmkAssoBusinessFactory
()
:
factory
;
}
public
SpmkAssoBusiness
createSpmkAssoType
(
ApproveEnum
assotype
)
{
SpmkAssoBusiness
sat
=
null
;
switch
(
assotype
)
{
case
DEFAULT:
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/yggl/YgglMainEmpMapper.xml
View file @
7403f169
...
...
@@ -133,7 +133,11 @@
a.job_status,
a.rz_time,
a.bmgw_id,
a.org_code
a.org_code,
a.zj_type,
a.zj_num,
a.syq
</sql>
<sql
id=
"Base_Column_List_Alias"
>
...
...
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