From 2c16ba7f4cdfedf4ec05395e20caf9c87f2b5101 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 09 八月 2023 18:15:50 +0800
Subject: [PATCH] 修改funddetail文件上传
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 164 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 125 insertions(+), 39 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index 1c94fde..afcc2ca 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -1,11 +1,18 @@
package com.ruoyi.project.service.impl;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.Date;
import java.util.List;
-import com.ruoyi.project.domain.ServiceFund;
-import com.ruoyi.project.domain.ServiceReimbursement;
-import com.ruoyi.project.domain.ServiceReimbursementdetail;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.ruoyi.common.tax.TaxtUtils;
+import com.ruoyi.project.domain.*;
+import com.ruoyi.project.domain.vo.TaxMoneyVO;
+import com.ruoyi.project.domain.vo.TaxedMoneyVO;
import com.ruoyi.project.mapper.ServiceFundMapper;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,18 +20,16 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceFunddetailMapper;
-import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.service.IServiceFunddetailService;
/**
* 璐圭敤鐢宠鏄庣粏Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2022-01-25
*/
@Service
-public class ServiceFunddetailServiceImpl extends ServiceImpl<ServiceFunddetailMapper, ServiceFunddetail> implements IServiceFunddetailService
-{
+public class ServiceFunddetailServiceImpl extends ServiceImpl<ServiceFunddetailMapper, ServiceFunddetail> implements IServiceFunddetailService {
@Autowired
ServiceFunddetailMapper serviceFunddetailMapper;
@@ -35,45 +40,126 @@
/**
* 鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃
- *
+ *
* @param serviceFunddetail 璐圭敤鐢宠鏄庣粏
* @return 璐圭敤鐢宠鏄庣粏
*/
@Override
public List<ServiceFunddetail> queryList(ServiceFunddetail serviceFunddetail) {
LambdaQueryWrapper<ServiceFunddetail> wrappers = Wrappers.lambdaQuery();
- if (StringUtils.isNotBlank(serviceFunddetail.getBeneficiaryname())){
- wrappers.like(ServiceFunddetail::getBeneficiaryname ,serviceFunddetail.getBeneficiaryname());
+ if (StringUtils.isNotBlank(serviceFunddetail.getBeneficiaryname())) {
+ wrappers.like(ServiceFunddetail::getBeneficiaryname, serviceFunddetail.getBeneficiaryname());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getUnitname())){
- wrappers.like(ServiceFunddetail::getUnitname ,serviceFunddetail.getUnitname());
+ if (StringUtils.isNotBlank(serviceFunddetail.getUnitname())) {
+ wrappers.like(ServiceFunddetail::getUnitname, serviceFunddetail.getUnitname());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getApplytype())){
- wrappers.eq(ServiceFunddetail::getApplytype ,serviceFunddetail.getApplytype());
+ if (StringUtils.isNotBlank(serviceFunddetail.getApplytype())) {
+ wrappers.eq(ServiceFunddetail::getApplytype, serviceFunddetail.getApplytype());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getItemname())){
- wrappers.like(ServiceFunddetail::getItemname ,serviceFunddetail.getItemname());
+ if (StringUtils.isNotBlank(serviceFunddetail.getItemname())) {
+ wrappers.like(ServiceFunddetail::getItemname, serviceFunddetail.getItemname());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getItemtype())){
- wrappers.eq(ServiceFunddetail::getItemtype ,serviceFunddetail.getItemtype());
+ if (StringUtils.isNotBlank(serviceFunddetail.getItemtype())) {
+ wrappers.eq(ServiceFunddetail::getItemtype, serviceFunddetail.getItemtype());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getRecordstatus())){
- wrappers.eq(ServiceFunddetail::getRecordstatus ,serviceFunddetail.getRecordstatus());
+ if (StringUtils.isNotBlank(serviceFunddetail.getRecordstatus())) {
+ wrappers.eq(ServiceFunddetail::getRecordstatus, serviceFunddetail.getRecordstatus());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getCreateBy())){
- wrappers.eq(ServiceFunddetail::getCreateBy ,serviceFunddetail.getCreateBy());
+ if (StringUtils.isNotBlank(serviceFunddetail.getCreateBy())) {
+ wrappers.eq(ServiceFunddetail::getCreateBy, serviceFunddetail.getCreateBy());
}
- if (serviceFunddetail.getCreateTime() != null){
- wrappers.eq(ServiceFunddetail::getCreateTime ,serviceFunddetail.getCreateTime());
+ if (serviceFunddetail.getCreateTime() != null) {
+ wrappers.eq(ServiceFunddetail::getCreateTime, serviceFunddetail.getCreateTime());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getUploadflag())){
- wrappers.eq(ServiceFunddetail::getUploadflag ,serviceFunddetail.getUploadflag());
+ if (StringUtils.isNotBlank(serviceFunddetail.getUploadflag())) {
+ wrappers.eq(ServiceFunddetail::getUploadflag, serviceFunddetail.getUploadflag());
}
- if (serviceFunddetail.getUploadtime() != null){
- wrappers.eq(ServiceFunddetail::getUploadtime ,serviceFunddetail.getUploadtime());
+ if (serviceFunddetail.getUploadtime() != null) {
+ wrappers.eq(ServiceFunddetail::getUploadtime, serviceFunddetail.getUploadtime());
}
return this.list(wrappers);
}
+
+ @Override
+ public List<ServiceFunddetail> getDataBybeneficiaryNo(FunddetailReqVo funddetailReqVo) {
+ if (StringUtils.isEmpty(funddetailReqVo.getStarttime())) {
+ // 鑾峰彇褰撴湀绗竴澶╂棩鏈�
+ funddetailReqVo.setStarttime(LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).toString());
+ }
+ if (StringUtils.isEmpty(funddetailReqVo.getEndtime())) {
+ // 鑾峰彇褰撴湀鏈�鍚庝竴澶╂棩鏈�
+ funddetailReqVo.setEndtime(LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).toString());
+ }
+ List<ServiceFunddetail> dataBybeneficiaryNo = serviceFunddetailMapper.getDataBybeneficiaryNo(funddetailReqVo);
+
+ return dataBybeneficiaryNo;
+ }
+
+ /**
+ * 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栫◣璐归噾棰�
+ *
+ * @param taxMoneyVo
+ * @return
+ */
+ @Override
+ public Double getTaxByBeneFiciaryNo(TaxMoneyVO taxMoneyVo) {
+ Double sum = 0.00;
+ Double totalScore = 0.00;
+ List<ServiceFunddetail> taxationByBeneFiciaryNo = serviceFunddetailMapper.getTaxBeforeByBeneFiciaryNo(taxMoneyVo);
+ if (CollectionUtils.isNotEmpty(taxationByBeneFiciaryNo)) {
+ //璁＄畻鐢宠閲戦鎬诲拰锛屼笉鍖呮嫭褰撳墠浼犺繘鏉ョ殑
+ sum = taxationByBeneFiciaryNo.stream().mapToDouble(ServiceFunddetail::getAmount).sum();
+ //涓嶅姞鏈钖叕鐨勪釜绋�
+ totalScore = taxationByBeneFiciaryNo.stream().mapToDouble(ServiceFunddetail::getTaxamount).sum();
+ }
+
+ sum = sum + new Double(taxMoneyVo.getMoney());
+ //鍔犱笂鏈钖叕鐨勬�讳釜绋�
+ String taxation = TaxtUtils.getTaxation(new BigDecimal(sum));
+
+ Double tax = Double.valueOf(taxation) - totalScore;
+ return tax;
+ }
+
+ /**
+ * 鏍规嵁绋庡悗宸ヨ祫锛岀畻鍑虹◣鍓嶅伐璧�
+ *
+ * @param taxMoneyVo
+ * @return
+ */
+ @Override
+ public TaxedMoneyVO getTaxBeforeByAfterMoney(TaxMoneyVO taxMoneyVo) {
+ TaxedMoneyVO taxedMoneyVO = new TaxedMoneyVO();
+ Double sum = 0.00;
+ Double totalScore = 0.00;
+ List<ServiceFunddetail> taxationByBeneFiciaryNo = serviceFunddetailMapper.getTaxBeforeByBeneFiciaryNo(taxMoneyVo);
+ if (CollectionUtils.isNotEmpty(taxationByBeneFiciaryNo)) {
+ //璁＄畻鍑虹◣鍚庢�婚噾棰濓紙涓嶅寘鍚湰娆★級
+ sum = taxationByBeneFiciaryNo.stream().mapToDouble(ServiceFunddetail::getTaxedamount).sum();
+ //姹傚嚭涔嬪墠鐨勬�荤殑涓◣
+ totalScore = taxationByBeneFiciaryNo.stream().mapToDouble(ServiceFunddetail::getTaxamount).sum();
+ }
+ //璁＄畻鍑烘�荤殑绋庡悗钖叕锛堝寘鍚湰娆★級
+ sum = sum + Double.valueOf(taxMoneyVo.getMoney());
+ //绋庡墠鎬婚噾棰�
+ String taxationBefore = TaxtUtils.getTaxationBefore(new BigDecimal(sum));
+ //鎬讳釜绋�
+ BigDecimal tax = new BigDecimal(taxationBefore).subtract(new BigDecimal(sum));
+
+ //鏈鐨勭◣鍓嶉噾棰�
+ String nowTaxMoney = TaxtUtils.getTaxationBefore(new BigDecimal(taxMoneyVo.getMoney()));
+ //鏈鐨勭◣璐�
+ BigDecimal subtract = new BigDecimal(nowTaxMoney).subtract(new BigDecimal(taxMoneyVo.getMoney()));
+
+ taxedMoneyVO.setAllTax(tax.toString());
+ taxedMoneyVO.setAllTaxbeforeMoney(taxationBefore);
+ taxedMoneyVO.setAllAaxAfterMoney(sum.toString());
+ taxedMoneyVO.setNowTaxBeforeMoney(nowTaxMoney);
+ taxedMoneyVO.setNowTax(subtract.toString());
+
+ return taxedMoneyVO;
+ }
+
@Override
public List<ServiceFunddetail> getAllDetailsByFDIDLW(Long id) {
@@ -115,18 +201,18 @@
ServiceFunddetail serviceFunddetail = serviceFunddetailMapper.selectById(id);
Long fundid = serviceFunddetail.getFundid();
ServiceFund serviceFund = serviceFundMapper.selectById(fundid);
+ if (ObjectUtils.isNotEmpty(serviceFund)) {
+ Double pretax = serviceFund.getPretaxcost();
+ Double aftertax = serviceFund.getTaxedcost();
+ pretax = pretax - serviceFunddetail.getAmount();
+ aftertax = aftertax - serviceFunddetail.getTaxedamount();
+ Double amount = pretax + aftertax;
- Double pretax = serviceFund.getPretaxcost();
- Double aftertax = serviceFund.getTaxedcost();
- pretax = pretax - serviceFunddetail.getAmount();
- aftertax = aftertax - serviceFunddetail.getTaxedamount();
- Double amount = pretax + aftertax;
-
- serviceFund.setPretaxcost(pretax);
- serviceFund.setTaxedcost(aftertax);
- serviceFund.setAmountrequested(amount);
- int updateAmount = serviceFundMapper.updateById(serviceFund);
-
+ serviceFund.setPretaxcost(pretax);
+ serviceFund.setTaxedcost(aftertax);
+ serviceFund.setAmountrequested(amount);
+ int updateAmount = serviceFundMapper.updateById(serviceFund);
+ }
return serviceFunddetailMapper.deleteById(id);
}
--
Gitblit v1.9.3