Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
竹天卫
tianjin-cement
Commits
516822b9
Commit
516822b9
authored
Oct 15, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改会议纪要提出的问题
parent
8f760b2f
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
4 deletions
+19
-4
TeamMapper.xml
...java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
+1
-1
StandardServiceImpl.java
.../sc/cement/business/service/impl/StandardServiceImpl.java
+1
-1
TeamGroupServiceImpl.java
...sc/cement/business/service/impl/TeamGroupServiceImpl.java
+1
-1
TeamServiceImpl.java
...wise/sc/cement/business/service/impl/TeamServiceImpl.java
+16
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
View file @
516822b9
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
left join team_group tg on tg.id = t.group_id
left join team_group tg on tg.id = t.group_id
left join method m on m.id = t.method_id
left join method m on m.id = t.method_id
<include
refid=
"where"
/>
<include
refid=
"where"
/>
ORDER BY t.id
DE
SC
ORDER BY t.id
A
SC
</select>
</select>
<select
id=
"exportList"
resultType=
"java.util.HashMap"
>
<select
id=
"exportList"
resultType=
"java.util.HashMap"
>
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java
View file @
516822b9
...
@@ -77,7 +77,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
...
@@ -77,7 +77,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
if
(
StringUtils
.
isNotEmpty
(
supplierName
))
{
if
(
StringUtils
.
isNotEmpty
(
supplierName
))
{
qw
.
like
(
"supplier_name"
,
supplierName
);
qw
.
like
(
"supplier_name"
,
supplierName
);
}
}
qw
.
orderByDesc
(
"
create_ti
me"
);
qw
.
orderByDesc
(
"
na
me"
);
IPage
<
Standard
>
page
=
new
Page
<>(
pageQuery
.
getPageNo
(),
pageQuery
.
getPageSize
());
IPage
<
Standard
>
page
=
new
Page
<>(
pageQuery
.
getPageNo
(),
pageQuery
.
getPageSize
());
page
=
standardMapper
.
selectPage
(
page
,
qw
);
page
=
standardMapper
.
selectPage
(
page
,
qw
);
return
BaseResponse
.
okData
(
page
);
return
BaseResponse
.
okData
(
page
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamGroupServiceImpl.java
View file @
516822b9
...
@@ -49,7 +49,7 @@ public class TeamGroupServiceImpl extends ServiceImpl<TeamGroupMapper, TeamGroup
...
@@ -49,7 +49,7 @@ public class TeamGroupServiceImpl extends ServiceImpl<TeamGroupMapper, TeamGroup
if
(
StringUtils
.
isNotEmpty
(
name
)){
if
(
StringUtils
.
isNotEmpty
(
name
)){
qw
.
like
(
"name"
,
name
);
qw
.
like
(
"name"
,
name
);
}
}
qw
.
orderBy
Desc
(
"create_time
"
);
qw
.
orderBy
Asc
(
"id
"
);
IPage
<
TeamGroup
>
page
=
new
Page
<>(
pageQuery
.
getPageNo
(),
pageQuery
.
getPageSize
());
IPage
<
TeamGroup
>
page
=
new
Page
<>(
pageQuery
.
getPageNo
(),
pageQuery
.
getPageSize
());
page
=
teamGroupMapper
.
selectPage
(
page
,
qw
);
page
=
teamGroupMapper
.
selectPage
(
page
,
qw
);
return
BaseResponse
.
okData
(
page
);
return
BaseResponse
.
okData
(
page
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java
View file @
516822b9
...
@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.service.impl;
...
@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.service.impl;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.wise.sc.cement.business.entity.Team
;
import
cn.wise.sc.cement.business.entity.Team
;
import
cn.wise.sc.cement.business.entity.TeamGroup
;
import
cn.wise.sc.cement.business.exception.BusinessExceptionEnum
;
import
cn.wise.sc.cement.business.exception.BusinessExceptionEnum
;
import
cn.wise.sc.cement.business.mapper.TeamMapper
;
import
cn.wise.sc.cement.business.mapper.TeamMapper
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
...
@@ -87,6 +88,12 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
...
@@ -87,6 +88,12 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
if
(
query
.
getIsDisplay
()
!=
1
&&
query
.
getIsDisplay
()
!=
0
){
if
(
query
.
getIsDisplay
()
!=
1
&&
query
.
getIsDisplay
()
!=
0
){
return
BaseResponse
.
errorMsg
(
"委托是否可见参数错误"
);
return
BaseResponse
.
errorMsg
(
"委托是否可见参数错误"
);
}
}
QueryWrapper
<
Team
>
qw
=
new
QueryWrapper
<>();
qw
.
eq
(
"name"
,
query
.
getName
());
int
count
=
teamMapper
.
selectCount
(
qw
);
if
(
count
>
0
)
{
return
BaseResponse
.
errorMsg
(
query
.
getName
()
+
"已存在"
);
}
BeanUtils
.
copyProperties
(
query
,
create
);
BeanUtils
.
copyProperties
(
query
,
create
);
create
.
setStatus
(
1
).
setCreateTime
(
LocalDateTime
.
now
());
create
.
setStatus
(
1
).
setCreateTime
(
LocalDateTime
.
now
());
teamMapper
.
insert
(
create
);
teamMapper
.
insert
(
create
);
...
@@ -111,10 +118,18 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
...
@@ -111,10 +118,18 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
if
(
query
.
getMethodId
()
==
null
){
if
(
query
.
getMethodId
()
==
null
){
return
BaseResponse
.
errorMsg
(
"请选择检依据"
);
return
BaseResponse
.
errorMsg
(
"请选择检依据"
);
}
}
QueryWrapper
<
Team
>
qw
=
new
QueryWrapper
<>();
qw
.
eq
(
"name"
,
query
.
getName
());
qw
.
ne
(
"id"
,
query
.
getId
());
int
count
=
teamMapper
.
selectCount
(
qw
);
if
(
count
>
0
)
{
return
BaseResponse
.
errorMsg
(
query
.
getName
()
+
"已存在"
);
}
update
.
setGroupId
(
query
.
getGroupId
())
update
.
setGroupId
(
query
.
getGroupId
())
.
setMethodId
(
query
.
getMethodId
())
.
setMethodId
(
query
.
getMethodId
())
.
setName
(
query
.
getName
())
.
setName
(
query
.
getName
())
.
setIsDisplay
(
query
.
getIsDisplay
());
.
setIsDisplay
(
query
.
getIsDisplay
())
.
setQualifications
(
query
.
getQualifications
());
teamMapper
.
updateById
(
update
);
teamMapper
.
updateById
(
update
);
return
BaseResponse
.
okData
(
update
);
return
BaseResponse
.
okData
(
update
);
}
}
...
...
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