From 1fe1ac0e09132e0147e48007986be235e4130aa1 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 28 二月 2025 12:54:12 +0800
Subject: [PATCH] 分页查询更改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 97 ++++++++++++++++++++++++++----------------------
1 files changed, 53 insertions(+), 44 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 ba5e047..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,14 +11,10 @@
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.system.dto.SetContractDto;
-import com.ruoyi.system.dto.TContractDTO;
-import com.ruoyi.system.dto.THouseDTO;
-import com.ruoyi.system.dto.TerminateContractDTO;
+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;
import com.ruoyi.system.model.*;
@@ -74,9 +71,11 @@
private TBillService billService;
@Autowired
private TCheckAcceptRecordService checkAcceptRecordService;
+ @Autowired
+ private StateProcessTemplateService stateProcessTemplateService;
+
@ApiOperation(value = "测试生成账单")
@PostMapping(value = "/testBill")
-
public R testBill(String id) {
TContract contract = contractService.getById(id);
// 查询所有已签订的合同并且未生成第一笔账单的
@@ -86,22 +85,10 @@
contract.setFirstPayTime(contract.getStartTime().plusDays(10));
// 第一次应缴费日期
LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
- LocalDate localDate = contract.getStartTime().plusDays(10).toLocalDate();
- LocalDate now = LocalDate.now();
TBill rentBill = new TBill();
rentBill.setContractId(contract.getId());
rentBill.setContractNumber(contract.getContractNumber());
- LocalDateTime startPayTime = contract.getStartPayTime();
- LocalDateTime endTime1 = contract.getEndTime();
-// // 计算两个时间相差多少天
-// // 如果时间小于30天 需要计算每日租金
-// if (days<30){
-// rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(days)));
-// }else{
-// rentBill.setPayableFeesMoney(contract.getPayType().equals("1")?contract.getMonthRent():
-// contract.getPayType().equals("2")?contract.getMonthRent().multiply(new BigDecimal("3")):contract.getMonthRent().multiply(new BigDecimal("12")).setScale(2,BigDecimal.ROUND_DOWN));
-// }
- rentBill.setPayableFeesTime(firstPayTime);
+ rentBill.setPayableFeesTime(firstPayTime.toLocalDate());
rentBill.setPayFeesStatus("1");
rentBill.setBillType("1");
rentBill.setStartTime(contract.getStartPayTime());
@@ -121,11 +108,11 @@
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.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN)));
+ 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)));
- contract.setChangeRent(contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN)));
+ 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;
@@ -133,22 +120,28 @@
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.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())));
+ 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.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())));
+ contract.setChangeRent(contractRentTypeMoney);
break;
}
break;
}
// 不需要涨租金的时间段
- 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());
+ 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{
@@ -175,7 +168,7 @@
depositBill.setPayableFeesMoney(contract.getDeposit());
depositBill.setOutstandingMoney(depositBill.getPayableFeesMoney());
- depositBill.setPayableFeesTime(firstPayTime);
+ depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
depositBill.setPayFeesStatus("1");
depositBill.setBillType("2");
contractService.updateById(contract);
@@ -197,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());
@@ -213,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>()
@@ -235,8 +243,7 @@
@PreAuthorize("@ss.hasPermi('system:contract:delete')")
@DeleteMapping(value = "/deleteContractByIds")
- public R<Boolean> deleteContractByIds
- (@RequestParam String ids) {
+ public R<Boolean> deleteContractByIds(@RequestParam String ids) {
if (StringUtils.isNotEmpty(ids)){
contractService.removeBatchByIds(Arrays.asList(ids.split(",")));
}
@@ -246,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);
@@ -315,6 +321,7 @@
@PreAuthorize("@ss.hasPermi('system:contract:terminate')")
public R terminateContract(@RequestBody TerminateContractDTO dto) {
contractService.terminateContract(dto);
+ // 生成房屋验收记录 待验收
return R.ok();
}
@ApiOperation(value = "根据合同id查看验收记录")
@@ -343,8 +350,10 @@
templateParam.put("endTime", DateUtils.localDateTimeToStringYear(contract.getEndTime()));
templateParam.put("monthRent", "￥￥"+contract.getMonthRent()+"元");
templateParam.put("monthRentString", "人民币"+NumberToChineseUtils.numberToChinese(contract.getMonthRent().setScale(2, BigDecimal.ROUND_DOWN).doubleValue()));
- templateParam.put("totalYear", "￥￥"+contract.getTotalYear()+"元");
- templateParam.put("totalYearString", "人民币"+NumberToChineseUtils.numberToChinese(contract.getTotalYear().setScale(2, BigDecimal.ROUND_DOWN).doubleValue()));
+ String totalYear = Objects.nonNull(contract.getTotalYear())?contract.getTotalYear().toString():"";
+ templateParam.put("totalYear", "￥￥"+totalYear+"元");
+ String totalYearString = StringUtils.isNotEmpty(totalYear)?NumberToChineseUtils.numberToChinese(contract.getTotalYear().setScale(2, BigDecimal.ROUND_DOWN).doubleValue()):"";
+ templateParam.put("totalYearString", "人民币"+totalYearString);
templateParam.put("payType", contract.getPayType().equals("1")?"月":contract.getPayType().equals("2")?"季":"年");
templateParam.put("firstRent", "￥"+(contract.getPayType().equals("1")?contract.getMonthRent():contract.getPayType().equals("2")?contract.getMonthRent().multiply(new BigDecimal("3")):contract.getMonthRent().multiply(new BigDecimal("12"))).setScale(2,BigDecimal.ROUND_DOWN)+"元");
templateParam.put("firstRentString", "人民币"+NumberToChineseUtils.numberToChinese((contract.getPayType().equals("1")?contract.getMonthRent():contract.getPayType().equals("2")?contract.getMonthRent().multiply(new BigDecimal("3")):contract.getMonthRent().multiply(new BigDecimal("12")).setScale(2,BigDecimal.ROUND_DOWN)).doubleValue()));
@@ -355,7 +364,7 @@
templateParam.put("partyOnePhone", contract.getPartyOnePhone());
templateParam.put("partyTwoPerson", contract.getPartyTwoPerson());
templateParam.put("partyTwoPhone", contract.getPartyTwoPhone());
- String url = wordUtil.generatePdf("/templates", "1_yzj_租赁合同.xml", templateParam, "租赁合同", "E:\\");
+ String url = wordUtil.generatePdf("/template", "1_yzj_租赁合同.xml", templateParam, "租赁合同", "E:\\");
res.add(url);
}
@@ -379,12 +388,13 @@
contractExport.setContractName(contract.getContractName());
contractExport.setPartyOneName(contract.getPartyOneName());
contractExport.setPartyTwoName(contract.getPartyTwoName());
- contractExport.setCreate_time(contract.getCreateTime());
- contractExport.setStartTime(contract.getStartTime());
- contractExport.setEndTime(contract.getEndTime());
+ contractExport.setCreateTime(DateUtils.localDateTimeToStringYear(contract.getCreateTime()));
+ contractExport.setStartTime(DateUtils.localDateTimeToStringYear(contract.getStartTime()));
+ contractExport.setEndTime(DateUtils.localDateTimeToStringYear(contract.getEndTime()));
contractExport.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,contract.getPayType()));
contractExport.setDeposit(contract.getDeposit()+"");
contractExport.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,contract.getStatus()));
+ contractExports.add(contractExport);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), ContractExport.class, contractExports);
HttpServletResponse response = WebUtils.response();
@@ -401,7 +411,6 @@
workbook.write(outputStream);
} catch (IOException e) {
e.printStackTrace();
- System.err.println("合同列表信息导出失败");
} finally {
try {
outputStream.close();
--
Gitblit v1.7.1