Yansen 2 years ago
parent
commit
ae60063e35

+ 1
- 1
pom.xml View File

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

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

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

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

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