diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java index 0bec070b..307c932e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java @@ -54,10 +54,10 @@ public class SltAgreementInfoController extends BaseController { * 根据条件获取协议结算列表 */ @ApiOperation(value = "根据条件获取协议结算列表") - @GetMapping("/getSltAgreementInfo") - public TableDataInfo getSltAgreementInfo(SltAgreementInfo bean) { + @GetMapping("/getSltAgreementInfo4Project") + public TableDataInfo getSltAgreementInfo4Project(SltAgreementInfo bean) { startPage(); - List list = sltAgreementInfoService.getSltAgreementInfo(bean); + List list = sltAgreementInfoService.getSltAgreementInfo4Project(bean); return getDataTable(list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementInfoService.java index 99852d26..f478b56e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementInfoService.java @@ -27,7 +27,7 @@ public interface ISltAgreementInfoService { */ public List selectSltAgreementInfoList(SltAgreementInfo sltAgreementInfo); - public List getSltAgreementInfo(SltAgreementInfo bean); + public List getSltAgreementInfo4Project(SltAgreementInfo bean); public SltInfoVo getSltInfo(List list); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java index 3e00589c..50e1c312 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java @@ -56,7 +56,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService { } @Override - public List getSltAgreementInfo(SltAgreementInfo bean) { + public List getSltAgreementInfo4Project(SltAgreementInfo bean) { return sltAgreementInfoMapper.getSltAgreementInfo4Project(bean); }