Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
map-parent
Commits
01bb11dc
Commit
01bb11dc
authored
Sep 21, 2022
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改导出和下载接口bug
parent
bc0bdf9e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
5 deletions
+22
-5
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/TbStXftpNew.java
+4
-0
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkTrail.java
+4
-0
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnRygxExport.java
+2
-2
common/common_utils/src/main/java/com/founder/commonutils/util/ExcelUtil.java
+8
-3
service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java
+4
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/TbStXftpNew.java
View file @
01bb11dc
...
...
@@ -97,5 +97,9 @@ public class TbStXftpNew implements Serializable {
@TableField
(
"xabq"
)
private
String
xabq
;
@ApiModelProperty
(
value
=
"备注"
)
@TableField
(
"bz"
)
private
String
bz
;
}
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkTrail.java
View file @
01bb11dc
...
...
@@ -96,6 +96,10 @@ public class SkTrail extends Model<SkTrail> implements Comparable<SkTrail>{
* 证件号码
*/
private
String
zjhm
;
/**
* 描述
*/
private
String
ms
;
/**
* 获取主键值
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnRygxExport.java
View file @
01bb11dc
...
...
@@ -30,7 +30,7 @@ public class HnRygxExport {
@ApiModelProperty
(
value
=
"综合评分"
)
private
String
zhpf
;
@ApiModelProperty
(
value
=
"同住址"
)
/*
@ApiModelProperty(value = "同住址")
private String tzz;
@ApiModelProperty(value = "同户号")
...
...
@@ -67,7 +67,7 @@ public class HnRygxExport {
private String zttary;
@ApiModelProperty(value = "在逃同撤销")
private
String
zttcx
;
private String zttcx;
*/
@ApiModelProperty
(
value
=
"关系集合"
)
private
String
value
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/util/ExcelUtil.java
View file @
01bb11dc
...
...
@@ -150,11 +150,13 @@ public class ExcelUtil {
cell_heads
.
add
(
"标识"
);
cell_heads
.
add
(
"姓名"
);
cell_heads
.
add
(
"性别"
);
cell_heads
.
add
(
"年龄"
);
cell_heads
.
add
(
"民族"
);
// cell_heads.add("年龄");
cell_heads
.
add
(
"身份证号"
);
cell_heads
.
add
(
"背景"
);
cell_heads
.
add
(
"综合评分"
);
cell_heads
.
add
(
"关系"
);
cell_heads
.
add
(
"民族"
);
/*
cell_heads.add("出生日期");
cell_heads.add("服务处所");
cell_heads.add("出生地国家");
...
...
@@ -162,7 +164,7 @@ public class ExcelUtil {
cell_heads.add("籍贯");
cell_heads.add("职业");
cell_heads.add("户籍登记地址");
cell_heads
.
add
(
"姓名注音"
);
cell_heads.add("姓名注音");
*/
Sheet
sheet
=
workbook
.
createSheet
();
// 设置列头宽度
for
(
int
i
=
0
;
i
<
cell_heads
.
size
();
i
++)
{
...
...
@@ -212,6 +214,9 @@ public class ExcelUtil {
//综合评分
cell
=
row
.
createCell
(
cellNum
++);
cell
.
setCellValue
(
StringUtils
.
isBlank
(
data
.
getZhpf
())
?
""
:
data
.
getZhpf
());
//Value
cell
=
row
.
createCell
(
cellNum
++);
cell
.
setCellValue
(
StringUtils
.
isBlank
(
data
.
getValue
())
?
""
:
data
.
getValue
());
/*//服务处所
cell = row.createCell(cellNum++);
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java
View file @
01bb11dc
...
...
@@ -717,6 +717,10 @@ public class HnTbStRygxController {
@RequestParam
(
"username"
)
String
username
,
@RequestParam
(
"taskId"
)
String
taskId
,
@RequestParam
(
name
=
"rygx"
,
required
=
false
)
String
rygx
)
throws
IOException
{
if
(
teamNum
<
2
){
teamNum
=
2
;
}
System
.
out
.
println
(
teamNum
);
//redis中取出数据
List
<
Map
<
String
,
Object
>>
rythInfoList
=
(
List
<
Map
<
String
,
Object
>>)
redisTemplate
.
opsForValue
().
get
(
username
+
":"
+
taskId
+
":"
+
TEAM_KEY
+
teamNum
);
//根据条件进行过滤
...
...
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