# Conflicts: # ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostCheckedProblemService.java # ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostCheckedProblemServiceImpl.java # ruoyi-postcheck/src/main/resources/mapper/postCheck/PostProgrammeMapper.xml
|
||
17 | 17 |
|
18 | 18 |
|
19 | 19 |
|
20 |
|
|
21 |
|
|
22 |
|
|
23 |
|
|
24 |
|
|
25 |
|
|
20 | 26 |
|
21 | 27 |
|
22 | 28 |
|
|
||
1 |
|
|
2 |
|
|
3 |
|
|
4 |
|
|
5 |
|
|
6 |
|
|
7 |
|
|
8 |
|
|
9 |
|
|
10 |
|
|
11 |
|
|
12 |
|
|
13 |
|
|
14 |
|
|
15 |
|
|
16 |
|
|
17 |
|
|
18 |
|
|
19 |
|
|
20 |
|
|
21 |
|
|
22 |
|
|
23 |
|
|
24 |
|
|
25 |
|
|
26 |
|
|
27 |
|
|
||
30 | 30 |
|
31 | 31 |
|
32 | 32 |
|
33 |
|
|
34 |
|
|
35 |
|
|
36 |
|
|
37 |
|
|
33 | 38 |
|
34 | 39 |
|
35 | 40 |
|
|
||
3 | 3 |
|
4 | 4 |
|
5 | 5 |
|
6 |
|
|
6 | 7 |
|
8 |
|
|
7 | 9 |
|
8 | 10 |
|
9 | 11 |
|
|
||
14 | 16 |
|
15 | 17 |
|
16 | 18 |
|
19 |
|
|
20 |
|
|
21 |
|
|
22 |
|
|
23 |
|
|
24 |
|
|
25 |
|
|
26 |
|
|
27 |
|
|
28 |
|
|
17 | 29 |
|
18 | 30 |
|
19 | 31 |
|
|
||
27 | 39 |
|
28 | 40 |
|
29 | 41 |
|
30 |
|
|
42 |
|
|
43 |
|
|
31 | 44 |
|
32 | 45 |
|
33 | 46 |
|
|
||
58 | 71 |
|
59 | 72 |
|
60 | 73 |
|
61 |
|
|
62 |
|
|
63 |
|
|
64 |
|
|
65 |
|
|
66 |
|
|
67 |
|
|
74 |
|
|
68 | 75 |
|
69 | 76 |
|
70 | 77 |
|
71 | 78 |
|
72 | 79 |
|
73 | 80 |
|
74 |
|
|
75 |
|
|
76 |
|
|
81 |
|
|
77 | 82 |
|
78 | 83 |
|
79 | 84 |
|
80 | 85 |
|
81 | 86 |
|
82 | 87 |
|
83 |
|
|
84 |
|
|
85 |
|
|
86 |
|
|
87 |
|
|
88 |
|
|
89 |
|
|
90 |
|
|
91 |
|
|
92 |
|
|
93 |
|
|
94 |
|
|
95 |
|
|
96 |
|
|
97 |
|
|
98 |
|
|
99 |
|
|
100 |
|
|
101 |
|
|
102 |
|
|
103 |
|
|
104 |
|
|
105 |
|
|
106 |
|
|
107 |
|
|
108 |
|
|
109 |
|
|
110 |
|
|
111 |
|
|
112 |
|
|
113 |
|
|
114 |
|
|
115 |
|
|
88 |
|
|
116 | 89 |
|
117 | 90 |
|
118 | 91 |
|
|
||
122 | 95 |
|
123 | 96 |
|
124 | 97 |
|
125 |
|
|
126 |
|
|
127 |
|
|
128 |
|
|
129 |
|
|
130 |
|
|
131 |
|
|
132 |
|
|
133 |
|
|
134 |
|
|
135 |
|
|
136 |
|
|
137 |
|
|
138 |
|
|
139 |
|
|
140 |
|
|
141 |
|
|
142 |
|
|
143 |
|
|
98 |
|
|
144 | 99 |
|
145 | 100 |
|
146 | 101 |
|
|
||
163 | 118 |
|
164 | 119 |
|
165 | 120 |
|
166 |
|
|
167 |
|
|
168 |
|
|
169 |
|
|
170 |
|
|
171 |
|
|
172 |
|
|
173 |
|
|
174 |
|
|
121 |
|
|
175 | 122 |
|
176 | 123 |
|
177 | 124 |
|
|
||
194 | 141 |
|
195 | 142 |
|
196 | 143 |
|
197 |
|
|
198 |
|
|
199 |
|
|
200 |
|
|
201 |
|
|
202 |
|
|
203 |
|
|
204 |
|
|
205 |
|
|
144 |
|
|
206 | 145 |
|
207 | 146 |
|
208 | 147 |
|
|
||
218 | 157 |
|
219 | 158 |
|
220 | 159 |
|
221 |
|
|
222 |
|
|
160 |
|
|
161 |
|
|
162 |
|
|
163 |
|
|
164 |
|
|
165 |
|
|
166 |
|
|
223 | 167 |
|
224 |
|
|
225 |
|
|
226 |
|
|
227 |
|
|
228 |
|
|
229 |
|
|
230 |
|
|
231 |
|
|
232 |
|
|
233 |
|
|
168 |
|
|
169 |
|
|
170 |
|
|
171 |
|
|
172 |
|
|
173 |
|
|
174 |
|
|
175 |
|
|
176 |
|
|
177 |
|
|
178 |
|
|
179 |
|
|
180 |
|
|
181 |
|
|
182 |
|
|
234 | 183 |
|
235 | 184 |
|
|
||
2 | 2 |
|
3 | 3 |
|
4 | 4 |
|
5 |
|
|
5 | 6 |
|
6 | 7 |
|
8 |
|
|
9 |
|
|
10 |
|
|
11 |
|
|
12 |
|
|
13 |
|
|
14 |
|
|
15 |
|
|
7 | 16 |
|
8 | 17 |
|
9 | 18 |
|
|
||
37 | 46 |
|
38 | 47 |
|
39 | 48 |
|
49 |
|
|
40 | 50 |
|
41 | 51 |
|
42 | 52 |
|
53 |
|
|
54 |
|
|
55 |
|
|
56 |
|
|
57 |
|
|
58 |
|
|
43 | 59 |
|
44 | 60 |
|
45 | 61 |
|
|
||
188 | 204 |
|
189 | 205 |
|
190 | 206 |
|
207 |
|
|
208 |
|
|
209 |
|
|
210 |
|
|
211 |
|
|
212 |
|
|
213 |
|
|
214 |
|
|
215 |
|
|
216 |
|
|
217 |
|
|
218 |
|
|
219 |
|
|
220 |
|
|
221 |
|
|
222 |
|
|
223 |
|
|
224 |
|
|
225 |
|
|
226 |
|
|
191 | 227 |
|
192 | 228 |
|
193 | 229 |
|
|
||
201 | 237 |
|
202 | 238 |
|
203 | 239 |
|
240 |
|
|
241 |
|
|
242 |
|
|
243 |
|
|
244 |
|
|
245 |
|
|
246 |
|
|
247 |
|
|
248 |
|
|
249 |
|
|
250 |
|
|
251 |
|
|
252 |
|
|
253 |
|
|
254 |
|
|
255 |
|
|
256 |
|
|
257 |
|
|
258 |
|
|
259 |
|
|
260 |
|
|
261 |
|
|
262 |
|
|
204 | 263 |
|
205 | 264 |
|
206 | 265 |
|
|
||
116 | 116 |
|
117 | 117 |
|
118 | 118 |
|
119 |
|
|
120 |
|
|
121 |
|
|
122 |
|
|
119 | 123 |
|
|
||
69 | 69 |
|
70 | 70 |
|
71 | 71 |
|
72 |
|
|
72 |
|
|
73 | 73 |
|
74 | 74 |
|
|
||
6 | 6 |
|
7 | 7 |
|
8 | 8 |
|
9 |
|
|
9 | 10 |
|
10 | 11 |
|
11 | 12 |
|
|
||
89 | 90 |
|
90 | 91 |
|
91 | 92 |
|
93 |
|
|
94 |
|
|
95 |
|
|
96 |
|
|
97 |
|
|
98 |
|
|
92 | 99 |
|
|
||
1 | 1 |
|
2 | 2 |
|
3 |
|
|
3 | 4 |
|
4 | 5 |
|
6 |
|
|
5 | 7 |
|
6 | 8 |
|
7 | 9 |
|
8 | 10 |
|
9 | 11 |
|
10 | 12 |
|
13 |
|
|
14 |
|
|
15 |
|
|
11 | 16 |
|
12 | 17 |
|
13 | 18 |
|
|
||
157 | 162 |
|
158 | 163 |
|
159 | 164 |
|
165 |
|
|
166 |
|
|
167 |
|
|
168 |
|
|
169 |
|
|
170 |
|
|
171 |
|
|
172 |
|
|
173 |
|
|
174 |
|
|
175 |
|
|
176 |
|
|
160 | 177 |
|
161 | 178 |
|
162 | 179 |
|
|
||
1 | 1 |
|
2 | 2 |
|
3 | 3 |
|
4 |
|
|
4 | 5 |
|
6 |
|
|
5 | 7 |
|
6 | 8 |
|
7 | 9 |
|
|
||
77 | 79 |
|
78 | 80 |
|
79 | 81 |
|
80 |
|
|
82 |
|
|
81 | 83 |
|
82 |
|
|
84 |
|
|
83 | 85 |
|
84 |
|
|
86 |
|
|
85 | 87 |
|
86 | 88 |
|
87 | 89 |
|
|
||
98 | 100 |
|
99 | 101 |
|
100 | 102 |
|
101 |
|
|
103 |
|
|
102 | 104 |
|
103 |
|
|
105 |
|
|
104 | 106 |
|
105 | 107 |
|
106 | 108 |
|
109 |
|
|
110 |
|
|
111 |
|
|
112 |
|
|
107 | 113 |
|
108 |
|
|
109 | 114 |
|
110 | 115 |
|
111 | 116 |
|
|
||
119 | 124 |
|
120 | 125 |
|
121 | 126 |
|
122 |
|
|
127 |
|
|
123 | 128 |
|
124 | 129 |
|
125 | 130 |
|
|
||
128 | 133 |
|
129 | 134 |
|
130 | 135 |
|
131 |
|
|
136 |
|
|
132 | 137 |
|
133 |
|
|
138 |
|
|
134 | 139 |
|
135 | 140 |
|
136 | 141 |
|
137 | 142 |
|
138 | 143 |
|
139 | 144 |
|
145 |
|
|
140 | 146 |
|
141 |
|
|
147 |
|
|
142 | 148 |
|
143 | 149 |
|
144 | 150 |
|
|
||
2 | 2 |
|
3 | 3 |
|
4 | 4 |
|
5 |
|
|
6 |
|
|
5 | 7 |
|
8 |
|
|
6 | 9 |
|
10 |
|
|
7 | 11 |
|
12 |
|
|
8 | 13 |
|
9 | 14 |
|
10 | 15 |
|
|
||
16 | 21 |
|
17 | 22 |
|
18 | 23 |
|
24 |
|
|
25 |
|
|
26 |
|
|
19 | 27 |
|
20 | 28 |
|
21 | 29 |
|
|
||
61 | 69 |
|
62 | 70 |
|
63 | 71 |
|
64 |
|
|
65 | 72 |
|
66 | 73 |
|
67 | 74 |
|
|
||
499 | 506 |
|
500 | 507 |
|
501 | 508 |
|
509 |
|
|
510 |
|
|
511 |
|
|
512 |
|
|
513 |
|
|
514 |
|
|
515 |
|
|
516 |
|
|
517 |
|
|
518 |
|
|
519 |
|
|
520 |
|
|
521 |
|
|
522 |
|
|
523 |
|
|
524 |
|
|
525 |
|
|
526 |
|
|
527 |
|
|
528 |
|
|
529 |
|
|
530 |
|
|
531 |
|
|
532 |
|
|
533 |
|
|
534 |
|
|
535 |
|
|
536 |
|
|
537 |
|
|
538 |
|
|
539 |
|
|
540 |
|
|
541 |
|
|
542 |
|
|
543 |
|
|
544 |
|
|
545 |
|
|
546 |
|
|
547 |
|
|
548 |
|
|
549 |
|
|
550 |
|
|
551 |
|
|
552 |
|
|
553 |
|
|
554 |
|
|
555 |
|
|
556 |
|
|
557 |
|
|
558 |
|
|
559 |
|
|
560 |
|
|
561 |
|
|
562 |
|
|
563 |
|
|
564 |
|
|
565 |
|
|
566 |
|
|
567 |
|
|
568 |
|
|
569 |
|
|
570 |
|
|
571 |
|
|
572 |
|
|
573 |
|
|
574 |
|
|
575 |
|
|
576 |
|
|
577 |
|
|
578 |
|
|
579 |
|
|
580 |
|
|
581 |
|
|
582 |
|
|
583 |
|
|
584 |
|
|
585 |
|
|
586 |
|
|
587 |
|
|
588 |
|
|
589 |
|
|
590 |
|
|
591 |
|
|
592 |
|
|
593 |
|
|
594 |
|
|
595 |
|
|
596 |
|
|
597 |
|
|
598 |
|
|
599 |
|
|
600 |
|
|
601 |
|
|
602 |
|
|
603 |
|
|
604 |
|
|
605 |
|
|
606 |
|
|
607 |
|
|
608 |
|
|
609 |
|
|
610 |
|
|
611 |
|
|
612 |
|
|
613 |
|
|
614 |
|
|
615 |
|
|
616 |
|
|
617 |
|
|
618 |
|
|
619 |
|
|
620 |
|
|
502 | 621 |
|
503 | 622 |
|
504 | 623 |
|
|
||
8 | 8 |
|
9 | 9 |
|
10 | 10 |
|
11 |
|
|
11 | 12 |
|
12 | 13 |
|
13 | 14 |
|
|
||
24 | 25 |
|
25 | 26 |
|
26 | 27 |
|
28 |
|
|
27 | 29 |
|
28 | 30 |
|
29 | 31 |
|
|
||
116 | 118 |
|
117 | 119 |
|
118 | 120 |
|
119 |
|
|
120 | 121 |
|
121 | 122 |
|
122 | 123 |
|
|
||
127 | 128 |
|
128 | 129 |
|
129 | 130 |
|
130 |
|
|
131 |
|
|
132 |
|
|
133 |
|
|
134 |
|
|
135 |
|
|
136 |
|
|
137 |
|
|
138 |
|
|
139 |
|
|
140 |
|
|
141 |
|
|
142 |
|
|
143 |
|
|
144 |
|
|
145 |
|
|
146 |
|
|
147 |
|
|
148 |
|
|
149 |
|
|
150 | 131 |
|
132 |
|
|
151 | 133 |
|
152 | 134 |
|
153 | 135 |
|
154 |
|
|
136 |
|
|
137 |
|
|
155 | 138 |
|
156 | 139 |
|
140 |
|
|
157 | 141 |
|
158 | 142 |
|
159 | 143 |
|
160 |
|
|
161 |
|
|
162 | 144 |
|
163 | 145 |
|
164 | 146 |
|
165 | 147 |
|
166 | 148 |
|
167 | 149 |
|
168 |
|
|
150 |
|
|
169 | 151 |
|
170 | 152 |
|
171 | 153 |
|
|
||
176 | 158 |
|
177 | 159 |
|
178 | 160 |
|
179 |
|
|
180 | 161 |
|
181 | 162 |
|
182 | 163 |
|
183 | 164 |
|
184 |
|
|
185 | 165 |
|
186 | 166 |
|
187 | 167 |
|
188 | 168 |
|
189 | 169 |
|
190 |
|
|
191 |
|
|
192 |
|
|
193 |
|
|
194 |
|
|
195 |
|
|
196 |
|
|
197 |
|
|
198 | 170 |
|
171 |
|
|
199 | 172 |
|
200 | 173 |
|
201 | 174 |
|
202 | 175 |
|
176 |
|
|
177 |
|
|
178 |
|
|
203 | 179 |
|
180 |
|
|
181 |
|
|
204 | 182 |
|
205 | 183 |
|
|
||
178 | 178 |
|
179 | 179 |
|
180 | 180 |
|
181 |
|
|
181 |
|
|
182 | 182 |
|
183 | 183 |
|
|
||
294 | 294 |
|
295 | 295 |
|
296 | 296 |
|
297 |
|
|
298 |
|
|
299 |
|
|
300 |
|
|
301 |
|
|
302 |
|
|
303 |
|
|
304 |
|
|
305 |
|
|
306 |
|
|
307 |
|
|
308 |
|
|
309 |
|
|
310 |
|
|
311 |
|
|
312 |
|
|
313 |
|
|
314 |
|
|
315 |
|
|
316 |
|
|
317 |
|
|
318 |
|
|
319 |
|
|
320 |
|
|
321 |
|
|
297 | 322 |
|
|
||
32 | 32 |
|
33 | 33 |
|
34 | 34 |
|
35 |
|
|
36 |
|
|
37 |
|
|
38 |
|
|
39 |
|
|
40 |
|
|
41 |
|
|
42 |
|
|
43 |
|
|
44 |
|
|
45 |
|
|
46 |
|
|
47 |
|
|
48 |
|
|
49 |
|
|
50 |
|
|
51 |
|
|
52 |
|
|
53 |
|
|
54 |
|
|
55 |
|
|
56 |
|
|
57 |
|
|
58 |
|
|
59 |
|
|
60 |
|
|
61 |
|
|
62 |
|
|
63 |
|
|
35 | 64 |
|
36 | 65 |
|
37 | 66 |
|
|
||
56 | 85 |
|
57 | 86 |
|
58 | 87 |
|
59 |
|
|
88 |
|
|
89 |
|
|
60 | 90 |
|
61 | 91 |
|
62 | 92 |
|
|
||
115 | 145 |
|
116 | 146 |
|
117 | 147 |
|
148 |
|
|
118 | 149 |
|
119 | 150 |
|
120 | 151 |
|
|
||
141 | 172 |
|
142 | 173 |
|
143 | 174 |
|
175 |
|
|
144 | 176 |
|
145 | 177 |
|
146 | 178 |
|
|
||
170 | 202 |
|
171 | 203 |
|
172 | 204 |
|
205 |
|
|
173 | 206 |
|
174 | 207 |
|
175 | 208 |
|
|
||
61 | 61 |
|
62 | 62 |
|
63 | 63 |
|
64 |
|
|
64 |
|
|
65 | 65 |
|
66 | 66 |
|
67 | 67 |
|