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 cad97caa..0bec070b 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 @@ -50,6 +50,17 @@ public class SltAgreementInfoController extends BaseController { return getDataTable(list); } + /** + * 根据条件获取协议结算列表 + */ + @ApiOperation(value = "根据条件获取协议结算列表") + @GetMapping("/getSltAgreementInfo") + public TableDataInfo getSltAgreementInfo(SltAgreementInfo bean) { + startPage(); + List list = sltAgreementInfoService.getSltAgreementInfo(bean); + return getDataTable(list); + } + @ApiOperation(value = "根据协议获取结算清单") @PostMapping("/getSltInfo") public AjaxResult getSltInfo(@RequestBody List list) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java index 7d7f5c05..8d0a3aef 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java @@ -65,6 +65,8 @@ public interface SltAgreementInfoMapper { SltAgreementInfo getSltAgreementInfo(LeaseOutDetails record); + List getSltAgreementInfo4Project(SltAgreementInfo record); + int updSltInfo(SltAgreementInfo sltAgreementInfo); int insSltInfo(@Param("record") LeaseOutDetails record, @Param("agreementId")String agreementId, @Param("ma") Type ma); 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 738f50ad..99852d26 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,6 +27,8 @@ public interface ISltAgreementInfoService { */ public List selectSltAgreementInfoList(SltAgreementInfo sltAgreementInfo); + public List getSltAgreementInfo(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 ae8f10b5..3e00589c 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 @@ -55,6 +55,11 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService { return sltAgreementInfoMapper.selectSltAgreementInfoList(sltAgreementInfo); } + @Override + public List getSltAgreementInfo(SltAgreementInfo bean) { + return sltAgreementInfoMapper.getSltAgreementInfo4Project(bean); + } + @Override public SltInfoVo getSltInfo(List list) { SltInfoVo sltInfoVo = new SltInfoVo(); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index 63f0bd0b..bbdd5b1d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -165,6 +165,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DATE(start_time) = CURDATE(); + + update slt_agreement_info set num = #{num},