From b93a0b2565a82984b4843fa31c2c764fcdd43aef Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期四, 27 二月 2025 11:45:48 +0800
Subject: [PATCH] feat: 完善后台批量发送邮件接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 128 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 119 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 3053ff9..bb120fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -3,6 +3,7 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
@@ -10,10 +11,9 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.DictUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.WebUtils;
+import com.ruoyi.common.enums.ProcessCategoryEnum;
+import com.ruoyi.common.utils.*;
+import com.ruoyi.system.bo.ProcessStartBO;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.export.ContractExport;
import com.ruoyi.system.export.OpticalInspectionExport;
@@ -71,13 +71,109 @@
private TBillService billService;
@Autowired
private TCheckAcceptRecordService checkAcceptRecordService;
+ @Autowired
+ private StateProcessTemplateService stateProcessTemplateService;
@ApiOperation(value = "测试生成账单")
@PostMapping(value = "/testBill")
public R testBill(String id) {
- SignContractDTO signContractDTO = new SignContractDTO();
- signContractDTO.setId(id);
- contractService.signContract(signContractDTO);
+ TContract contract = contractService.getById(id);
+ // 查询所有已签订的合同并且未生成第一笔账单的
+
+ List<TBill> bills = new ArrayList<>();
+ List<TContractRentType> contractRentTypes = contractRentTypeService.list();
+ contract.setFirstPayTime(contract.getStartTime().plusDays(10));
+ // 第一次应缴费日期
+ LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
+ TBill rentBill = new TBill();
+ rentBill.setContractId(contract.getId());
+ rentBill.setContractNumber(contract.getContractNumber());
+ rentBill.setPayableFeesTime(firstPayTime.toLocalDate());
+ rentBill.setPayFeesStatus("1");
+ rentBill.setBillType("1");
+ rentBill.setStartTime(contract.getStartPayTime());
+ TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
+
+ if (tContractRentType!=null && contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(tContractRentType.getChangeTime())){
+ // 计算租金变动的天数
+ long moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12))+1L;
+ contract.setChangeTime(LocalDateTime.now());
+ // 递增递减的租金
+ BigDecimal contractRentTypeMoney = new BigDecimal("0");
+ // 不递增递减的租金
+ BigDecimal originalMoney = new BigDecimal("0");
+ // 原租金
+ switch (tContractRentType.getIncreasingDecreasingType()){
+ case 1:
+ switch (tContractRentType.getIncreasingDecreasing()){
+ case 1:
+ contractRentTypeMoney =contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
+ contract.setChangeRent(contractRentTypeMoney);
+ break;
+ case 2:
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).divide(new BigDecimal(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12),2,BigDecimal.ROUND_DOWN));
+ contract.setChangeRent(contractRentTypeMoney);
+ break;
+ }
+ break;
+ case 2:
+ switch (tContractRentType.getIncreasingDecreasing()){
+ case 1:
+ contractRentTypeMoney =contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contract.setChangeRent(contractRentTypeMoney);
+ break;
+ case 2:
+ contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
+ contract.setChangeRent(contractRentTypeMoney);
+
+ break;
+ }
+ break;
+ }
+ // 不需要涨租金的时间段
+ if (contract.getFirstPayTime().isBefore(tContractRentType.getChangeTime())){
+ long originalDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime());
+ originalMoney=originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
+ .multiply(new BigDecimal(originalDays));
+ rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
+ rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+ }else{
+ rentBill.setPayableFeesMoney(contractRentTypeMoney);
+ rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+ }
+
+ if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
+ rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+ }else{
+ rentBill.setEndTime(contract.getEndTime());
+ }
+ }else{
+ if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
+ rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+ }else{
+ rentBill.setEndTime(contract.getEndTime());
+ }
+ // 不走递增递减
+ long allDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), rentBill.getEndTime());
+ rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+ rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+
+ }
+ // 租金账单
+ bills.add(rentBill);
+ // 押金账单
+ TBill depositBill = new TBill();
+ depositBill.setContractId(contract.getId());
+ depositBill.setContractNumber(contract.getContractNumber());
+ depositBill.setPayableFeesMoney(contract.getDeposit());
+ depositBill.setOutstandingMoney(depositBill.getPayableFeesMoney());
+
+ depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
+ depositBill.setPayFeesStatus("1");
+ depositBill.setBillType("2");
+ contractService.updateById(contract);
+ billService.save(rentBill);
+ billService.save(depositBill);
return R.ok();
}
@ApiOperation(value = "获取合同分页列表")
@@ -94,6 +190,22 @@
public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
dto.setChangeRent(dto.getMonthRent());
contractService.save(dto);
+ if (dto.getStatus().equals("2")){
+ //发起合同新增审批
+ ProcessStartBO processStartBO = new ProcessStartBO();
+ processStartBO.setCategory(ProcessCategoryEnum.CATEGORY1.getValue().toString());
+ processStartBO.setModuleName("合同新增审批");
+ processStartBO.setName(dto.getContractName());
+ //需要显示发起申请人所在单位
+// String cedName = SecurityUtils.getLoginUser().getUser().getDept().getDeptName();
+// String remark = String.format("【镇/街】:%s,【征收实施单位】:%s,【申请金额】:%s万元", stateProject.getStreet(), cedName, stateApplyRecord.getAmount());
+ processStartBO.setRemark("");
+ Map<String, Object> variable = new HashMap<>();
+ variable.put("projectId", dto.getId());
+ processStartBO.setVariable(variable);
+ //开启工作流程
+ stateProcessTemplateService.start(processStartBO);
+ }
if (dto.getIsIncreasing()){
TContractRentType tContractRentType = new TContractRentType();
tContractRentType.setContractId(dto.getId());
@@ -110,7 +222,6 @@
@ApiOperation(value = "编辑合同")
@PostMapping(value = "/updateContract")
@PreAuthorize("@ss.hasPermi('system:contract:update')")
-
public R<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
contractService.updateById(dto);
contractRentTypeService.remove(new LambdaQueryWrapper<TContractRentType>()
@@ -142,7 +253,6 @@
@ApiOperation(value = "查询合同信息信息")
@GetMapping(value = "/getContractById")
@PreAuthorize("@ss.hasPermi('system:contract:detail')")
-
public R<TContractVO> getContractById(@RequestParam String id) {
TContractVO res = new TContractVO();
TContract contract = contractService.getById(id);
--
Gitblit v1.7.1