Yansen 2 years ago
parent
commit
ae60063e35

+ 1
- 1
pom.xml View File

10
     </parent>
10
     </parent>
11
     <groupId>com.example</groupId>
11
     <groupId>com.example</groupId>
12
     <artifactId>civilizedCity</artifactId>
12
     <artifactId>civilizedCity</artifactId>
13
-    <version>0.0.10</version>
13
+    <version>0.0.11</version>
14
     <name>civilizedCity</name>
14
     <name>civilizedCity</name>
15
     <description>civilizedCity</description>
15
     <description>civilizedCity</description>
16
     <properties>
16
     <properties>

+ 1
- 0
src/main/java/com/example/civilizedcity/common/ExportIssueUtil.java View File

45
                 issueExport.setContent(taIssue.getContent());
45
                 issueExport.setContent(taIssue.getContent());
46
                 issueExport.setExpireDate(taIssue.getExpireDate());
46
                 issueExport.setExpireDate(taIssue.getExpireDate());
47
                 issueExport.setProcessNum(taIssue.getProcessNum());
47
                 issueExport.setProcessNum(taIssue.getProcessNum());
48
+                issueExport.setUserName(taIssue.getUserName());
48
 
49
 
49
                 // 转换机构
50
                 // 转换机构
50
                 if (StringUtils.isNotEmpty(taIssue.getOrgId())) {
51
                 if (StringUtils.isNotEmpty(taIssue.getOrgId())) {

+ 15
- 10
src/main/java/com/example/civilizedcity/vo/IssueExport.java View File

69
     @ApiModelProperty(name = "交办次数", notes = "")
69
     @ApiModelProperty(name = "交办次数", notes = "")
70
     private Integer processNum;
70
     private Integer processNum;
71
 
71
 
72
+    @ColumnWidth(26)
73
+    @ExcelProperty(value = "上报人", index = 9)
74
+    @ApiModelProperty(name = "上报人", notes = "")
75
+    private String userName;
76
+
72
     @ColumnWidth(30)
77
     @ColumnWidth(30)
73
-    @ExcelProperty(value = "问题图片", index = 9)
78
+    @ExcelProperty(value = "问题图片", index = 10)
74
     @ApiModelProperty(name = "问题图片", notes = "")
79
     @ApiModelProperty(name = "问题图片", notes = "")
75
     private URL url1;
80
     private URL url1;
76
 
81
 
77
     @ColumnWidth(30)
82
     @ColumnWidth(30)
78
-    @ExcelProperty(value = "问题图片", index = 10)
83
+    @ExcelProperty(value = "问题图片", index = 11)
79
     @ApiModelProperty(name = "问题图片", notes = "")
84
     @ApiModelProperty(name = "问题图片", notes = "")
80
     private URL url2;
85
     private URL url2;
81
 
86
 
82
     @ColumnWidth(30)
87
     @ColumnWidth(30)
83
-    @ExcelProperty(value = "问题图片", index = 11)
88
+    @ExcelProperty(value = "问题图片", index = 12)
84
     @ApiModelProperty(name = "问题图片", notes = "")
89
     @ApiModelProperty(name = "问题图片", notes = "")
85
     private URL url3;
90
     private URL url3;
86
 
91
 
87
     @ColumnWidth(30)
92
     @ColumnWidth(30)
88
-    @ExcelProperty(value = "问题图片", index = 12)
93
+    @ExcelProperty(value = "问题图片", index = 13)
89
     @ApiModelProperty(name = "问题图片", notes = "")
94
     @ApiModelProperty(name = "问题图片", notes = "")
90
     private URL url4;
95
     private URL url4;
91
 
96
 
92
     @ColumnWidth(30)
97
     @ColumnWidth(30)
93
-    @ExcelProperty(value = "问题图片", index = 13)
98
+    @ExcelProperty(value = "问题图片", index = 14)
94
     @ApiModelProperty(name = "问题图片", notes = "")
99
     @ApiModelProperty(name = "问题图片", notes = "")
95
     private URL url5;
100
     private URL url5;
96
 
101
 
97
     @ColumnWidth(30)
102
     @ColumnWidth(30)
98
-    @ExcelProperty(value = "处理结果图片", index = 14)
103
+    @ExcelProperty(value = "处理结果图片", index = 15)
99
     @ApiModelProperty(name = "处理结果图片", notes = "")
104
     @ApiModelProperty(name = "处理结果图片", notes = "")
100
     private URL url6;
105
     private URL url6;
101
 
106
 
102
     @ColumnWidth(30)
107
     @ColumnWidth(30)
103
-    @ExcelProperty(value = "处理结果图片", index = 15)
108
+    @ExcelProperty(value = "处理结果图片", index = 16)
104
     @ApiModelProperty(name = "处理结果图片", notes = "")
109
     @ApiModelProperty(name = "处理结果图片", notes = "")
105
     private URL url7;
110
     private URL url7;
106
 
111
 
107
     @ColumnWidth(30)
112
     @ColumnWidth(30)
108
-    @ExcelProperty(value = "处理结果图片", index = 16)
113
+    @ExcelProperty(value = "处理结果图片", index = 17)
109
     @ApiModelProperty(name = "处理结果图片", notes = "")
114
     @ApiModelProperty(name = "处理结果图片", notes = "")
110
     private URL url8;
115
     private URL url8;
111
 
116
 
112
     @ColumnWidth(30)
117
     @ColumnWidth(30)
113
-    @ExcelProperty(value = "处理结果图片", index = 17)
118
+    @ExcelProperty(value = "处理结果图片", index = 18)
114
     @ApiModelProperty(name = "处理结果图片", notes = "")
119
     @ApiModelProperty(name = "处理结果图片", notes = "")
115
     private URL url9;
120
     private URL url9;
116
 
121
 
117
     @ColumnWidth(30)
122
     @ColumnWidth(30)
118
-    @ExcelProperty(value = "处理结果图片", index = 18)
123
+    @ExcelProperty(value = "处理结果图片", index = 19)
119
     @ApiModelProperty(name = "处理结果图片", notes = "")
124
     @ApiModelProperty(name = "处理结果图片", notes = "")
120
     private URL url10;
125
     private URL url10;
121
 }
126
 }