|
|
@@ -256,7 +256,7 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
* 合同列表
|
|
|
*/
|
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
|
- public Result listContract(Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
|
|
|
+ public Result listContract(String contractId, Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
|
|
|
String endDateFormattedDate, String province, String unitName, String uid, String pageNo, String pageSize) {
|
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
@@ -267,7 +267,7 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(contractService.getManageList(serialNumber, type, status, startDateFormattedDate,
|
|
|
+ res.setData(contractService.getManageList(contractId, serialNumber, type, status, startDateFormattedDate,
|
|
|
endDateFormattedDate, province, unitName, uid, pNo, pSize));
|
|
|
return res;
|
|
|
}
|