|
@@ -1,9 +1,9 @@
|
|
|
package com.zjugis.business.flow.contract.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.zjugis.business.bean.dto.ProjectDto;
|
|
|
+import com.zjugis.business.bean.dto.ContractMilestoneDto;
|
|
|
import com.zjugis.business.bean.entity.Contract;
|
|
|
-import com.zjugis.business.bean.entity.Project;
|
|
|
+import com.zjugis.business.bean.entity.ContractMilestone;
|
|
|
import com.zjugis.business.flow.contract.service.FlowContractService;
|
|
|
import com.zjugis.business.service.ContractMilestoneService;
|
|
|
import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
|
|
@@ -65,9 +65,9 @@ public class FlowContractController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/milestone/page")
|
|
|
- public String page(@ParamModel ProjectDto project, long page, long rows) {
|
|
|
- Page<Project> p = projectService.page(new Page<>(page, rows), project);
|
|
|
- Grid<Project> grid = new Grid(
|
|
|
+ public String page(@ParamModel ContractMilestoneDto entity, long page, long rows) {
|
|
|
+ Page<ContractMilestone> p = contractMilestoneService.page(new Page<>(page, rows), entity);
|
|
|
+ Grid<ContractMilestone> grid = new Grid(
|
|
|
p.getCurrent(),
|
|
|
p.getSize(),
|
|
|
p.getTotal(),
|
|
@@ -78,7 +78,6 @@ public class FlowContractController extends BaseController {
|
|
|
@GetMapping("/milestone/list")
|
|
|
public String selectMilestoneList(String contractId) {
|
|
|
HashMap<Object, Object> params = new HashMap<>();
|
|
|
- contractMilestoneService.selectByContractId(contractId);
|
|
|
return resultPage(params);
|
|
|
}
|
|
|
|