Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into bgy
This commit is contained in:
+14
-12
@@ -1,15 +1,16 @@
|
||||
package com.ruoyi.web.controller.wisdomarbitrate.mscase;
|
||||
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord;
|
||||
import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseLogRecordService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
|
||||
import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq;
|
||||
import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseApplicationService;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
/**
|
||||
* 案件列表控制层
|
||||
@@ -20,18 +21,19 @@ import java.util.List;
|
||||
@RestController
|
||||
@RequestMapping("/caseApplication")
|
||||
public class MsCaseApplicationController extends BaseController {
|
||||
@Autowired
|
||||
private MsCaseLogRecordService caseLogRecordService;
|
||||
@Resource
|
||||
private MsCaseApplicationService caseApplicationService;
|
||||
|
||||
/**
|
||||
* 查询案件日志列表
|
||||
* 分页查询案件列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('caseLog:list')")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(MsCaseLogRecord caseLogRecord)
|
||||
@PreAuthorize("@ss.hasPermi('caseApplication:list')")
|
||||
@GetMapping("/page")
|
||||
public TableDataInfo list(MsCaseApplicationReq req)
|
||||
{
|
||||
List<MsCaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
|
||||
return AjaxResult.success(list);
|
||||
startPage();
|
||||
List<MsCaseApplication> list = caseApplicationService.list(req);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user