Browse Source

viewobjects

zhuhaiwen 3 years ago
parent
commit
ef00771309
136 changed files with 193 additions and 790 deletions
  1. 0 235
      oa-app/src/main/java/com/css/oa/exam/admin/controller/AA.java
  2. 0 79
      oa-app/src/main/java/com/css/oa/exam/admin/controller/AdminController.java
  3. 0 57
      oa-app/src/main/java/com/css/oa/exam/admin/controller/a.txt
  4. 0 56
      oa-app/src/main/java/com/css/oa/exam/admin/controller/b.json
  5. 0 53
      oa-app/src/main/java/com/css/oa/exam/admin/controller/b.txt
  6. 0 17
      oa-app/src/main/java/com/css/oa/exam/admin/service/AdminService.java
  7. 0 14
      oa-app/src/main/java/com/css/oa/exam/admin/service/IAdminService.java
  8. 1 1
      oa-app/src/main/java/com/css/oa/exam/admin/bean/Admin.java
  9. 1 1
      oa-app/src/main/java/com/css/oa/exam/admin/bean/LoginUser.java
  10. 2 4
      oa-app/src/main/java/com/css/oa/exam/announce/controller/AnnounceController.java
  11. 4 7
      oa-app/src/main/java/com/css/oa/exam/announce/service/AnnounceService.java
  12. 2 2
      oa-app/src/main/java/com/css/oa/exam/announce/service/IAnnounceService.java
  13. 1 1
      oa-app/src/main/java/com/css/oa/exam/announce/bean/AnnoQueryReq.java
  14. 1 1
      oa-app/src/main/java/com/css/oa/exam/announce/bean/AnnoType.java
  15. 1 1
      oa-app/src/main/java/com/css/oa/exam/announce/bean/SearchReq.java
  16. 1 4
      oa-app/src/main/java/com/css/oa/exam/assign/controller/AdmissionController.java
  17. 4 4
      oa-app/src/main/java/com/css/oa/exam/assign/controller/AssignController.java
  18. 4 5
      oa-app/src/main/java/com/css/oa/exam/assign/service/AdmService.java
  19. 6 12
      oa-app/src/main/java/com/css/oa/exam/assign/service/AssignService.java
  20. 1 1
      oa-app/src/main/java/com/css/oa/exam/assign/service/BaseAssignService.java
  21. 1 1
      oa-app/src/main/java/com/css/oa/exam/assign/bean/AssignExportReq.java
  22. 1 1
      oa-app/src/main/java/com/css/oa/exam/assign/bean/AssignQueryReq.java
  23. 1 1
      oa-app/src/main/java/com/css/oa/exam/assign/bean/AssignReq.java
  24. 1 1
      oa-app/src/main/java/com/css/oa/exam/assign/bean/Condition.java
  25. 1 1
      oa-app/src/main/java/com/css/oa/exam/assign/bean/MyAdmWrap.java
  26. 2 2
      oa-app/src/main/java/com/css/oa/exam/auth/controller/PlaceAuthController.java
  27. 2 2
      oa-app/src/main/java/com/css/oa/exam/auth/controller/RoomAuthController.java
  28. 2 2
      oa-app/src/main/java/com/css/oa/exam/auth/service/PlaceAuthService.java
  29. 1 1
      oa-app/src/main/java/com/css/oa/exam/auth/bean/PlaceAuthNode.java
  30. 1 1
      oa-app/src/main/java/com/css/oa/exam/auth/bean/UnitNode.java
  31. 0 0
      oa-app/src/main/java/com/css/oa/exam/auth/viewobjects/res.json
  32. 0 0
      oa-app/src/main/java/com/css/oa/exam/auth/viewobjects/test.html
  33. 1 1
      oa-app/src/main/java/com/css/oa/exam/base/BaseVerifyService.java
  34. 1 1
      oa-app/src/main/java/com/css/oa/exam/certificate/controller/CertiSetController.java
  35. 2 3
      oa-app/src/main/java/com/css/oa/exam/certificate/controller/CertifiController.java
  36. 1 1
      oa-app/src/main/java/com/css/oa/exam/certificate/service/CertiSetService.java
  37. 2 2
      oa-app/src/main/java/com/css/oa/exam/certificate/service/CertifiService.java
  38. 1 1
      oa-app/src/main/java/com/css/oa/exam/certificate/service/ICertiSetService.java
  39. 1 1
      oa-app/src/main/java/com/css/oa/exam/certificate/bean/CertiQueryReq.java
  40. 1 1
      oa-app/src/main/java/com/css/oa/exam/certificate/bean/CertiSetReq.java
  41. 1 2
      oa-app/src/main/java/com/css/oa/exam/certificate/bean/ClientResWrap.java
  42. 1 1
      oa-app/src/main/java/com/css/oa/exam/cheat/controller/CheatSetController.java
  43. 1 3
      oa-app/src/main/java/com/css/oa/exam/cheat/service/CheatSetService.java
  44. 1 1
      oa-app/src/main/java/com/css/oa/exam/cheat/service/ICheatSetService.java
  45. 1 1
      oa-app/src/main/java/com/css/oa/exam/cheat/bean/SettingReq.java
  46. 1 1
      oa-app/src/main/java/com/css/oa/exam/enroll/controller/EnrollController.java
  47. 2 2
      oa-app/src/main/java/com/css/oa/exam/enroll/controller/PayController.java
  48. 3 3
      oa-app/src/main/java/com/css/oa/exam/enroll/service/EnrollService.java
  49. 2 2
      oa-app/src/main/java/com/css/oa/exam/enroll/service/IEnrollService.java
  50. 1 1
      oa-app/src/main/java/com/css/oa/exam/enroll/service/IPayService.java
  51. 2 2
      oa-app/src/main/java/com/css/oa/exam/enroll/service/PayService.java
  52. 1 1
      oa-app/src/main/java/com/css/oa/exam/enroll/bean/AddReq.java
  53. 1 1
      oa-app/src/main/java/com/css/oa/exam/enroll/bean/BatchVerifyReq.java
  54. 1 2
      oa-app/src/main/java/com/css/oa/exam/enroll/bean/Condition.java
  55. 1 1
      oa-app/src/main/java/com/css/oa/exam/enroll/bean/DisableReq.java
  56. 1 1
      oa-app/src/main/java/com/css/oa/exam/enroll/bean/EnrollQueryReq.java
  57. 1 1
      oa-app/src/main/java/com/css/oa/exam/enroll/bean/ExportEnrollReq.java
  58. 1 1
      oa-app/src/main/java/com/css/oa/exam/exam/service/ExamService.java
  59. 2 3
      oa-app/src/main/java/com/css/oa/exam/level/controller/LevelController.java
  60. 1 1
      oa-app/src/main/java/com/css/oa/exam/level/service/ILevelService.java
  61. 1 5
      oa-app/src/main/java/com/css/oa/exam/level/service/LevelService.java
  62. 1 5
      oa-app/src/main/java/com/css/oa/exam/level/bean/Level.java
  63. 4 6
      oa-app/src/main/java/com/css/oa/exam/monitor/controller/MonitorController.java
  64. 2 2
      oa-app/src/main/java/com/css/oa/exam/monitor/service/IMonitorService.java
  65. 2 3
      oa-app/src/main/java/com/css/oa/exam/monitor/service/MonitorService.java
  66. 1 1
      oa-app/src/main/java/com/css/oa/exam/monitor/bean/AssignMonitorReq.java
  67. 1 1
      oa-app/src/main/java/com/css/oa/exam/monitor/bean/AssignOne.java
  68. 1 1
      oa-app/src/main/java/com/css/oa/exam/monitor/bean/Condition.java
  69. 1 1
      oa-app/src/main/java/com/css/oa/exam/monitor/bean/ExportMonitorReq.java
  70. 1 1
      oa-app/src/main/java/com/css/oa/exam/monitor/bean/MonitorQueryReq.java
  71. 1 1
      oa-app/src/main/java/com/css/oa/exam/monitor/bean/MonitorVerifiState.java
  72. 1 1
      oa-app/src/main/java/com/css/oa/exam/monitor/bean/VerifyReq.java
  73. 3 3
      oa-app/src/main/java/com/css/oa/exam/multiple/contoller/MultipleController.java
  74. 6 6
      oa-app/src/main/java/com/css/oa/exam/multiple/service/MultipleService.java
  75. 1 1
      oa-app/src/main/java/com/css/oa/exam/multiple/bean/Condition.java
  76. 1 1
      oa-app/src/main/java/com/css/oa/exam/multiple/bean/ExportMultiReq.java
  77. 1 1
      oa-app/src/main/java/com/css/oa/exam/multiple/bean/MultiCondiReq.java
  78. 1 3
      oa-app/src/main/java/com/css/oa/exam/multiple/bean/MultiPageReq.java
  79. 1 1
      oa-app/src/main/java/com/css/oa/exam/multiple/bean/MultiWrap.java
  80. 1 1
      oa-app/src/main/java/com/css/oa/exam/node/service/NodeQueryService.java
  81. 1 1
      oa-app/src/main/java/com/css/oa/exam/node/bean/NodeType.java
  82. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/controller/PlaceController.java
  83. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/service/IPlaceService.java
  84. 2 2
      oa-app/src/main/java/com/css/oa/exam/place/service/PlaceService.java
  85. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/bean/Condition.java
  86. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/bean/DropdownVerifyState.java
  87. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/bean/ExportPlaceReq.java
  88. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/bean/PlaceDuplicateBean.java
  89. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/bean/PlaceQueryReq.java
  90. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/bean/PlaceResultWrap.java
  91. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/bean/VerifyOneReq.java
  92. 1 1
      oa-app/src/main/java/com/css/oa/exam/place/bean/VerifyReq.java
  93. 0 0
      oa-app/src/main/java/com/css/oa/exam/place/viewobjects/dtos.json
  94. 0 16
      oa-app/src/main/java/com/css/oa/exam/report/bean/PRPExportReq.java
  95. 0 16
      oa-app/src/main/java/com/css/oa/exam/report/bean/PRPReq.java
  96. 1 4
      oa-app/src/main/java/com/css/oa/exam/report/controller/ReportController.java
  97. 1 19
      oa-app/src/main/java/com/css/oa/exam/report/service/ReportService.java
  98. 1 1
      oa-app/src/main/java/com/css/oa/exam/report/bean/PRExcelEntity.java
  99. 1 1
      oa-app/src/main/java/com/css/oa/exam/report/bean/PRExportReq.java
  100. 1 1
      oa-app/src/main/java/com/css/oa/exam/report/bean/PRPExcelEntity.java
  101. 11 0
      oa-app/src/main/java/com/css/oa/exam/report/viewobjects/PRPExportReq.java
  102. 11 0
      oa-app/src/main/java/com/css/oa/exam/report/viewobjects/PRPReq.java
  103. 1 1
      oa-app/src/main/java/com/css/oa/exam/report/bean/PRReq.java
  104. 1 1
      oa-app/src/main/java/com/css/oa/exam/report/bean/UPExcelEntity.java
  105. 1 1
      oa-app/src/main/java/com/css/oa/exam/report/bean/UPExportReq.java
  106. 1 1
      oa-app/src/main/java/com/css/oa/exam/report/bean/UPReq.java
  107. 5 5
      oa-app/src/main/java/com/css/oa/exam/room/controller/RoomController.java
  108. 1 1
      oa-app/src/main/java/com/css/oa/exam/room/service/IRoomService.java
  109. 6 7
      oa-app/src/main/java/com/css/oa/exam/room/service/RoomService.java
  110. 1 1
      oa-app/src/main/java/com/css/oa/exam/room/bean/Condition.java
  111. 1 1
      oa-app/src/main/java/com/css/oa/exam/room/bean/ExportRoomReq.java
  112. 1 3
      oa-app/src/main/java/com/css/oa/exam/room/bean/RoomQueryReq.java
  113. 1 2
      oa-app/src/main/java/com/css/oa/exam/score/controller/ScoreController.java
  114. 0 6
      oa-app/src/main/java/com/css/oa/exam/score/service/IScoreService.java
  115. 3 3
      oa-app/src/main/java/com/css/oa/exam/score/service/ScoreService.java
  116. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/AnalyseColumn.java
  117. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/AnalyseReq.java
  118. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/AnalyseResult.java
  119. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/Condition.java
  120. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/ExportAnalyseReq.java
  121. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/ExportScoreReq.java
  122. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/ImportWrap.java
  123. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/MyScoreWrap.java
  124. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/ScoreQueryReq.java
  125. 1 1
      oa-app/src/main/java/com/css/oa/exam/score/bean/UpdateReq.java
  126. 2 2
      oa-app/src/main/java/com/css/oa/exam/series/controller/SeriesController.java
  127. 0 2
      oa-app/src/main/java/com/css/oa/exam/series/service/BaseDicServise.java
  128. 1 1
      oa-app/src/main/java/com/css/oa/exam/series/service/ISeriesService.java
  129. 1 1
      oa-app/src/main/java/com/css/oa/exam/series/service/SeriesService.java
  130. 1 1
      oa-app/src/main/java/com/css/oa/exam/series/bean/AddReq.java
  131. 1 1
      oa-app/src/main/java/com/css/oa/exam/series/bean/Series.java
  132. 0 1
      oa-app/src/main/java/com/css/oa/exam/student/controller/StudentController.java
  133. 1 1
      oa-app/src/main/java/com/css/oa/exam/student/bean/PlaceAuthReq.java
  134. 1 2
      oa-app/src/main/java/com/css/oa/exam/subject/service/SubjectService.java
  135. 1 8
      oa-app/src/main/java/com/css/oa/exam/util/upload/UploadService.java
  136. 1 1
      oa-app/src/main/java/com/css/oa/exam/util/upload/UploadUtil.java

+ 0 - 235
oa-app/src/main/java/com/css/oa/exam/admin/controller/AA.java

@ -1,235 +0,0 @@
1
package com.css.oa.exam.admin.controller;
2
3
import com.fasterxml.jackson.annotation.JsonProperty;
4
import lombok.Data;
5
import lombok.NoArgsConstructor;
6
7
import java.util.List;
8
9
@NoArgsConstructor
10
@Data
11
public class AA {
12
13
    /*{
14
        "id": "fc80fa44f4ab4c389cddb17837074a34",
15
            "persCode": "140622198906200032",
16
            "userName": "zangtie",
17
            "persName": "臧铁",
18
            "orgCode": "100000002",
19
            "orgName": "其他",
20
            "orgJurd": "",
21
            "jurdAreaType": "",
22
            "adminOrgCode": "",
23
            "depCode": "8be30b2208ff4b899be59c51465d34fe",
24
            "depName": "临时部门",
25
            "userState": "1",
26
            "caCertification": "",
27
            "ordernum": "95656",
28
            "creater": "",
29
            "modifier": "",
30
            "roleInfoList": [
31
        {
32
            "id": "9b0e3d32582d48a5be2af92a89cadc56",
33
                "roleCode": "kfz",
34
                "roleName": "开发者",
35
                "roleDesc": "",
36
                "roleType": "1",
37
                "orgId": "",
38
                "orgCode": "",
39
                "orgName": "",
40
                "orgJurd": "",
41
                "jurdAreaType": "",
42
                "sysId": "",
43
                "sysCode": "2222",
44
                "status": "1",
45
                "creater": "",
46
                "modifier": "",
47
                "ordernum": "",
48
                "note": ""
49
        },
50
        {
51
            "id": "6b303bd8624e4c308401dfa1d3f2ac99",
52
                "roleCode": "cdglxt",
53
                "roleName": "菜单管理系统",
54
                "roleDesc": "管理业务系统管理员的菜单",
55
                "roleType": "1",
56
                "orgId": "",
57
                "orgCode": "",
58
                "orgName": "",
59
                "orgJurd": "",
60
                "jurdAreaType": "",
61
                "sysId": "",
62
                "sysCode": "1001",
63
                "status": "1",
64
                "creater": "",
65
                "modifier": "",
66
                "ordernum": "",
67
                "note": "管理业务系统管理员的菜单"
68
        },
69
        {
70
            "id": "0577191f23b241b8b7d86176f5c2346a",
71
                "roleCode": "131452021-xtgly-01",
72
                "roleName": "系统管理员",
73
                "roleDesc": "",
74
                "roleType": "01",
75
                "orgId": "",
76
                "orgCode": "",
77
                "orgName": "",
78
                "orgJurd": "",
79
                "jurdAreaType": "",
80
                "sysId": "",
81
                "sysCode": "131452021",
82
                "status": "1",
83
                "creater": "",
84
                "modifier": "",
85
                "ordernum": "",
86
                "note": ""
87
        },
88
        {
89
            "id": "93f35c1d5b0f44c29b33599865a2aeb1",
90
                "roleCode": "cdglaq",
91
                "roleName": "菜单管理安全",
92
                "roleDesc": "管理安全管理员菜单",
93
                "roleType": "1",
94
                "orgId": "",
95
                "orgCode": "",
96
                "orgName": "",
97
                "orgJurd": "",
98
                "jurdAreaType": "",
99
                "sysId": "",
100
                "sysCode": "1001",
101
                "status": "1",
102
                "creater": "",
103
                "modifier": "",
104
                "ordernum": "",
105
                "note": "管理安全管理员菜单"
106
        },
107
        {
108
            "id": "fee152c213c845a28521d16b873fa4ad",
109
                "roleCode": "131452021-aqgly-02",
110
                "roleName": "安全管理员",
111
                "roleDesc": "",
112
                "roleType": "02",
113
                "orgId": "",
114
                "orgCode": "",
115
                "orgName": "",
116
                "orgJurd": "",
117
                "jurdAreaType": "",
118
                "sysId": "",
119
                "sysCode": "131452021",
120
                "status": "1",
121
                "creater": "",
122
                "modifier": "",
123
                "ordernum": "",
124
                "note": ""
125
        }
126
  ]
127
    }
128
*/
129
130
    @JsonProperty("id")
131
    private String id;
132
133
    @JsonProperty("身份证号")
134
    private String persCode;
135
136
    @JsonProperty("姓名-拼音")
137
    private String userName;
138
139
    @JsonProperty("姓名-汉语")
140
    private String persName;
141
142
    @JsonProperty("组织机构编码")
143
    private String orgCode;
144
145
    @JsonProperty("组织机构-汉语")
146
    private String orgName;
147
148
    @JsonProperty("组织机构的管辖范围")
149
    private String orgJurd;
150
151
    @JsonProperty("区域类型")
152
    private String jurdAreaType;
153
154
    @JsonProperty("管理员组织结构编码")
155
    private String adminOrgCode;
156
157
    @JsonProperty("部门编码")
158
    private String depCode;
159
160
    @JsonProperty("部门名称")
161
    private String depName;
162
163
    @JsonProperty("用户激活状态(已创建、呆激活、已激活)")
164
    private String userState;
165
166
    @JsonProperty("caCertification")
167
    private String caCertification;
168
169
    @JsonProperty("序号")
170
    private String ordernum;
171
172
    @JsonProperty("创建人")
173
    private String creater;
174
175
    @JsonProperty("修改人")
176
    private String modifier;
177
178
    @JsonProperty("角色列表")
179
    private List<RoleInfoListDTO> roleInfoList;
180
181
    @NoArgsConstructor
182
    @Data
183
    public static class RoleInfoListDTO {
184
        @JsonProperty("id")
185
        private String id;
186
187
        @JsonProperty("角色编码")
188
        private String roleCode;
189
190
        @JsonProperty("角色名称")
191
        private String roleName;
192
193
        @JsonProperty("角色描述")
194
        private String roleDesc;
195
196
        @JsonProperty("角色类型2、3、4等等")
197
        private String roleType;
198
199
        @JsonProperty("组织机构id")
200
        private String orgId;
201
202
        @JsonProperty("机构编码")
203
        private String orgCode;
204
205
        @JsonProperty("机构名称")
206
        private String orgName;
207
208
        @JsonProperty("机构管辖范围")
209
        private String orgJurd;
210
211
        @JsonProperty("管辖范围类型")
212
        private String jurdAreaType;
213
214
        @JsonProperty("所属系统")
215
        private String sysId;
216
217
        @JsonProperty("系统编码")
218
        private String sysCode;
219
220
        @JsonProperty("状态标志 1 启用 8 停用 9 禁用-")
221
        private String status;
222
223
        @JsonProperty("创建人")
224
        private String creater;
225
226
        @JsonProperty("修改人")
227
        private String modifier;
228
229
        @JsonProperty("序号")
230
        private String ordernum;
231
232
        @JsonProperty("note")
233
        private String note;
234
    }
235
}

+ 0 - 79
oa-app/src/main/java/com/css/oa/exam/admin/controller/AdminController.java

@ -1,79 +0,0 @@
1
package com.css.oa.exam.admin.controller;
2
3
import com.css.oa.exam.admin.bean.LoginUser;
4
import com.css.oa.exam.base.BaseController;
5
import io.swagger.annotations.Api;
6
//import org.springframework.beans.factory.annotation.Autowired;
7
//import org.springframework.security.authentication.AnonymousAuthenticationToken;
8
//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
9
//import org.springframework.security.core.Authentication;
10
//import org.springframework.security.core.authority.AuthorityUtils;
11
//import org.springframework.security.core.context.SecurityContextHolder;
12
//import org.springframework.security.core.userdetails.User;
13
//import org.springframework.security.core.userdetails.UserDetailsService;
14
//import org.springframework.security.provisioning.UserDetailsManager;
15
//import org.springframework.ui.Model;
16
import org.springframework.web.bind.annotation.*;
17
18
import javax.servlet.http.HttpServletRequest;
19
20
@Api(tags = {"管理员登录"})
21
@RestController
22
@RequestMapping("/admin")
23
public class AdminController extends BaseController {
24
//
25
//    @Autowired
26
//    private UserDetailsService userDetailsService;
27
//
28
//    @GetMapping("*")
29
//    public String welcome() {
30
//        return "redirect:casLogin";
31
//    }
32
//
33
//    @GetMapping("index")
34
//    public String index() {
35
//        return "welcome";
36
//    }
37
//
38
//    @GetMapping("login")
39
//    public String loginPage(Model model) {
40
//        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
41
//        if (!(auth instanceof AnonymousAuthenticationToken)) {
42
//            return "redirect:index";
43
//        }
44
//        LoginUser user = new LoginUser();
45
//        model.addAttribute("user",user);
46
//        return "login";
47
//    }
48
//
49
//    @GetMapping("casLogin")
50
//    public String casLogin(HttpServletRequest request) {
51
//        if (request.getRemoteUser() != null) {
52
//            Authentication auth = new UsernamePasswordAuthenticationToken(request.getRemoteUser(), request.getRemoteUser(),
53
//                    AuthorityUtils.createAuthorityList("USER"));
54
//            SecurityContextHolder.getContext().setAuthentication(auth);
55
//            return "redirect:index";
56
//        }
57
//        return "redirect:login";
58
//    }
59
//
60
//    @GetMapping("register")
61
//    public String registerPage(Model model) {
62
//        LoginUser user = new LoginUser();
63
//        model.addAttribute("user",user);
64
//        return "register";
65
//    }
66
//
67
//    @PostMapping("register")
68
//    public String register(LoginUser user) {
69
//        UserDetailsManager userDetailsManager = (UserDetailsManager) userDetailsService;
70
//        boolean exists = userDetailsManager.userExists(user.getUsername());
71
//        if (!exists) {
72
//            userDetailsManager.createUser(new User(user.getUsername(), user.getPassword(), AuthorityUtils.createAuthorityList("USER")));
73
//            return "redirect:register?success";
74
//        } else {
75
//            return "redirect:register?error";
76
//        }
77
//    }
78
79
}

+ 0 - 57
oa-app/src/main/java/com/css/oa/exam/admin/controller/a.txt

@ -1,57 +0,0 @@
1
# Copyright (c) 1993-2009 Microsoft Corp.
2
#
3
# This is a sample HOSTS file used by Microsoft TCP/IP for Windows.
4
#
5
# This file contains the mappings of IP addresses to host names. Each
6
# entry should be kept on an individual line. The IP address should
7
# be placed in the first column followed by the corresponding host name.
8
# The IP address and the host name should be separated by at least one
9
# space.
10
#
11
# Additionally, comments (such as these) may be inserted on individual
12
# lines or following the machine name denoted by a '#' symbol.
13
#
14
# For example:
15
#
16
#      102.54.94.97     rhino.acme.com          # source server
17
#       38.25.63.10     x.acme.com              # x client host
18
19
# localhost name resolution is handled within DNS itself.
20
#	127.0.0.1       localhost
21
#	::1             localhost
22
23
24
127.0.0.1 genuine.microsoft.com
25
127.0.0.1 mpa.one.microsoft.com
26
127.0.0.1 sls.microsoft.com
27
28
10.1.12.253 slyun.mwr.cn
29
10.1.12.253 grafana.slyun.mwr.cn
30
10.1.12.253 registry-tcnp.slyun.mwr.cn
31
10.1.12.253 rbac-access.slyun.mwr.cn
32
10.1.12.253 rbac-account.slyun.mwr.cn
33
10.1.12.253 rbac-sso.slyun.mwr.cn
34
10.1.12.253 rbac-web.slyun.mwr.cn
35
10.1.12.253 service-manager.slyun.mwr.cn
36
10.1.12.253 sora.slyun.mwr.cn
37
10.1.12.253 release-manager.slyun.mwr.cn
38
10.1.12.252 gatewayproxy.mwr.cn
39
10.1.12.252 msgcenter.mwr.cn
40
10.1.12.252 springpro.mwr.cn
41
10.1.12.252 springproweb.mwr.cn
42
10.1.12.252 gkgl.mwr.cn
43
10.1.12.252 nwservice.mwr.cn
44
10.1.12.252 nwbase.mwr.cn
45
46
10.1.12.252 sso.mwr.cn
47
10.1.12.252 slbbase.mwr.cn
48
10.1.12.252 gateway.mwr.cn
49
10.1.12.252 gatewayproxy.mwr.cn
50
10.1.12.252 openplatclient.mwr.cn
51
10.1.12.252 openplatserver.mwr.cn
52
10.1.12.252 msgcenter.mwr.cn
53
10.1.12.252 portal.mwr.cn
54
10.1.12.252 basewebservice.mwr.cn
55
56
57

+ 0 - 56
oa-app/src/main/java/com/css/oa/exam/admin/controller/b.json

@ -1,56 +0,0 @@
1
{
2
  "uuid": "fc80fa44f4ab4c389cddb17837074a34",
3
  "realName": "臧铁",
4
  "loginName": "zangtie",
5
  "password": "6b969f6063118c405dd445d4633ed36766af502d0bc27139c29298907ef7b648",
6
  "sex": 1,
7
  "mobile": "18782920244",
8
  "email": null,
9
  "userType": "1",
10
  "delFlag": "2",
11
  "openFlag": "1",
12
  "issueDate": "Apr 27, 2021 3:22:43 PM",
13
  "editDate": "Apr 27, 2021 3:36:48 PM",
14
  "remark": "",
15
  "lastLoginTime": null,
16
  "totalLoginCount": 1,
17
  "failedLoginCount": 0,
18
  "failLockTime": null,
19
  "orgId": "9e106cb9ee7a4acbbc08f761cdd03c5b",
20
  "editPwdTime": "Apr 27, 2021 3:23:14 PM",
21
  "activeStatus": "3",
22
  "activeDeadLine": "Apr 28, 2021 3:23:14 PM",
23
  "provinceId": null,
24
  "cityId": null,
25
  "pcStatus": null,
26
  "appStatus": null,
27
  "pwdExprityTime": null,
28
  "orderNum": 95656,
29
  "creatorId": null,
30
  "updateUserId": null,
31
  "countyId": null,
32
  "salt": null,
33
  "sysId": null,
34
  "oldUserId": null,
35
  "certKey": null,
36
  "staffOrg": null,
37
  "staffRegion": null,
38
  "certType": null,
39
  "certNo": "140622198906200032",
40
  "gbFlag": null,
41
  "gbPushFlag": "2",
42
  "datasCaCode": null,
43
  "personId": "19064bc4ecbc4f2aa79adec9d59ec8df",
44
  "exname": null,
45
  "functions": [],
46
  "funcActions": [],
47
  "syss": [],
48
  "depts": [],
49
  "roles": [],
50
  "posts": [],
51
  "userPosts": [],
52
  "userDepts": [],
53
  "orgs": [],
54
  "funcs": [],
55
  "actions": []
56
}

+ 0 - 53
oa-app/src/main/java/com/css/oa/exam/admin/controller/b.txt

@ -1,53 +0,0 @@
1
# Copyright (c) 1993-2009 Microsoft Corp.
2
#
3
# This is a sample HOSTS file used by Microsoft TCP/IP for Windows.
4
#
5
# This file contains the mappings of IP addresses to host names. Each
6
# entry should be kept on an individual line. The IP address should
7
# be placed in the first column followed by the corresponding host name.
8
# The IP address and the host name should be separated by at least one
9
# space.
10
#
11
# Additionally, comments (such as these) may be inserted on individual
12
# lines or following the machine name denoted by a '#' symbol.
13
#
14
# For example:
15
#
16
#      102.54.94.97     rhino.acme.com          # source server
17
#       38.25.63.10     x.acme.com              # x client host
18
19
# localhost name resolution is handled within DNS itself.
20
#	127.0.0.1       localhost
21
#	::1             localhost
22
23
24
127.0.0.1 genuine.microsoft.com
25
127.0.0.1 mpa.one.microsoft.com
26
127.0.0.1 sls.microsoft.com
27
28
29
10.1.12.253 slyun.mwr.cn
30
10.1.12.253 grafana.slyun.mwr.cn
31
10.1.12.253 registry-tcnp.slyun.mwr.cn
32
10.1.12.253 rbac-access.slyun.mwr.cn
33
10.1.12.253 rbac-account.slyun.mwr.cn
34
10.1.12.253 rbac-sso.slyun.mwr.cn
35
10.1.12.253 rbac-web.slyun.mwr.cn
36
10.1.12.253 service-manager.slyun.mwr.cn
37
10.1.12.253 sora.slyun.mwr.cn
38
10.1.12.253 release-manager.slyun.mwr.cn
39
10.1.12.252 sso.mwr.cn
40
10.1.12.252 slbbase.mwr.cn
41
10.1.12.252 gateway.mwr.cn
42
10.1.12.252 gatewayproxy.mwr.cn
43
10.1.12.252 portal.mwr.cn
44
10.1.12.252 msgcenter.mwr.cn
45
10.1.12.252 openplatclient.mwr.cn
46
10.1.12.252 openplatserver.mwr.cn
47
10.1.12.252 springpro.mwr.cn
48
10.1.12.252 springproweb.mwr.cn
49
10.1.12.252 gkgl.mwr.cn
50
10.1.12.252 nwservice.mwr.cn
51
10.1.12.252 nwbase.mwr.cn
52
53

+ 0 - 17
oa-app/src/main/java/com/css/oa/exam/admin/service/AdminService.java

@ -1,17 +0,0 @@
1
package com.css.oa.exam.admin.service;
2
3
import com.css.oa.exam.base.BaseService;
4
import lombok.extern.slf4j.Slf4j;
5
import org.springframework.beans.factory.annotation.Autowired;
6
import org.springframework.stereotype.Service;
7
8
@Slf4j
9
@Service
10
public class AdminService extends BaseService implements IAdminService {
11
//
12
//    @Autowired
13
//    IUnitRepository repository;
14
15
16
17
}

+ 0 - 14
oa-app/src/main/java/com/css/oa/exam/admin/service/IAdminService.java

@ -1,14 +0,0 @@
1
package com.css.oa.exam.admin.service;
2
3
4
public interface IAdminService {
5
//
6
//    void add(Admin test);
7
//
8
//    Map queryPage(AnnoQueryReq req);
9
//
10
//    void update(Admin newTest);
11
//
12
//    void delete(List<String> ids);
13
14
}

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/admin/bean/Admin.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.admin.bean;
1
package com.css.oa.exam.admin.viewobjects;
2 2
3 3
import org.apache.http.util.TextUtils;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/admin/bean/LoginUser.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.admin.bean;
1
package com.css.oa.exam.admin.viewobjects;
2 2
3 3
public class LoginUser {
4 4
    private String username;

+ 2 - 4
oa-app/src/main/java/com/css/oa/exam/announce/controller/AnnounceController.java

@ -1,15 +1,13 @@
1 1
package com.css.oa.exam.announce.controller;
2 2
3
import com.css.oa.exam.announce.bean.SearchReq;
3
import com.css.oa.exam.announce.viewobjects.SearchReq;
4 4
import com.css.oa.exam.base.BaseController;
5
import com.css.oa.exam.announce.bean.AnnoQueryReq;
5
import com.css.oa.exam.announce.viewobjects.AnnoQueryReq;
6 6
import com.css.oa.exam.announce.repository.Announce;
7 7
import com.css.oa.exam.announce.service.AnnounceService;
8 8
import com.css.oa.utils.Result;
9 9
import io.swagger.annotations.Api;
10 10
import io.swagger.annotations.ApiOperation;
11
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
12
import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
13 11
import org.apache.http.util.TextUtils;
14 12
import org.springframework.beans.factory.annotation.Autowired;
15 13
import org.springframework.web.bind.annotation.*;

+ 4 - 7
oa-app/src/main/java/com/css/oa/exam/announce/service/AnnounceService.java

@ -1,15 +1,12 @@
1 1
package com.css.oa.exam.announce.service;
2 2
3
import com.css.oa.exam.admin.bean.Admin;
4
import com.css.oa.exam.announce.bean.AnnoType;
5
import com.css.oa.exam.announce.bean.SearchReq;
3
import com.css.oa.exam.admin.viewobjects.Admin;
4
import com.css.oa.exam.announce.viewobjects.AnnoType;
5
import com.css.oa.exam.announce.viewobjects.SearchReq;
6 6
import com.css.oa.exam.base.BaseService;
7
import com.css.oa.exam.announce.bean.AnnoQueryReq;
7
import com.css.oa.exam.announce.viewobjects.AnnoQueryReq;
8 8
import com.css.oa.exam.announce.repository.Announce;
9 9
import com.css.oa.exam.announce.repository.IAnnounceRepository;
10
import com.css.oa.exam.util.CopyObjTool;
11
import com.css.oa.exam.util.upload.FileInfoEntity;
12
import com.css.oa.exam.util.upload.FileInfoRepository;
13 10
import com.css.oa.exam.util.upload.UploadService;
14 11
import com.css.oa.utils.DateUtils;
15 12
import com.css.oa.utils.UUIDGenerator;

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/announce/service/IAnnounceService.java

@ -1,7 +1,7 @@
1 1
package com.css.oa.exam.announce.service;
2 2
3
import com.css.oa.exam.announce.bean.AnnoQueryReq;
4
import com.css.oa.exam.announce.bean.SearchReq;
3
import com.css.oa.exam.announce.viewobjects.AnnoQueryReq;
4
import com.css.oa.exam.announce.viewobjects.SearchReq;
5 5
import com.css.oa.exam.announce.repository.Announce;
6 6
7 7
import javax.servlet.http.HttpServletRequest;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/announce/bean/AnnoQueryReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.announce.bean;
1
package com.css.oa.exam.announce.viewobjects;
2 2
3 3
public class AnnoQueryReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/announce/bean/AnnoType.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.announce.bean;
1
package com.css.oa.exam.announce.viewobjects;
2 2
3 3
public class AnnoType {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/announce/bean/SearchReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.announce.bean;
1
package com.css.oa.exam.announce.viewobjects;
2 2
3 3
public class SearchReq {
4 4

+ 1 - 4
oa-app/src/main/java/com/css/oa/exam/assign/controller/AdmissionController.java

@ -1,12 +1,9 @@
1 1
package com.css.oa.exam.assign.controller;
2 2
3
import com.css.oa.exam.assign.bean.AssignQueryReq;
3
import com.css.oa.exam.assign.viewobjects.AssignQueryReq;
4 4
import com.css.oa.exam.assign.service.AdmService;
5
import com.css.oa.exam.assign.service.AssignService;
6 5
import com.css.oa.exam.base.BaseController;
7 6
import com.css.oa.exam.constants.BoolState;
8
import com.css.oa.exam.enroll.bean.EnrollQueryReq;
9
import com.css.oa.exam.enroll.service.EnrollService;
10 7
import com.css.oa.utils.Result;
11 8
import io.swagger.annotations.Api;
12 9
import io.swagger.annotations.ApiOperation;

+ 4 - 4
oa-app/src/main/java/com/css/oa/exam/assign/controller/AssignController.java

@ -1,10 +1,10 @@
1 1
package com.css.oa.exam.assign.controller;
2 2
3
import com.css.oa.exam.assign.bean.AssignExportReq;
4
import com.css.oa.exam.assign.bean.AssignQueryReq;
3
import com.css.oa.exam.assign.viewobjects.AssignExportReq;
4
import com.css.oa.exam.assign.viewobjects.AssignQueryReq;
5 5
import com.css.oa.exam.base.BaseController;
6
import com.css.oa.exam.assign.bean.AssignReq;
7
import com.css.oa.exam.enroll.bean.BatchVerifyReq;
6
import com.css.oa.exam.assign.viewobjects.AssignReq;
7
import com.css.oa.exam.enroll.viewobjects.BatchVerifyReq;
8 8
import com.css.oa.exam.assign.service.AssignService;
9 9
import com.css.oa.utils.Result;
10 10
import io.swagger.annotations.Api;

+ 4 - 5
oa-app/src/main/java/com/css/oa/exam/assign/service/AdmService.java

@ -1,15 +1,14 @@
1 1
package com.css.oa.exam.assign.service;
2 2
3
import com.css.oa.exam.admin.bean.Admin;
4
import com.css.oa.exam.assign.bean.AssignQueryReq;
5
import com.css.oa.exam.assign.bean.Condition;
6
import com.css.oa.exam.assign.bean.MyAdmWrap;
3
import com.css.oa.exam.admin.viewobjects.Admin;
4
import com.css.oa.exam.assign.viewobjects.AssignQueryReq;
5
import com.css.oa.exam.assign.viewobjects.Condition;
6
import com.css.oa.exam.assign.viewobjects.MyAdmWrap;
7 7
import com.css.oa.exam.assign.repository.Assign;
8 8
import com.css.oa.exam.assign.repository.IAssignRepository;
9 9
import com.css.oa.exam.constants.BoolState;
10 10
import com.css.oa.exam.exam.repository.Exam;
11 11
import com.css.oa.exam.exam.repository.IExamRepository;
12
import com.css.oa.exam.node.repository.INodeRepository;
13 12
import com.css.oa.exam.node.service.NodeQueryService;
14 13
import com.css.oa.exam.room.repository.IRoomRepository;
15 14
import com.css.oa.exam.room.repository.Room;

+ 6 - 12
oa-app/src/main/java/com/css/oa/exam/assign/service/AssignService.java

@ -3,27 +3,21 @@ package com.css.oa.exam.assign.service;
3 3
import cn.afterturn.easypoi.excel.ExcelExportUtil;
4 4
import cn.afterturn.easypoi.excel.entity.ExportParams;
5 5
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
6
import com.css.bpm.platform.utils.PlatformDownloadUtils;
7
import com.css.oa.exam.admin.bean.Admin;
8
import com.css.oa.exam.assign.bean.AssignExportReq;
9
import com.css.oa.exam.assign.bean.AssignQueryReq;
10
import com.css.oa.exam.assign.bean.Condition;
6
import com.css.oa.exam.admin.viewobjects.Admin;
7
import com.css.oa.exam.assign.viewobjects.AssignExportReq;
8
import com.css.oa.exam.assign.viewobjects.AssignQueryReq;
9
import com.css.oa.exam.assign.viewobjects.Condition;
11 10
import com.css.oa.exam.assign.repository.Assign;
12 11
import com.css.oa.exam.assign.repository.AssignRecord;
13
import com.css.oa.exam.assign.repository.IAssignRecord;
14 12
import com.css.oa.exam.assign.repository.IAssignRepository;
15
import com.css.oa.exam.base.BaseVerifyService;
16
import com.css.oa.exam.assign.bean.AssignReq;
13
import com.css.oa.exam.assign.viewobjects.AssignReq;
17 14
import com.css.oa.exam.constants.BoolState;
18 15
import com.css.oa.exam.constants.ExamConfig;
19 16
import com.css.oa.exam.constants.ExportDTO;
20
import com.css.oa.exam.constants.VerifyState;
21
import com.css.oa.exam.enroll.bean.BatchVerifyReq;
22
import com.css.oa.exam.place.repository.IPlaceRepository;
17
import com.css.oa.exam.enroll.viewobjects.BatchVerifyReq;
23 18
import com.css.oa.exam.place.repository.Place;
24 19
import com.css.oa.exam.room.repository.IRoomRepository;
25 20
import com.css.oa.exam.room.repository.Room;
26
import com.css.oa.exam.student.repository.IStudentRepository;
27 21
import com.css.oa.exam.student.repository.Student;
28 22
import com.css.oa.exam.unit.repository.Unit;
29 23
import com.css.oa.exam.util.CopyObjTool;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/assign/service/BaseAssignService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.assign.service;
2 2
3
import com.css.oa.exam.admin.bean.Admin;
3
import com.css.oa.exam.admin.viewobjects.Admin;
4 4
import com.css.oa.exam.assign.repository.Assign;
5 5
import com.css.oa.exam.assign.repository.AssignRecord;
6 6
import com.css.oa.exam.assign.repository.IAssignRecord;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/assign/bean/AssignExportReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.assign.bean;
1
package com.css.oa.exam.assign.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.ExportDTO;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/assign/bean/AssignQueryReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.assign.bean;
1
package com.css.oa.exam.assign.viewobjects;
2 2
3 3
4 4
public class AssignQueryReq {

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/assign/bean/AssignReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.assign.bean;
1
package com.css.oa.exam.assign.viewobjects;
2 2
3 3
import lombok.Data;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/assign/bean/Condition.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.assign.bean;
1
package com.css.oa.exam.assign.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/assign/bean/MyAdmWrap.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.assign.bean;
1
package com.css.oa.exam.assign.viewobjects;
2 2
3 3
import com.fasterxml.jackson.annotation.JsonFormat;
4 4
import lombok.Data;

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/auth/controller/PlaceAuthController.java

@ -1,8 +1,8 @@
1 1
package com.css.oa.exam.auth.controller;
2 2
3
import com.css.oa.exam.auth.bean.UnitNode;
3
import com.css.oa.exam.auth.viewobjects.UnitNode;
4 4
import com.css.oa.exam.base.BaseController;
5
import com.css.oa.exam.auth.bean.PlaceAuthNode;
5
import com.css.oa.exam.auth.viewobjects.PlaceAuthNode;
6 6
import com.css.oa.exam.auth.service.PlaceAuthService;
7 7
import com.css.oa.utils.Result;
8 8
import io.swagger.annotations.Api;

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/auth/controller/RoomAuthController.java

@ -1,7 +1,7 @@
1 1
package com.css.oa.exam.auth.controller;
2 2
3
import com.css.oa.exam.auth.bean.PlaceAuthNode;
4
import com.css.oa.exam.auth.bean.UnitNode;
3
import com.css.oa.exam.auth.viewobjects.PlaceAuthNode;
4
import com.css.oa.exam.auth.viewobjects.UnitNode;
5 5
import com.css.oa.exam.auth.service.PlaceAuthService;
6 6
import com.css.oa.exam.base.BaseController;
7 7
import com.css.oa.utils.Result;

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/auth/service/PlaceAuthService.java

@ -1,8 +1,8 @@
1 1
package com.css.oa.exam.auth.service;
2 2
3
import com.css.oa.exam.auth.bean.UnitNode;
3
import com.css.oa.exam.auth.viewobjects.UnitNode;
4 4
import com.css.oa.exam.base.BaseVerifyService;
5
import com.css.oa.exam.auth.bean.PlaceAuthNode;
5
import com.css.oa.exam.auth.viewobjects.PlaceAuthNode;
6 6
import com.css.oa.exam.unit.repository.IUnitAuthRepository;
7 7
import com.css.oa.exam.unit.repository.IUnitRepository;
8 8
import com.css.oa.exam.unit.repository.Unit;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/auth/bean/PlaceAuthNode.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.auth.bean;
1
package com.css.oa.exam.auth.viewobjects;
2 2
3 3
import lombok.Data;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/auth/bean/UnitNode.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.auth.bean;
1
package com.css.oa.exam.auth.viewobjects;
2 2
3 3
public class UnitNode {
4 4

oa-app/src/main/java/com/css/oa/exam/auth/bean/res.json → oa-app/src/main/java/com/css/oa/exam/auth/viewobjects/res.json


oa-app/src/main/java/com/css/oa/exam/auth/bean/test.html → oa-app/src/main/java/com/css/oa/exam/auth/viewobjects/test.html


+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/base/BaseVerifyService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.base;
2 2
3
import com.css.oa.exam.admin.bean.Admin;
3
import com.css.oa.exam.admin.viewobjects.Admin;
4 4
import com.css.oa.exam.unit.repository.IUnitRepository;
5 5
import com.css.oa.exam.unit.repository.Unit;
6 6
import lombok.extern.slf4j.Slf4j;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/certificate/controller/CertiSetController.java

@ -1,7 +1,7 @@
1 1
package com.css.oa.exam.certificate.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.certificate.bean.CertiSetReq;
4
import com.css.oa.exam.certificate.viewobjects.CertiSetReq;
5 5
import com.css.oa.exam.certificate.repository.CertiSet;
6 6
import com.css.oa.exam.certificate.service.CertiSetService;
7 7
import com.css.oa.exam.constants.BoolState;

+ 2 - 3
oa-app/src/main/java/com/css/oa/exam/certificate/controller/CertifiController.java

@ -1,9 +1,8 @@
1 1
package com.css.oa.exam.certificate.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.certificate.bean.CertiQueryReq;
5
import com.css.oa.exam.certificate.bean.ClientResWrap;
6
import com.css.oa.exam.certificate.repository.Certificate;
4
import com.css.oa.exam.certificate.viewobjects.CertiQueryReq;
5
import com.css.oa.exam.certificate.viewobjects.ClientResWrap;
7 6
import com.css.oa.exam.certificate.service.CertifiService;
8 7
import com.css.oa.utils.Result;
9 8
import io.swagger.annotations.Api;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/certificate/service/CertiSetService.java

@ -1,7 +1,7 @@
1 1
package com.css.oa.exam.certificate.service;
2 2
3 3
import com.css.oa.exam.base.BaseService;
4
import com.css.oa.exam.certificate.bean.CertiSetReq;
4
import com.css.oa.exam.certificate.viewobjects.CertiSetReq;
5 5
import com.css.oa.exam.certificate.repository.CertiSet;
6 6
import com.css.oa.exam.certificate.repository.ICertiSetRepository;
7 7
import com.css.oa.exam.constants.BoolState;

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/certificate/service/CertifiService.java

@ -1,8 +1,8 @@
1 1
package com.css.oa.exam.certificate.service;
2 2
3 3
import com.css.oa.exam.base.BaseVerifyService;
4
import com.css.oa.exam.certificate.bean.CertiQueryReq;
5
import com.css.oa.exam.certificate.bean.ClientResWrap;
4
import com.css.oa.exam.certificate.viewobjects.CertiQueryReq;
5
import com.css.oa.exam.certificate.viewobjects.ClientResWrap;
6 6
import com.css.oa.exam.certificate.repository.Certificate;
7 7
import com.css.oa.exam.certificate.repository.ICertificateRepository;
8 8
import com.css.oa.exam.constants.BoolState;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/certificate/service/ICertiSetService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.certificate.service;
2 2
3
import com.css.oa.exam.certificate.bean.CertiSetReq;
3
import com.css.oa.exam.certificate.viewobjects.CertiSetReq;
4 4
import com.css.oa.exam.certificate.repository.CertiSet;
5 5
6 6
import java.util.List;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/certificate/bean/CertiQueryReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.certificate.bean;
1
package com.css.oa.exam.certificate.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/certificate/bean/CertiSetReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.certificate.bean;
1
package com.css.oa.exam.certificate.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 1 - 2
oa-app/src/main/java/com/css/oa/exam/certificate/bean/ClientResWrap.java

@ -1,9 +1,8 @@
1
package com.css.oa.exam.certificate.bean;
1
package com.css.oa.exam.certificate.viewobjects;
2 2
3 3
import com.fasterxml.jackson.annotation.JsonFormat;
4 4
import lombok.Data;
5 5
6
import javax.persistence.Column;
7 6
import java.util.Date;
8 7
9 8
@Data

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/cheat/controller/CheatSetController.java

@ -1,7 +1,7 @@
1 1
package com.css.oa.exam.cheat.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.cheat.bean.SettingReq;
4
import com.css.oa.exam.cheat.viewobjects.SettingReq;
5 5
import com.css.oa.exam.cheat.repository.CheatSet;
6 6
import com.css.oa.exam.cheat.service.CheatSetService;
7 7
import com.css.oa.utils.Result;

+ 1 - 3
oa-app/src/main/java/com/css/oa/exam/cheat/service/CheatSetService.java

@ -1,13 +1,11 @@
1 1
package com.css.oa.exam.cheat.service;
2 2
3 3
import com.css.oa.exam.base.BaseService;
4
import com.css.oa.exam.cheat.bean.SettingReq;
4
import com.css.oa.exam.cheat.viewobjects.SettingReq;
5 5
import com.css.oa.exam.cheat.repository.Blacklist;
6 6
import com.css.oa.exam.cheat.repository.CheatSet;
7 7
import com.css.oa.exam.cheat.repository.IBlacklistRepository;
8 8
import com.css.oa.exam.cheat.repository.ICheatSetRepository;
9
import com.css.oa.exam.exam.repository.Exam;
10
import com.css.oa.exam.exam.repository.IExamRepository;
11 9
import com.css.oa.exam.util.CopyObjTool;
12 10
import com.css.oa.utils.UUIDGenerator;
13 11
import lombok.extern.slf4j.Slf4j;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/cheat/service/ICheatSetService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.cheat.service;
2 2
3
import com.css.oa.exam.cheat.bean.SettingReq;
3
import com.css.oa.exam.cheat.viewobjects.SettingReq;
4 4
import com.css.oa.exam.cheat.repository.CheatSet;
5 5
6 6
import java.util.List;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/cheat/bean/SettingReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.cheat.bean;
1
package com.css.oa.exam.cheat.viewobjects;
2 2
3 3
public class SettingReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/enroll/controller/EnrollController.java

@ -3,7 +3,7 @@ package com.css.oa.exam.enroll.controller;
3 3
import com.css.oa.exam.base.BaseController;
4 4
import com.css.oa.exam.cheat.service.ICheatSetService;
5 5
import com.css.oa.exam.constants.BoolState;
6
import com.css.oa.exam.enroll.bean.*;
6
import com.css.oa.exam.enroll.viewobjects.*;
7 7
import com.css.oa.exam.enroll.repository.MyEnrollWrap;
8 8
import com.css.oa.exam.enroll.service.EnrollService;
9 9
import com.css.oa.exam.node.service.NodeQueryService;

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/enroll/controller/PayController.java

@ -2,10 +2,10 @@ package com.css.oa.exam.enroll.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4 4
import com.css.oa.exam.constants.BoolState;
5
import com.css.oa.exam.enroll.bean.*;
5
import com.css.oa.exam.enroll.viewobjects.*;
6 6
import com.css.oa.exam.enroll.service.EnrollService;
7 7
import com.css.oa.exam.enroll.service.PayService;
8
import com.css.oa.exam.place.bean.DropdownVerifyState;
8
import com.css.oa.exam.place.viewobjects.DropdownVerifyState;
9 9
import com.css.oa.utils.Result;
10 10
import io.swagger.annotations.Api;
11 11
import io.swagger.annotations.ApiOperation;

+ 3 - 3
oa-app/src/main/java/com/css/oa/exam/enroll/service/EnrollService.java

@ -3,17 +3,17 @@ package com.css.oa.exam.enroll.service;
3 3
import cn.afterturn.easypoi.excel.ExcelExportUtil;
4 4
import cn.afterturn.easypoi.excel.entity.ExportParams;
5 5
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
6
import com.css.oa.exam.admin.bean.Admin;
6
import com.css.oa.exam.admin.viewobjects.Admin;
7 7
import com.css.oa.exam.assign.repository.IAssignRecord;
8 8
import com.css.oa.exam.assign.repository.IAssignRepository;
9 9
import com.css.oa.exam.base.BaseVerifyService;
10 10
import com.css.oa.exam.certificate.repository.ICertificateRepository;
11 11
import com.css.oa.exam.constants.*;
12
import com.css.oa.exam.enroll.bean.*;
12
import com.css.oa.exam.enroll.viewobjects.*;
13 13
import com.css.oa.exam.enroll.repository.*;
14 14
import com.css.oa.exam.exam.repository.Exam;
15 15
import com.css.oa.exam.exam.repository.IExamRepository;
16
import com.css.oa.exam.place.bean.DropdownVerifyState;
16
import com.css.oa.exam.place.viewobjects.DropdownVerifyState;
17 17
import com.css.oa.exam.place.repository.IPlaceRepository;
18 18
import com.css.oa.exam.place.repository.Place;
19 19
import com.css.oa.exam.score.repository.IScoreRepository;

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/enroll/service/IEnrollService.java

@ -1,7 +1,7 @@
1 1
package com.css.oa.exam.enroll.service;
2 2
3
import com.css.oa.exam.enroll.bean.AddReq;
4
import com.css.oa.exam.enroll.bean.EnrollQueryReq;
3
import com.css.oa.exam.enroll.viewobjects.AddReq;
4
import com.css.oa.exam.enroll.viewobjects.EnrollQueryReq;
5 5
import com.css.oa.exam.enroll.repository.Enroll;
6 6
import com.css.oa.exam.enroll.repository.MyEnrollWrap;
7 7

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/enroll/service/IPayService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.enroll.service;
2 2
3
import com.css.oa.exam.enroll.bean.BatchVerifyReq;
3
import com.css.oa.exam.enroll.viewobjects.BatchVerifyReq;
4 4
5 5
public interface IPayService {
6 6

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/enroll/service/PayService.java

@ -1,13 +1,13 @@
1 1
package com.css.oa.exam.enroll.service;
2 2
3
import com.css.oa.exam.admin.bean.Admin;
3
import com.css.oa.exam.admin.viewobjects.Admin;
4 4
import com.css.oa.exam.assign.repository.Assign;
5 5
import com.css.oa.exam.assign.repository.AssignRecord;
6 6
import com.css.oa.exam.assign.repository.IAssignRecord;
7 7
import com.css.oa.exam.assign.repository.IAssignRepository;
8 8
import com.css.oa.exam.base.BaseVerifyService;
9 9
import com.css.oa.exam.constants.BoolState;
10
import com.css.oa.exam.enroll.bean.BatchVerifyReq;
10
import com.css.oa.exam.enroll.viewobjects.BatchVerifyReq;
11 11
import com.css.oa.exam.enroll.repository.*;
12 12
import com.css.oa.exam.util.CopyObjTool;
13 13
import com.css.oa.utils.UUIDGenerator;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/enroll/bean/AddReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.enroll.bean;
1
package com.css.oa.exam.enroll.viewobjects;
2 2
3 3
public class AddReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/enroll/bean/BatchVerifyReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.enroll.bean;
1
package com.css.oa.exam.enroll.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 1 - 2
oa-app/src/main/java/com/css/oa/exam/enroll/bean/Condition.java

@ -1,7 +1,6 @@
1
package com.css.oa.exam.enroll.bean;
1
package com.css.oa.exam.enroll.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4
import com.css.oa.exam.constants.MyOrder;
5 4
6 5
import java.util.ArrayList;
7 6
import java.util.List;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/enroll/bean/DisableReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.enroll.bean;
1
package com.css.oa.exam.enroll.viewobjects;
2 2
3 3
import com.css.oa.exam.enroll.repository.Enroll;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/enroll/bean/EnrollQueryReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.enroll.bean;
1
package com.css.oa.exam.enroll.viewobjects;
2 2
3 3
4 4
public class EnrollQueryReq {

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/enroll/bean/ExportEnrollReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.enroll.bean;
1
package com.css.oa.exam.enroll.viewobjects;
2 2
3 3
4 4
import com.css.oa.exam.constants.ExportDTO;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/exam/service/ExamService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.exam.service;
2 2
3
import com.css.oa.exam.admin.bean.Admin;
3
import com.css.oa.exam.admin.viewobjects.Admin;
4 4
import com.css.oa.exam.base.BaseService;
5 5
import com.css.oa.exam.exam.repository.IExamRepository;
6 6
import com.css.oa.exam.exam.repository.Exam;

+ 2 - 3
oa-app/src/main/java/com/css/oa/exam/level/controller/LevelController.java

@ -1,10 +1,9 @@
1 1
package com.css.oa.exam.level.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.level.bean.Level;
4
import com.css.oa.exam.level.viewobjects.Level;
5 5
import com.css.oa.exam.level.service.LevelService;
6
import com.css.oa.exam.series.bean.AddReq;
7
import com.css.oa.exam.series.bean.Series;
6
import com.css.oa.exam.series.viewobjects.AddReq;
8 7
import com.css.oa.utils.Result;
9 8
import io.swagger.annotations.Api;
10 9
import io.swagger.annotations.ApiOperation;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/level/service/ILevelService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.level.service;
2 2
3
import com.css.oa.exam.level.bean.Level;
3
import com.css.oa.exam.level.viewobjects.Level;
4 4
5 5
import java.util.List;
6 6
import java.util.Map;

+ 1 - 5
oa-app/src/main/java/com/css/oa/exam/level/service/LevelService.java

@ -1,14 +1,10 @@
1 1
package com.css.oa.exam.level.service;
2 2
3
import com.css.oa.exam.base.BaseService;
4
import com.css.oa.exam.level.bean.Level;
3
import com.css.oa.exam.level.viewobjects.Level;
5 4
import com.css.oa.exam.series.repository.ExamDictionary;
6
import com.css.oa.exam.series.repository.IExamDictionaryRepository;
7 5
import com.css.oa.exam.series.service.BaseDicServise;
8
import com.css.oa.exam.series.service.ISeriesService;
9 6
import com.css.oa.exam.util.CopyObjTool;
10 7
import lombok.extern.slf4j.Slf4j;
11
import org.springframework.beans.factory.annotation.Autowired;
12 8
import org.springframework.stereotype.Service;
13 9
14 10
import java.util.*;

+ 1 - 5
oa-app/src/main/java/com/css/oa/exam/level/bean/Level.java

@ -1,11 +1,7 @@
1
package com.css.oa.exam.level.bean;
1
package com.css.oa.exam.level.viewobjects;
2 2
3 3
import lombok.Data;
4 4
5
import javax.persistence.Column;
6
import javax.persistence.Entity;
7
import javax.persistence.Id;
8
import javax.persistence.Table;
9 5
import java.io.Serializable;
10 6
11 7
@Data

+ 4 - 6
oa-app/src/main/java/com/css/oa/exam/monitor/controller/MonitorController.java

@ -1,13 +1,12 @@
1 1
package com.css.oa.exam.monitor.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.monitor.bean.AssignMonitorReq;
5
import com.css.oa.exam.monitor.bean.ExportMonitorReq;
6
import com.css.oa.exam.monitor.bean.MonitorQueryReq;
7
import com.css.oa.exam.monitor.bean.VerifyReq;
4
import com.css.oa.exam.monitor.viewobjects.AssignMonitorReq;
5
import com.css.oa.exam.monitor.viewobjects.ExportMonitorReq;
6
import com.css.oa.exam.monitor.viewobjects.MonitorQueryReq;
7
import com.css.oa.exam.monitor.viewobjects.VerifyReq;
8 8
import com.css.oa.exam.monitor.repository.Monitor;
9 9
import com.css.oa.exam.monitor.service.MonitorService;
10
import com.css.oa.exam.place.bean.ExportPlaceReq;
11 10
import com.css.oa.utils.Result;
12 11
import io.swagger.annotations.Api;
13 12
import io.swagger.annotations.ApiOperation;
@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
16 15
import org.springframework.web.bind.annotation.*;
17 16
18 17
import javax.servlet.http.HttpServletResponse;
19
import java.util.HashMap;
20 18
import java.util.List;
21 19
import java.util.Map;
22 20

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/monitor/service/IMonitorService.java

@ -1,7 +1,7 @@
1 1
package com.css.oa.exam.monitor.service;
2 2
3
import com.css.oa.exam.monitor.bean.AssignMonitorReq;
4
import com.css.oa.exam.monitor.bean.MonitorQueryReq;
3
import com.css.oa.exam.monitor.viewobjects.AssignMonitorReq;
4
import com.css.oa.exam.monitor.viewobjects.MonitorQueryReq;
5 5
import com.css.oa.exam.monitor.repository.Monitor;
6 6
7 7
import java.util.List;

+ 2 - 3
oa-app/src/main/java/com/css/oa/exam/monitor/service/MonitorService.java

@ -3,12 +3,11 @@ package com.css.oa.exam.monitor.service;
3 3
import cn.afterturn.easypoi.excel.ExcelExportUtil;
4 4
import cn.afterturn.easypoi.excel.entity.ExportParams;
5 5
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
6
import com.css.bpm.platform.utils.PlatformDownloadUtils;
7
import com.css.oa.exam.admin.bean.Admin;
6
import com.css.oa.exam.admin.viewobjects.Admin;
8 7
import com.css.oa.exam.base.BaseVerifyService;
9 8
import com.css.oa.exam.constants.ExamConfig;
10 9
import com.css.oa.exam.constants.ExportDTO;
11
import com.css.oa.exam.monitor.bean.*;
10
import com.css.oa.exam.monitor.viewobjects.*;
12 11
import com.css.oa.exam.monitor.repository.IMonitorCountRepository;
13 12
import com.css.oa.exam.monitor.repository.Monitor;
14 13
import com.css.oa.exam.monitor.repository.IMonitorRepository;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/monitor/bean/AssignMonitorReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.monitor.bean;
1
package com.css.oa.exam.monitor.viewobjects;
2 2
3 3
import lombok.Data;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/monitor/bean/AssignOne.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.monitor.bean;
1
package com.css.oa.exam.monitor.viewobjects;
2 2
3 3
import lombok.Data;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/monitor/bean/Condition.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.monitor.bean;
1
package com.css.oa.exam.monitor.viewobjects;
2 2
3 3
public class Condition {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/monitor/bean/ExportMonitorReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.monitor.bean;
1
package com.css.oa.exam.monitor.viewobjects;
2 2
3 3
4 4
import com.css.oa.exam.constants.ExportDTO;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/monitor/bean/MonitorQueryReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.monitor.bean;
1
package com.css.oa.exam.monitor.viewobjects;
2 2
3 3
public class MonitorQueryReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/monitor/bean/MonitorVerifiState.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.monitor.bean;
1
package com.css.oa.exam.monitor.viewobjects;
2 2
3 3
public class MonitorVerifiState {
4 4
    public static final int LEVEL2_WAIT = 29;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/monitor/bean/VerifyReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.monitor.bean;
1
package com.css.oa.exam.monitor.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 3 - 3
oa-app/src/main/java/com/css/oa/exam/multiple/contoller/MultipleController.java

@ -1,9 +1,9 @@
1 1
package com.css.oa.exam.multiple.contoller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.multiple.bean.MultiCondiReq;
5
import com.css.oa.exam.multiple.bean.ExportMultiReq;
6
import com.css.oa.exam.multiple.bean.MultiPageReq;
4
import com.css.oa.exam.multiple.viewobjects.MultiCondiReq;
5
import com.css.oa.exam.multiple.viewobjects.ExportMultiReq;
6
import com.css.oa.exam.multiple.viewobjects.MultiPageReq;
7 7
import com.css.oa.exam.multiple.service.MultipleService;
8 8
import com.css.oa.utils.Result;
9 9
import io.swagger.annotations.Api;

+ 6 - 6
oa-app/src/main/java/com/css/oa/exam/multiple/service/MultipleService.java

@ -3,7 +3,7 @@ package com.css.oa.exam.multiple.service;
3 3
import cn.afterturn.easypoi.excel.ExcelExportUtil;
4 4
import cn.afterturn.easypoi.excel.entity.ExportParams;
5 5
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
6
import com.css.oa.exam.admin.bean.Admin;
6
import com.css.oa.exam.admin.viewobjects.Admin;
7 7
import com.css.oa.exam.assign.repository.Assign;
8 8
import com.css.oa.exam.assign.repository.IAssignRepository;
9 9
import com.css.oa.exam.base.BaseVerifyService;
@ -15,11 +15,11 @@ import com.css.oa.exam.enroll.repository.Enroll;
15 15
import com.css.oa.exam.enroll.repository.EnrollRecord;
16 16
import com.css.oa.exam.enroll.repository.IEnrollRecord;
17 17
import com.css.oa.exam.enroll.repository.IEnrollRepository;
18
import com.css.oa.exam.multiple.bean.Condition;
19
import com.css.oa.exam.multiple.bean.MultiCondiReq;
20
import com.css.oa.exam.multiple.bean.ExportMultiReq;
21
import com.css.oa.exam.multiple.bean.MultiWrap;
22
import com.css.oa.exam.place.bean.DropdownVerifyState;
18
import com.css.oa.exam.multiple.viewobjects.Condition;
19
import com.css.oa.exam.multiple.viewobjects.MultiCondiReq;
20
import com.css.oa.exam.multiple.viewobjects.ExportMultiReq;
21
import com.css.oa.exam.multiple.viewobjects.MultiWrap;
22
import com.css.oa.exam.place.viewobjects.DropdownVerifyState;
23 23
import com.css.oa.exam.score.repository.IScoreRepository;
24 24
import com.css.oa.exam.student.repository.IStudentRepository;
25 25
import com.css.oa.exam.student.repository.Student;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/multiple/bean/Condition.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.multiple.bean;
1
package com.css.oa.exam.multiple.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/multiple/bean/ExportMultiReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.multiple.bean;
1
package com.css.oa.exam.multiple.viewobjects;
2 2
3 3
4 4
import com.css.oa.exam.constants.ExportDTO;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/multiple/bean/MultiCondiReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.multiple.bean;
1
package com.css.oa.exam.multiple.viewobjects;
2 2
3 3
4 4
public class MultiCondiReq {

+ 1 - 3
oa-app/src/main/java/com/css/oa/exam/multiple/bean/MultiPageReq.java

@ -1,8 +1,6 @@
1
package com.css.oa.exam.multiple.bean;
1
package com.css.oa.exam.multiple.viewobjects;
2 2
3 3
4
import com.css.oa.exam.constants.BoolState;
5
6 4
public class MultiPageReq {
7 5
8 6
    public int curPage;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/multiple/bean/MultiWrap.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.multiple.bean;
1
package com.css.oa.exam.multiple.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4
import lombok.Data;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/node/service/NodeQueryService.java

@ -1,7 +1,7 @@
1 1
package com.css.oa.exam.node.service;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4
import com.css.oa.exam.node.bean.NodeType;
4
import com.css.oa.exam.node.viewobjects.NodeType;
5 5
import com.css.oa.exam.node.repository.INodeRepository;
6 6
import com.css.oa.exam.node.repository.Node;
7 7
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/node/bean/NodeType.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.node.bean;
1
package com.css.oa.exam.node.viewobjects;
2 2
3 3
public interface NodeType {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/controller/PlaceController.java

@ -2,7 +2,7 @@ package com.css.oa.exam.place.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4 4
import com.css.oa.exam.constants.BoolState;
5
import com.css.oa.exam.place.bean.*;
5
import com.css.oa.exam.place.viewobjects.*;
6 6
import com.css.oa.exam.place.repository.Place;
7 7
import com.css.oa.exam.place.service.PlaceService;
8 8
import com.css.oa.utils.Result;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/service/IPlaceService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.place.service;
2 2
3
import com.css.oa.exam.place.bean.*;
3
import com.css.oa.exam.place.viewobjects.*;
4 4
import com.css.oa.exam.place.repository.Place;
5 5
6 6
import java.util.List;

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/place/service/PlaceService.java

@ -3,14 +3,14 @@ package com.css.oa.exam.place.service;
3 3
import cn.afterturn.easypoi.excel.ExcelExportUtil;
4 4
import cn.afterturn.easypoi.excel.entity.ExportParams;
5 5
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
6
import com.css.oa.exam.admin.bean.Admin;
6
import com.css.oa.exam.admin.viewobjects.Admin;
7 7
import com.css.oa.exam.base.BaseVerifyService;
8 8
import com.css.oa.exam.constants.BoolState;
9 9
import com.css.oa.exam.constants.ExamConfig;
10 10
import com.css.oa.exam.constants.ExportDTO;
11 11
import com.css.oa.exam.exam.repository.Exam;
12 12
import com.css.oa.exam.exam.repository.IExamRepository;
13
import com.css.oa.exam.place.bean.*;
13
import com.css.oa.exam.place.viewobjects.*;
14 14
import com.css.oa.exam.place.repository.IPlaceRecordRepo;
15 15
import com.css.oa.exam.place.repository.IPlaceRepository;
16 16
import com.css.oa.exam.place.repository.Place;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/bean/Condition.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.place.bean;
1
package com.css.oa.exam.place.viewobjects;
2 2
3 3
//包含exam_id、考点名称、维护单位、区域、状态
4 4
public class Condition {

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/bean/DropdownVerifyState.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.place.bean;
1
package com.css.oa.exam.place.viewobjects;
2 2
3 3
import java.util.*;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/bean/ExportPlaceReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.place.bean;
1
package com.css.oa.exam.place.viewobjects;
2 2
3 3
4 4
import com.css.oa.exam.constants.ExportDTO;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/bean/PlaceDuplicateBean.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.place.bean;
1
package com.css.oa.exam.place.viewobjects;
2 2
3 3
import java.util.ArrayList;
4 4
import java.util.List;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/bean/PlaceQueryReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.place.bean;
1
package com.css.oa.exam.place.viewobjects;
2 2
3 3
4 4
public class PlaceQueryReq {

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/bean/PlaceResultWrap.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.place.bean;
1
package com.css.oa.exam.place.viewobjects;
2 2
3 3
import com.css.oa.exam.place.repository.Place;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/bean/VerifyOneReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.place.bean;
1
package com.css.oa.exam.place.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/place/bean/VerifyReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.place.bean;
1
package com.css.oa.exam.place.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

oa-app/src/main/java/com/css/oa/exam/place/bean/dtos.json → oa-app/src/main/java/com/css/oa/exam/place/viewobjects/dtos.json


+ 0 - 16
oa-app/src/main/java/com/css/oa/exam/report/bean/PRPExportReq.java

@ -1,16 +0,0 @@
1
package com.css.oa.exam.report.bean;
2
3
import com.css.oa.exam.constants.ExportDTO;
4
5
import java.util.ArrayList;
6
import java.util.List;
7
8
public class PRPExportReq {
9
10
    public String exam_id;
11
12
//    public int curPage;
13
//
14
//    public int pageSize;
15
16
}

+ 0 - 16
oa-app/src/main/java/com/css/oa/exam/report/bean/PRPReq.java

@ -1,16 +0,0 @@
1
package com.css.oa.exam.report.bean;
2
3
import com.css.oa.exam.constants.ExportDTO;
4
5
import java.util.ArrayList;
6
import java.util.List;
7
8
public class PRPReq {
9
10
    public String place_id;
11
12
    public int curPage;
13
14
    public int pageSize;
15
16
}

+ 1 - 4
oa-app/src/main/java/com/css/oa/exam/report/controller/ReportController.java

@ -1,8 +1,7 @@
1 1
package com.css.oa.exam.report.controller;
2 2
3
import com.css.oa.exam.assign.bean.AssignExportReq;
4 3
import com.css.oa.exam.base.BaseController;
5
import com.css.oa.exam.report.bean.*;
4
import com.css.oa.exam.report.viewobjects.*;
6 5
import com.css.oa.exam.report.service.ReportService;
7 6
import com.css.oa.utils.Result;
8 7
import io.swagger.annotations.Api;
@ -12,8 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
12 11
import org.springframework.web.bind.annotation.*;
13 12
14 13
import javax.servlet.http.HttpServletResponse;
15
import java.util.HashMap;
16
import java.util.List;
17 14
import java.util.Map;
18 15
19 16
@Api(tags = {"统计报表"})

+ 1 - 19
oa-app/src/main/java/com/css/oa/exam/report/service/ReportService.java

@ -3,52 +3,34 @@ package com.css.oa.exam.report.service;
3 3
import cn.afterturn.easypoi.excel.ExcelExportUtil;
4 4
import cn.afterturn.easypoi.excel.entity.ExportParams;
5 5
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
6
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
7
import com.css.oa.exam.admin.bean.Admin;
8
import com.css.oa.exam.assign.bean.AssignExportReq;
9 6
import com.css.oa.exam.assign.repository.Assign;
10
import com.css.oa.exam.assign.repository.AssignRecord;
11 7
import com.css.oa.exam.assign.repository.IAssignRepository;
12 8
import com.css.oa.exam.base.BaseService;
13
import com.css.oa.exam.constants.BoolState;
14
import com.css.oa.exam.constants.ExamConfig;
15
import com.css.oa.exam.constants.ExportDTO;
16 9
import com.css.oa.exam.exam.repository.Exam;
17 10
import com.css.oa.exam.exam.repository.IExamRepository;
18 11
import com.css.oa.exam.place.repository.IPlaceRepository;
19 12
import com.css.oa.exam.place.repository.Place;
20
import com.css.oa.exam.report.bean.*;
13
import com.css.oa.exam.report.viewobjects.*;
21 14
import com.css.oa.exam.room.repository.IRoomRepository;
22 15
import com.css.oa.exam.room.repository.Room;
23
import com.css.oa.exam.score.bean.AnalyseColumn;
24 16
import com.css.oa.exam.student.repository.IStudentRepository;
25 17
import com.css.oa.exam.student.repository.Student;
26 18
import com.css.oa.exam.unit.repository.IUnitRepository;
27 19
import com.css.oa.exam.unit.repository.Unit;
28 20
import com.css.oa.exam.util.CopyObjTool;
29 21
import com.css.oa.exam.util.ExcelDelegate;
30
import com.css.oa.exam.util.ExportHelper;
31 22
import lombok.extern.slf4j.Slf4j;
32 23
import org.apache.http.util.TextUtils;
33
import org.apache.poi.hssf.usermodel.HSSFRow;
34
import org.apache.poi.hssf.usermodel.HSSFSheet;
35
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
36 24
import org.apache.poi.ss.usermodel.Workbook;
37 25
import org.springframework.beans.BeanUtils;
38 26
import org.springframework.beans.factory.annotation.Autowired;
39 27
import org.springframework.data.domain.Page;
40 28
import org.springframework.data.domain.PageRequest;
41
import org.springframework.data.domain.Sort;
42 29
import org.springframework.data.jpa.domain.Specification;
43 30
import org.springframework.stereotype.Service;
44 31
45 32
import javax.persistence.criteria.*;
46 33
import javax.servlet.http.HttpServletResponse;
47
import java.io.BufferedOutputStream;
48
import java.io.ByteArrayInputStream;
49
import java.io.ByteArrayOutputStream;
50
import java.io.OutputStream;
51
import java.net.URLEncoder;
52 34
import java.util.ArrayList;
53 35
import java.util.HashMap;
54 36
import java.util.List;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/report/bean/PRExcelEntity.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.report.bean;
1
package com.css.oa.exam.report.viewobjects;
2 2
3 3
import cn.afterturn.easypoi.excel.annotation.Excel;
4 4
import cn.afterturn.easypoi.excel.annotation.ExcelTarget;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/report/bean/PRExportReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.report.bean;
1
package com.css.oa.exam.report.viewobjects;
2 2
3 3
public class PRExportReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/report/bean/PRPExcelEntity.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.report.bean;
1
package com.css.oa.exam.report.viewobjects;
2 2
3 3
import cn.afterturn.easypoi.excel.annotation.Excel;
4 4
import cn.afterturn.easypoi.excel.annotation.ExcelTarget;

+ 11 - 0
oa-app/src/main/java/com/css/oa/exam/report/viewobjects/PRPExportReq.java

@ -0,0 +1,11 @@
1
package com.css.oa.exam.report.viewobjects;
2
3
public class PRPExportReq {
4
5
    public String exam_id;
6
7
//    public int curPage;
8
//
9
//    public int pageSize;
10
11
}

+ 11 - 0
oa-app/src/main/java/com/css/oa/exam/report/viewobjects/PRPReq.java

@ -0,0 +1,11 @@
1
package com.css.oa.exam.report.viewobjects;
2
3
public class PRPReq {
4
5
    public String place_id;
6
7
    public int curPage;
8
9
    public int pageSize;
10
11
}

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/report/bean/PRReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.report.bean;
1
package com.css.oa.exam.report.viewobjects;
2 2
3 3
public class PRReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/report/bean/UPExcelEntity.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.report.bean;
1
package com.css.oa.exam.report.viewobjects;
2 2
3 3
import cn.afterturn.easypoi.excel.annotation.Excel;
4 4
import cn.afterturn.easypoi.excel.annotation.ExcelTarget;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/report/bean/UPExportReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.report.bean;
1
package com.css.oa.exam.report.viewobjects;
2 2
3 3
public class UPExportReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/report/bean/UPReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.report.bean;
1
package com.css.oa.exam.report.viewobjects;
2 2
3 3
public class UPReq {
4 4

+ 5 - 5
oa-app/src/main/java/com/css/oa/exam/room/controller/RoomController.java

@ -2,11 +2,11 @@ package com.css.oa.exam.room.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4 4
import com.css.oa.exam.constants.BoolState;
5
import com.css.oa.exam.place.bean.VerifyOneReq;
6
import com.css.oa.exam.place.bean.VerifyReq;
7
import com.css.oa.exam.room.bean.Condition;
8
import com.css.oa.exam.room.bean.ExportRoomReq;
9
import com.css.oa.exam.room.bean.RoomQueryReq;
5
import com.css.oa.exam.place.viewobjects.VerifyOneReq;
6
import com.css.oa.exam.place.viewobjects.VerifyReq;
7
import com.css.oa.exam.room.viewobjects.Condition;
8
import com.css.oa.exam.room.viewobjects.ExportRoomReq;
9
import com.css.oa.exam.room.viewobjects.RoomQueryReq;
10 10
import com.css.oa.exam.room.repository.Room;
11 11
import com.css.oa.exam.room.service.RoomService;
12 12
import com.css.oa.utils.Result;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/room/service/IRoomService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.room.service;
2 2
3
import com.css.oa.exam.room.bean.RoomQueryReq;
3
import com.css.oa.exam.room.viewobjects.RoomQueryReq;
4 4
import com.css.oa.exam.room.repository.Room;
5 5
6 6
import java.util.List;

+ 6 - 7
oa-app/src/main/java/com/css/oa/exam/room/service/RoomService.java

@ -3,17 +3,16 @@ package com.css.oa.exam.room.service;
3 3
import cn.afterturn.easypoi.excel.ExcelExportUtil;
4 4
import cn.afterturn.easypoi.excel.entity.ExportParams;
5 5
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
6
import com.css.oa.exam.admin.bean.Admin;
6
import com.css.oa.exam.admin.viewobjects.Admin;
7 7
import com.css.oa.exam.base.BaseVerifyService;
8 8
import com.css.oa.exam.constants.BoolState;
9 9
import com.css.oa.exam.constants.ExamConfig;
10 10
import com.css.oa.exam.constants.ExportDTO;
11
import com.css.oa.exam.place.bean.VerifyOneReq;
12
import com.css.oa.exam.place.bean.VerifyReq;
13
import com.css.oa.exam.place.repository.Place;
14
import com.css.oa.exam.room.bean.Condition;
15
import com.css.oa.exam.room.bean.ExportRoomReq;
16
import com.css.oa.exam.room.bean.RoomQueryReq;
11
import com.css.oa.exam.place.viewobjects.VerifyOneReq;
12
import com.css.oa.exam.place.viewobjects.VerifyReq;
13
import com.css.oa.exam.room.viewobjects.Condition;
14
import com.css.oa.exam.room.viewobjects.ExportRoomReq;
15
import com.css.oa.exam.room.viewobjects.RoomQueryReq;
17 16
import com.css.oa.exam.room.repository.IRoomRecordRepo;
18 17
import com.css.oa.exam.room.repository.IRoomRepository;
19 18
import com.css.oa.exam.room.repository.Room;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/room/bean/Condition.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.room.bean;
1
package com.css.oa.exam.room.viewobjects;
2 2
3 3
public class Condition {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/room/bean/ExportRoomReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.room.bean;
1
package com.css.oa.exam.room.viewobjects;
2 2
3 3
4 4
import com.css.oa.exam.constants.ExportDTO;

+ 1 - 3
oa-app/src/main/java/com/css/oa/exam/room/bean/RoomQueryReq.java

@ -1,6 +1,4 @@
1
package com.css.oa.exam.room.bean;
2
3
import java.util.ArrayList;
1
package com.css.oa.exam.room.viewobjects;
4 2
5 3
public class RoomQueryReq {
6 4

+ 1 - 2
oa-app/src/main/java/com/css/oa/exam/score/controller/ScoreController.java

@ -1,8 +1,7 @@
1 1
package com.css.oa.exam.score.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.score.bean.*;
5
import com.css.oa.exam.score.service.IScoreService;
4
import com.css.oa.exam.score.viewobjects.*;
6 5
import com.css.oa.exam.score.service.ScoreService;
7 6
import com.css.oa.utils.Result;
8 7
import io.swagger.annotations.Api;

+ 0 - 6
oa-app/src/main/java/com/css/oa/exam/score/service/IScoreService.java

@ -1,11 +1,5 @@
1 1
package com.css.oa.exam.score.service;
2 2
3
import com.css.oa.exam.score.bean.ScoreQueryReq;
4
import com.css.oa.exam.score.repository.Score;
5
6
import java.util.List;
7
import java.util.Map;
8
9 3
public interface IScoreService {
10 4
11 5
}

+ 3 - 3
oa-app/src/main/java/com/css/oa/exam/score/service/ScoreService.java

@ -5,8 +5,8 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
5 5
import cn.afterturn.easypoi.excel.entity.ExportParams;
6 6
import cn.afterturn.easypoi.excel.entity.ImportParams;
7 7
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
8
import com.css.oa.exam.admin.bean.Admin;
9
import com.css.oa.exam.assign.bean.MyAdmWrap;
8
import com.css.oa.exam.admin.viewobjects.Admin;
9
import com.css.oa.exam.assign.viewobjects.MyAdmWrap;
10 10
import com.css.oa.exam.assign.repository.Assign;
11 11
import com.css.oa.exam.assign.repository.IAssignRepository;
12 12
import com.css.oa.exam.base.BaseVerifyService;
@ -22,7 +22,7 @@ import com.css.oa.exam.constants.ExportDTO;
22 22
import com.css.oa.exam.exam.repository.Exam;
23 23
import com.css.oa.exam.exam.repository.IExamRepository;
24 24
import com.css.oa.exam.node.service.NodeQueryService;
25
import com.css.oa.exam.score.bean.*;
25
import com.css.oa.exam.score.viewobjects.*;
26 26
import com.css.oa.exam.score.repository.IScoreRepository;
27 27
import com.css.oa.exam.score.repository.Score;
28 28
import com.css.oa.exam.student.repository.IStudentRepository;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/AnalyseColumn.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
//不通过人数、不通过率、通过人数、通过率
4 4
public class AnalyseColumn {

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/AnalyseReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
public class AnalyseReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/AnalyseResult.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
import java.util.ArrayList;
4 4
import java.util.List;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/Condition.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/ExportAnalyseReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
4 4
public class ExportAnalyseReq {

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/ExportScoreReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
4 4
import com.css.oa.exam.constants.ExportDTO;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/ImportWrap.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
public class ImportWrap {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/MyScoreWrap.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
import com.fasterxml.jackson.annotation.JsonFormat;
4 4
import lombok.Data;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/ScoreQueryReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
public class ScoreQueryReq {
4 4

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/score/bean/UpdateReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.score.bean;
1
package com.css.oa.exam.score.viewobjects;
2 2
3 3
import com.css.oa.exam.constants.BoolState;
4 4

+ 2 - 2
oa-app/src/main/java/com/css/oa/exam/series/controller/SeriesController.java

@ -1,8 +1,8 @@
1 1
package com.css.oa.exam.series.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.series.bean.AddReq;
5
import com.css.oa.exam.series.bean.Series;
4
import com.css.oa.exam.series.viewobjects.AddReq;
5
import com.css.oa.exam.series.viewobjects.Series;
6 6
import com.css.oa.exam.series.service.SeriesService;
7 7
import com.css.oa.utils.Result;
8 8
import io.swagger.annotations.Api;

+ 0 - 2
oa-app/src/main/java/com/css/oa/exam/series/service/BaseDicServise.java

@ -1,14 +1,12 @@
1 1
package com.css.oa.exam.series.service;
2 2
3 3
import com.css.oa.exam.base.BaseService;
4
import com.css.oa.exam.series.bean.Series;
5 4
import com.css.oa.exam.series.repository.ExamDictionary;
6 5
import com.css.oa.exam.series.repository.IExamDictionaryRepository;
7 6
import org.springframework.beans.factory.annotation.Autowired;
8 7
9 8
import java.util.Date;
10 9
import java.util.List;
11
import java.util.Map;
12 10
13 11
public class BaseDicServise extends BaseService {
14 12

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/series/service/ISeriesService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.series.service;
2 2
3
import com.css.oa.exam.series.bean.Series;
3
import com.css.oa.exam.series.viewobjects.Series;
4 4
5 5
import java.util.List;
6 6
import java.util.Map;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/series/service/SeriesService.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.series.service;
2 2
3
import com.css.oa.exam.series.bean.Series;
3
import com.css.oa.exam.series.viewobjects.Series;
4 4
import com.css.oa.exam.series.repository.ExamDictionary;
5 5
import com.css.oa.exam.util.CopyObjTool;
6 6
import lombok.extern.slf4j.Slf4j;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/series/bean/AddReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.series.bean;
1
package com.css.oa.exam.series.viewobjects;
2 2
3 3
public class AddReq {
4 4
    public String name;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/series/bean/Series.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.series.bean;
1
package com.css.oa.exam.series.viewobjects;
2 2
3 3
import lombok.Data;
4 4

+ 0 - 1
oa-app/src/main/java/com/css/oa/exam/student/controller/StudentController.java

@ -1,7 +1,6 @@
1 1
package com.css.oa.exam.student.controller;
2 2
3 3
import com.css.oa.exam.base.BaseController;
4
import com.css.oa.exam.student.bean.PlaceAuthReq;
5 4
import com.css.oa.exam.student.repository.Student;
6 5
import com.css.oa.exam.student.service.StudentService;
7 6
import com.css.oa.utils.Result;

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/student/bean/PlaceAuthReq.java

@ -1,4 +1,4 @@
1
package com.css.oa.exam.student.bean;
1
package com.css.oa.exam.student.viewobjects;
2 2
3 3
import java.util.ArrayList;
4 4
import java.util.List;

+ 1 - 2
oa-app/src/main/java/com/css/oa/exam/subject/service/SubjectService.java

@ -1,8 +1,7 @@
1 1
package com.css.oa.exam.subject.service;
2 2
3 3
import com.css.oa.exam.base.BaseService;
4
import com.css.oa.exam.admin.bean.Admin;
5
import com.css.oa.exam.level.bean.Level;
4
import com.css.oa.exam.admin.viewobjects.Admin;
6 5
import com.css.oa.exam.series.repository.ExamDictionary;
7 6
import com.css.oa.exam.series.repository.IExamDictionaryRepository;
8 7
import com.css.oa.exam.subject.repository.ISubjectRepository;

+ 1 - 8
oa-app/src/main/java/com/css/oa/exam/util/upload/UploadService.java

@ -1,23 +1,16 @@
1 1
package com.css.oa.exam.util.upload;
2 2
3
import com.css.oa.exam.admin.bean.Admin;
3
import com.css.oa.exam.admin.viewobjects.Admin;
4 4
import com.css.oa.utils.UUIDGenerator;
5 5
import io.micrometer.core.instrument.util.StringUtils;
6 6
import lombok.extern.slf4j.Slf4j;
7 7
import com.alibaba.fastjson.JSONObject;
8
import org.apache.commons.lang3.tuple.Triple;
9
import org.apache.http.Header;
10
import org.apache.http.StatusLine;
11
import org.slf4j.Logger;
12
import org.slf4j.LoggerFactory;
13 8
import org.springframework.beans.factory.annotation.Autowired;
14
import org.springframework.core.io.ClassPathResource;
15 9
import org.springframework.stereotype.Service;
16 10
import org.springframework.web.multipart.MultipartFile;
17 11
18 12
import javax.servlet.http.HttpServletRequest;
19 13
import javax.servlet.http.HttpServletResponse;
20
import java.io.*;
21 14
import java.net.URLEncoder;
22 15
import java.util.*;
23 16

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/util/upload/UploadUtil.java

@ -1,6 +1,6 @@
1 1
package com.css.oa.exam.util.upload;
2 2
3
import com.css.oa.exam.admin.bean.Admin;
3
import com.css.oa.exam.admin.viewobjects.Admin;
4 4
import lombok.extern.slf4j.Slf4j;
5 5
import com.alibaba.fastjson.JSONObject;
6 6
import org.apache.commons.lang3.StringUtils;

Sign In - Gogs: Go Git Service

Sign In