Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
liqin
chnmuseum-party
Commits
f83136b0
Commit
f83136b0
authored
Apr 26, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
1bfb1ded
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
7 deletions
+17
-7
TOrganMapper.java
src/main/java/cn/chnmuseum/party/mapper/TOrganMapper.java
+2
-0
TBoardStatisticServiceImpl.java
...museum/party/service/impl/TBoardStatisticServiceImpl.java
+6
-1
TOrganServiceImpl.java
...va/cn/chnmuseum/party/service/impl/TOrganServiceImpl.java
+4
-5
TOrganMapper.xml
src/main/resources/mapper/TOrganMapper.xml
+5
-1
No files found.
src/main/java/cn/chnmuseum/party/mapper/TOrganMapper.java
View file @
f83136b0
...
...
@@ -23,4 +23,6 @@ public interface TOrganMapper extends BaseMapper<TOrgan> {
TOrgan
selectCodeMax
(
String
parentId
);
List
<
TOrgan
>
getAllList
(
@Param
(
"org"
)
TOrgan
org
);
String
getArea
(
String
name
);
}
src/main/java/cn/chnmuseum/party/service/impl/TBoardStatisticServiceImpl.java
View file @
f83136b0
...
...
@@ -172,7 +172,12 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
areaCode
=
areaCode
.
substring
(
0
,
2
)+
"0100"
;
}
QueryWrapper
qw
=
new
QueryWrapper
();
if
(
areaCode
.
endsWith
(
"00"
))
{
qw
.
eq
(
"parent_id"
,
areaCode
);
}
else
{
qw
.
eq
(
"code"
,
areaCode
);
}
List
<
TArea
>
provlist
=
areaService
.
list
(
qw
);
TBoardSurvey
survey
=
new
TBoardSurvey
();
String
dateStr
=
DateUtil
.
getCurrentDate
(
"yyyyMM"
);
...
...
src/main/java/cn/chnmuseum/party/service/impl/TOrganServiceImpl.java
View file @
f83136b0
...
...
@@ -70,10 +70,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
HashMap
<
String
,
TOrgan
>
map1
=
new
HashMap
<>();
list1
.
stream
().
forEach
(
o
->
map1
.
put
(
o
.
getName
(),
o
));
HashMap
<
String
,
String
>
area
=
new
HashMap
<>();
List
<
Map
<
String
,
Object
>>
mapList
=
organMapper
.
selectArea
();
mapList
.
stream
().
forEach
(
m
->
area
.
put
(
m
.
get
(
"name"
).
toString
(),
m
.
get
(
"id"
).
toString
()));
// HashMap<String, String> area = new HashMap<>();
// List<Map<String, Object>> mapList = organMapper.selectArea();
// mapList.stream().forEach(m->area.put(m.get("name").toString(),m.get("id").toString()));
for
(
int
i
=
0
;
i
<
excelList
.
size
();
i
++)
{
Map
<
String
,
String
>
map
=
null
;
...
...
@@ -108,7 +107,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
}
String
organCode
=
getOrganCode
(
organ
.
getParentId
());
organ
.
setCode
(
organCode
);
organ
.
setAreaId
(
area
.
get
(
map
.
get
(
"区域"
)));
organ
.
setAreaId
(
organMapper
.
getArea
(
map
.
get
(
"区域"
)));
organ
.
setRemarks
(
map
.
get
(
"备注"
));
organ
.
setIsDeleted
(
false
);
organ
.
setCreateTime
(
DateUtil80
.
getDateTimeOfTimestamp
(
System
.
currentTimeMillis
()));
...
...
src/main/resources/mapper/TOrganMapper.xml
View file @
f83136b0
...
...
@@ -51,7 +51,11 @@ where 1=1
</select>
<select
id=
"selectCodeMax"
resultMap=
"BaseResultMap"
>
select * from t_organ where parent_id = #{parentId} order by code desc limit 1
select * from t_organ where parent_id = #{parentId} order by code desc limit 1
</select>
<select
id=
"getArea"
resultType=
"string"
>
select id from t_area where full_name LIKE concat('%', #{name}, '%') order by code desc limit 1
</select>
</mapper>
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