From 310bcc8a96ba5385a31d54710074e8a1747525cd Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 6 Jun 2023 10:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DateCheckApplyController.java | 58 +++---------------- .../impl/DateCheckApplyServiceImpl.java | 8 ++- .../modules/tbs/mapper/TbsActivityMapper.java | 4 +- 3 files changed, 17 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/check/controller/DateCheckApplyController.java b/src/main/java/com/qs/serve/modules/check/controller/DateCheckApplyController.java index 1cae791c..f9d0158d 100644 --- a/src/main/java/com/qs/serve/modules/check/controller/DateCheckApplyController.java +++ b/src/main/java/com/qs/serve/modules/check/controller/DateCheckApplyController.java @@ -10,16 +10,15 @@ import com.qs.serve.modules.check.common.DataSupplierSo; import com.qs.serve.modules.check.entity.DataCheckApplyDetailInfo; import com.qs.serve.modules.check.entity.DataCheckApplyDetailItem; import com.qs.serve.modules.check.entity.DataCheckApplyMainInfo; +import com.qs.serve.modules.check.service.DateCheckApplyService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.math.BigDecimal; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; + /** * 数据 对账单 * @author YenHex @@ -31,7 +30,7 @@ import java.util.List; @RequestMapping("data/checkApply") public class DateCheckApplyController { - private BmsSupplierMapper supplierMapper; + private DateCheckApplyService dateCheckApplyService; /** * 汇总账单 @@ -41,24 +40,9 @@ public class DateCheckApplyController { @GetMapping("/summary") @SysLog(module = SystemModule.Verification, title = "客户汇总账单", biz = BizType.EXPORT) public R getSummary(DataSupplierSo param){ - param.getSupplierId(); - DataCheckApplyMainInfo info = new DataCheckApplyMainInfo(); - info.setCostApplyAmt(BigDecimal.ONE); - info.setCheckedAmt(BigDecimal.ONE); - info.setCheckingAmt(BigDecimal.ONE); - info.setNotCheckAmt(BigDecimal.ONE); - info.setDontCheckAmt(BigDecimal.ONE); - info.setPayAmt(BigDecimal.ONE); - info.setUnPayAmt(BigDecimal.ONE); - info.setNotPayAmt(BigDecimal.ONE); - info.setCusName("测试一同胡"); - info.setCusAddress("辽宁省-本溪市-本溪满族自治县-ABKDJFflJKLSDF"); - info.setCusCode("465465465"); - info.setContactUser("测试人"); - info.setContactMobile("13200000000"); - info.setStartDate(LocalDate.now()); - info.setEndDate(LocalDate.now()); - return R.ok(); + param.setEndDate(LocalDate.now()); + DataCheckApplyMainInfo info = dateCheckApplyService.getDataCheckApplyMainInfo(param); + return R.ok(info); } /** @@ -69,33 +53,9 @@ public class DateCheckApplyController { @GetMapping("/itemized") @SysLog(module = SystemModule.Verification, title = "客户明细帐", biz = BizType.EXPORT) public R getItemized(DataSupplierSo param){ - DataCheckApplyDetailInfo info = new DataCheckApplyDetailInfo(); - - info.setCusName("测试一同胡"); - info.setCusAddress("辽宁省-本溪市-本溪满族自治县-ABKDJFflJKLSDF"); - info.setCusCode("465465465"); - info.setContactUser("测试人"); - info.setContactMobile("13200000000"); - info.setStartDate(LocalDate.now()); - info.setEndDate(LocalDate.now()); - List detailItemList = new ArrayList<>(); - for (int i = 1; i < 31; i++) { - DataCheckApplyDetailItem item = new DataCheckApplyDetailItem(); - item.setActivityCode(System.currentTimeMillis()+""); - item.setActivityDate("2023-12-"+i); - item.setActivityTheme("2023年12月"+i+"日 375g果乐活动档期补差：0.8/包*12000=9600元"); - item.setCostApplyAmt(BigDecimal.ONE); - item.setCheckedAmt(BigDecimal.ONE); - item.setCheckingAmt(BigDecimal.ONE); - item.setNotCheckAmt(BigDecimal.ONE); - item.setDontCheckAmt(BigDecimal.ONE); - item.setPayAmt(BigDecimal.ONE); - item.setUnPayAmt(BigDecimal.ONE); - item.setNotPayAmt(BigDecimal.ONE); - detailItemList.add(item); - } - info.setDetailList(detailItemList); - return R.ok(info); + param.setEndDate(LocalDate.now()); + DataCheckApplyDetailInfo detailInfo = dateCheckApplyService.getDataCheckApplyDetailInfo(param); + return R.ok(detailInfo); } } diff --git a/src/main/java/com/qs/serve/modules/check/service/impl/DateCheckApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/check/service/impl/DateCheckApplyServiceImpl.java index 8eb4cc47..5143ade5 100644 --- a/src/main/java/com/qs/serve/modules/check/service/impl/DateCheckApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/check/service/impl/DateCheckApplyServiceImpl.java @@ -71,6 +71,10 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService { LambdaQueryWrapper actLqw = new LambdaQueryWrapper<>(); actLqw.eq(TbsActivity::getSupplierId,supplierId); actLqw.eq(TbsActivity::getCostPassFlag,1); + if(param.getStartDate()!=null){ + actLqw.ge(TbsActivity::getCostPassTime,param.getEndDate()); + } + actLqw.le(TbsActivity::getCostPassTime,param.getEndDate().atTime(23,59,59)); //暂未定义时间区间 List activityList = activityMapper.selectList(actLqw); List detailItemList = new ArrayList<>(); @@ -104,10 +108,10 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService { for (VtbVerification verification : unFinishVeriList) { notCheckAmt = notCheckAmt.add(verification.getAmount()); } - + BigDecimal releaseAmt = activity.getReleaseAmount()==null?BigDecimal.ZERO:activity.getReleaseAmount(); detailItem.setCheckedAmt(checkedAmt); detailItem.setCheckingAmt(notCheckAmt); - detailItem.setDontCheckAmt(activity.getReleaseAmount()); + detailItem.setDontCheckAmt(releaseAmt); BigDecimal notCheckedAmt = activity.getTotalAmount().subtract(detailItem.getCheckedAmt()) .subtract(detailItem.getCheckingAmt()) .subtract(detailItem.getDontCheckAmt()); diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityMapper.java index b4560cf0..b60580fd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityMapper.java @@ -19,7 +19,7 @@ public interface TbsActivityMapper extends BaseMapper { * @param supplierId * @return */ - @Select("select sum(total_amount) from tbs_activity where supplier_id = #{supplierId} and costPassFlag = 1") + @Select("select sum(total_amount) from tbs_activity where supplier_id = #{supplierId} and cost_pass_flag = 1") BigDecimal sumSupplierActivityCost(@Param("supplierId")String supplierId); /** @@ -27,7 +27,7 @@ public interface TbsActivityMapper extends BaseMapper { * @param supplierId * @return */ - @Select("select sum(release_amount) from tbs_activity where supplier_id = #{supplierId} and costPassFlag = 1 and release_flag = 1") + @Select("select sum(release_amount) from tbs_activity where supplier_id = #{supplierId} and cost_pass_flag = 1 and release_flag = 1") BigDecimal sumSupplierNotCheckCost(@Param("supplierId")String supplierId); }