From b5c134c9605109df4b83ba8cc0f09f9c37d6f816 Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Fri, 22 Jan 2021 11:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E6=9D=A1=E7=BB=93=E7=AE=97=E5=8D=95=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtInvoiceDaoController.java | 20 ++-- .../controller/FtSettlementDaoController.java | 20 ---- .../fantang/domain/FtSettlementDao.java | 11 ++ .../impl/FtSettlementDaoServiceImpl.java | 14 +++ .../mapper/fantang/FtSettlementDaoMapper.xml | 6 +- .../src/views/fantang/settlement/index.vue | 110 +++++++----------- 6 files changed, 81 insertions(+), 100 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java index 859addf07..6cce527bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java @@ -11,11 +11,14 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.fantang.domain.FtInvoiceDao; import com.ruoyi.system.fantang.domain.FtReturnDao; +import com.ruoyi.system.fantang.domain.FtSettlementDao; import com.ruoyi.system.fantang.service.IFtInvoiceDaoService; import com.ruoyi.system.fantang.service.IFtReturnDaoService; +import com.ruoyi.system.fantang.service.IFtSettlementDaoService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; @@ -36,7 +39,7 @@ public class FtInvoiceDaoController extends BaseController { private final IFtInvoiceDaoService iFtInvoiceDaoService; - private final IFtReturnDaoService iFtReturnDaoService; + private final IFtSettlementDaoService settSettlementDaoService; /** * 查询财务收费开票列表 @@ -108,8 +111,8 @@ public class FtInvoiceDaoController extends BaseController { } @PostMapping("/addToInvoice") + @Transactional public AjaxResult addToInvoice(@RequestBody JSONObject params) { - System.out.println(params); // 应收 BigDecimal payable = params.getBigDecimal("payable"); @@ -136,13 +139,14 @@ public class FtInvoiceDaoController extends BaseController { invoiceDao.setInvoiceName(invoiceName); invoiceDao.setTaxId(taxId); invoiceDao.setInvoiceType(invoiceType); + invoiceDao.setInvoiceAmount(receipts); iFtInvoiceDaoService.save(invoiceDao); -// -// if (invoiceType == 2) { -// FtReturnDao ftReturnDao = new FtReturnDao(); -// ftReturnDao.setInvoiceId(invoiceDao.getId()); -// iFtReturnDaoService.save(ftReturnDao); -// } + + FtSettlementDao settlementDao = new FtSettlementDao(); + settlementDao.setSettleId(params.getLong("settleId")); + settlementDao.setInvoiceId(invoiceDao.getId()); + settlementDao.setInvoiceFlag(true); + settSettlementDaoService.updateById(settlementDao); return AjaxResult.success("已开票"); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettlementDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettlementDaoController.java index cb7dda99c..35a5869cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettlementDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettlementDaoController.java @@ -39,26 +39,6 @@ public class FtSettlementDaoController extends BaseController { @GetMapping("/list") public TableDataInfo list(FtSettlementDao ftSettlementDao) { startPage(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftSettlementDao); - if (ftSettlementDao.getSettleAt() != null) { - lqw.eq(FtSettlementDao::getSettleAt, ftSettlementDao.getSettleAt()); - } - if (ftSettlementDao.getPrice() != null) { - lqw.eq(FtSettlementDao::getPrice, ftSettlementDao.getPrice()); - } - if (ftSettlementDao.getPayable() != null) { - lqw.eq(FtSettlementDao::getPayable, ftSettlementDao.getPayable()); - } - if (ftSettlementDao.getReceipts() != null) { - lqw.eq(FtSettlementDao::getReceipts, ftSettlementDao.getReceipts()); - } - if (StringUtils.isNotBlank(ftSettlementDao.getType())) { - lqw.eq(FtSettlementDao::getType, ftSettlementDao.getType()); - } - if (ftSettlementDao.getRefund() != null) { - lqw.eq(FtSettlementDao::getRefund, ftSettlementDao.getRefund()); - } -// List list = iFtSettlementDaoService.list(lqw); List list = iFtSettlementDaoService.listWithPatient(ftSettlementDao); return getDataTable(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettlementDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettlementDao.java index d3823a84f..7cb05ab69 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettlementDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettlementDao.java @@ -1,5 +1,6 @@ package com.ruoyi.system.fantang.domain; +import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -98,4 +99,14 @@ public class FtSettlementDao implements Serializable { @TableField(exist = false) private String name; + + @TableField(exist = false) + private String beginOfDay; + + @TableField(exist = false) + private String endOfDay; + + private Long invoiceId; + + private Boolean invoiceFlag; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtSettlementDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtSettlementDaoServiceImpl.java index 5733ff0b9..8c31594e2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtSettlementDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtSettlementDaoServiceImpl.java @@ -1,11 +1,15 @@ package com.ruoyi.system.fantang.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.fantang.domain.FtSettlementDao; import com.ruoyi.system.fantang.mapper.FtSettlementDaoMapper; import com.ruoyi.system.fantang.service.IFtSettlementDaoService; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; /** @@ -19,6 +23,16 @@ public class FtSettlementDaoServiceImpl extends ServiceImpl listWithPatient(FtSettlementDao ftSettlementDao) { + + Date settleAt = ftSettlementDao.getSettleAt(); + if (settleAt != null) { + DateTime beginOfDay = DateUtil.beginOfDay(settleAt); + DateTime endOfDay = DateUtil.endOfDay(settleAt); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + ftSettlementDao.setBeginOfDay(sdf.format(beginOfDay)); + ftSettlementDao.setEndOfDay(sdf.format(endOfDay)); + } + return this.baseMapper.listWithPatient(ftSettlementDao); } } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtSettlementDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtSettlementDaoMapper.xml index 8cb99005b..983e66558 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtSettlementDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtSettlementDaoMapper.xml @@ -16,6 +16,8 @@ + + diff --git a/ruoyi-ui/src/views/fantang/settlement/index.vue b/ruoyi-ui/src/views/fantang/settlement/index.vue index b74d4fccf..199fa630f 100644 --- a/ruoyi-ui/src/views/fantang/settlement/index.vue +++ b/ruoyi-ui/src/views/fantang/settlement/index.vue @@ -9,24 +9,6 @@ placeholder="选择结算日期"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + 搜索 重置 @@ -53,36 +36,15 @@ - - - - - - - - - - 开票 - - - - 删除 + @click="" + v-hasPermi="['fantang:settlement:edit']" + >组合开票 @@ -110,6 +72,7 @@ {{ parseTime(scope.row.settleAt, '{y}-{m}-{d}') }} + @@ -143,12 +99,6 @@ - - - - - - @@ -177,9 +127,6 @@ - - -
确 定 @@ -190,8 +137,13 @@