Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb
This commit is contained in:
+15
-2
@@ -12,6 +12,7 @@ import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord;
|
||||
import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
|
||||
import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
|
||||
import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
|
||||
import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
|
||||
import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
@@ -38,11 +39,23 @@ public class CaseApplicationController extends BaseController {
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(CaseApplication caseApplication) {
|
||||
startPage();
|
||||
// List<CaseApplication> list = caseApplicationService.selectCaseApplicationListNew(caseApplication);
|
||||
List<CaseApplication> list = caseApplicationService.selectCaseApplicationList(caseApplication);
|
||||
List<CaseApplication> list = caseApplicationService.selectCaseApplicationListByRole(caseApplication);
|
||||
// List<CaseApplication> list = caseApplicationService.selectCaseApplicationList(caseApplication);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据角色查询待办数量
|
||||
* @return
|
||||
*/
|
||||
|
||||
@GetMapping("/toDoCount")
|
||||
public AjaxResult toDoCount() {
|
||||
ToDoCount toDoCount = caseApplicationService.selectToDoCount();
|
||||
// List<CaseApplication> list = caseApplicationService.selectCaseApplicationList(caseApplication);
|
||||
return success(toDoCount);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增立案数据
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user