zhuhaiwen 3 gadi atpakaļ
vecāks
revīzija
965d25bfa9

+ 1 - 1
oa-app/src/main/java/com/css/oa/exam/admin/controller/CasLoginController.java

@ -30,7 +30,7 @@ import java.util.ArrayList;
30 30
import java.util.Date;
31 31
import java.util.List;
32 32
33
@Api(tags = {"职称申报和评审-单点登录"})
33
@Api(tags = {"职称考试-单点登录"})
34 34
@RestController
35 35
@RequestMapping("/casLogin")
36 36
public class CasLoginController {

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

@ -129,12 +129,12 @@ public class ReportController extends BaseController {
129 129
    }
130 130
131 131
    @ApiOperation(value = "统计报表-考点考场统计一览表")
132
    @GetMapping("/place_room_multi")
133
    public Result place_room_multi() {
132
    @GetMapping("/pr_report")
133
    public Result pr_report() {
134 134
        Result<Map> result = null;
135 135
        try {
136
//            Map obj = mService.place_room();
137
//            result = setResult("res", obj);
136
            Map obj = mService.pr_report();
137
            result = setResult("res", obj);
138 138
        } catch (Exception e) {
139 139
            result = setErr(e.toString());
140 140
            e.printStackTrace();
@ -142,12 +142,12 @@ public class ReportController extends BaseController {
142 142
        return result;
143 143
    }
144 144
145
    @ApiOperation(value = "统计报表-督考员一览表")
146
    @GetMapping("/monitor")
147
    public Result monitor() {
145
    @ApiOperation(value = "统计报表-考点考场统计一览表-导出")
146
    @GetMapping("/pr_report_export")
147
    public Result pr_report_export() {
148 148
        Result<Map> result = null;
149 149
        try {
150
//            Map obj = mService.督考情况一览表();
150
//            Map obj = mService.pr_report_export();
151 151
//            result = setResult("res", obj);
152 152
        } catch (Exception e) {
153 153
            result = setErr(e.toString());

+ 10 - 0
oa-app/src/main/java/com/css/oa/exam/report/service/impl/ReportServiceImpl.java

@ -383,4 +383,14 @@ public class ReportServiceImpl extends BaseService implements ReportService {
383 383
        workBook.createCellStyle().setLocked(true);
384 384
        ExcelDelegate.exportExcel(workBook, "考点考场统计一览表.xls", response);
385 385
    }
386
387
    public Map pr_report(){
388
389
        return null;
390
    }
391
392
    public void pr_report_export(HttpServletResponse response, PRExportReq req){
393
394
    }
395
386 396
}