From fec0d6c623d2e3eed44727106dedfe1f8ba94abe Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 08 二月 2025 13:44:11 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 146 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 129 insertions(+), 17 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 e2d0e9e..4d9f1e7 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
@@ -4,28 +4,43 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.constant.DictConstants;
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.system.dto.TContractDTO;
import com.ruoyi.system.dto.THouseDTO;
-import com.ruoyi.system.model.TContract;
-import com.ruoyi.system.model.TContractRentType;
-import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.dto.TerminateContractDTO;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.TContractBillQuery;
+import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.query.THouseQuery;
import com.ruoyi.system.query.TUserHistoryQuery;
-import com.ruoyi.system.service.TContractRentTypeService;
-import com.ruoyi.system.service.TContractService;
-import com.ruoyi.system.service.THouseService;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.BillVO;
+import com.ruoyi.system.vo.CheckAcceptRecordVO;
import com.ruoyi.system.vo.HouseVO;
+import com.ruoyi.web.controller.tool.NumberToChineseUtils;
+import com.ruoyi.web.controller.tool.WordUtil;
+import io.swagger.annotations.Api;
import com.ruoyi.system.vo.TContractVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -43,12 +58,23 @@
private TContractService contractService;
@Autowired
private TContractRentTypeService contractRentTypeService;
+ @Autowired
+ private THouseService houseService;
+ @Autowired
+ private TBillService billService;
+ @Autowired
+ private TCheckAcceptRecordService checkAcceptRecordService;
+ @ApiOperation(value = "获取合同分页列表")
+ @PostMapping(value = "/contractList")
+ public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
+ return R.ok(contractService.contractList(query));
+ }
@Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增合同")
@PostMapping(value = "/addContract")
- public AjaxResult<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
+ public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
contractService.save(dto);
- if (dto.getIsIncreasing()==1){
+ if (dto.getIsIncreasing()){
TContractRentType tContractRentType = new TContractRentType();
tContractRentType.setContractId(dto.getId());
tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
@@ -57,16 +83,16 @@
tContractRentType.setChangeTime(dto.getChangeTime());
contractRentTypeService.save(tContractRentType);
}
- return AjaxResult.success();
+ return R.ok();
}
- @Log(title = "合同管理-编辑合同", businessType = BusinessType.UPDATE)
+ @Log(title = "合同管理-编辑合同", businessType = BusinessType.UPDATE)
@ApiOperation(value = "编辑合同")
@PostMapping(value = "/updateContract")
- public AjaxResult<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
+ public R<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
contractService.updateById(dto);
contractRentTypeService.remove(new LambdaQueryWrapper<TContractRentType>()
.eq(TContractRentType::getContractId,dto.getId()));
- if (dto.getIsIncreasing()==1){
+ if (dto.getIsIncreasing()){
TContractRentType tContractRentType = new TContractRentType();
tContractRentType.setContractId(dto.getId());
tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
@@ -75,24 +101,110 @@
tContractRentType.setChangeTime(dto.getChangeTime());
contractRentTypeService.save(tContractRentType);
}
- return AjaxResult.success();
+ return R.ok();
}
@Log(title = "合同管理-批量删除合同", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除合同")
@DeleteMapping(value = "/deleteContractByIds")
- public AjaxResult<Boolean> deleteContractByIds3
+ public R<Boolean> deleteContractByIds
(@RequestParam String ids) {
if (StringUtils.isNotEmpty(ids)){
contractService.removeBatchByIds(Arrays.asList(ids.split(",")));
}
- return AjaxResult.success();
+ return R.ok();
}
@ApiOperation(value = "查询合同信息信息")
@GetMapping(value = "/getContractById")
- public AjaxResult<TContractVO> getContractById(@RequestParam Long id) {
- return AjaxResult.success(contractService.getById(id));
+ public R<TContractVO> getContractById(@RequestParam String id) {
+ TContractVO res = new TContractVO();
+ TContract contract = contractService.getById(id);
+ BeanUtils.copyProperties(contract,res);
+ res.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,res.getPayType()));
+ res.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,res.getStatus()));
+ TContractRentType contractRentType = contractRentTypeService.lambdaQuery().eq(TContractRentType::getContractId, id).one();
+ if (contractRentType!=null){
+ BeanUtils.copyProperties(contractRentType,res);
+ }
+ TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
+ .eq(TContract::getHouseId,contract.getHouseId())
+ .eq(TContract::getStatus, 4)
+ .le(TContract::getStartTime, LocalDateTime.now())
+ .ge(TContract::getEndTime, LocalDateTime.now()));
+ THouse house = houseService.getById(contract.getHouseId());
+ if (oldContract!=null){
+ house.setTenantType(oldContract.getPayType());
+ }
+ res.setHouse(house);
+ List<TBill> list = billService.lambdaQuery()
+ .eq(TBill::getContractId, id)
+ .in(TBill::getPayFeesStatus, Arrays.asList("1,4"))
+ .list();
+ BigDecimal payMoney = new BigDecimal("0");
+ for (TBill tBill : list) {
+ payMoney = payMoney.add(tBill.getPayFeesMoney()).add(tBill.getPayableFeesPenalty());
+ }
+ TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, id).one();
+ res.setCheckResult(tCheckAcceptRecord.getCheckResult());
+ res.setPayMoney(payMoney);
+ return R.ok(res);
}
+ @Log(title = "合同管理-撤销审批", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "撤销审批")
+ @GetMapping(value = "/updateContractStatus")
+ public R<Boolean> updateContractStatus(String id) {
+ TContract contract = contractService.getById(id);
+ contract.setStatus("1");
+ return R.ok();
+ }
+ @ApiOperation(value = "终止合同剩余未缴费账单列表")
+ @PostMapping(value = "/contractBillList")
+ public R<PageInfo<BillVO>> contractBillList(@RequestBody TContractBillQuery query) {
+ return R.ok(contractService.contractBillList(query));
+ }
+ @ApiOperation(value = "终止合同")
+ @PostMapping(value = "/terminateContract")
+ public R terminateContract(@RequestBody TerminateContractDTO dto) {
+ contractService.terminateContract(dto);
+ return R.ok();
+ }
+ @ApiOperation(value = "根据合同id查看验收记录")
+ @GetMapping(value = "/getCheckByContractId")
+ public R<CheckAcceptRecordVO> getCheckByContractId(String id) {
+ return R.ok(contractService.getCheckByContractId(id));
+ }
+ @Autowired
+ private WordUtil wordUtil;
+ @ApiOperation(value = "生成合同附件")
+ @PostMapping("/set")
+ public R set(Integer id, HttpServletResponse response){
+ TContract contract = contractService.getById(id);
+ THouse tHouse = houseService.getById(contract.getHouseId());
+ Map<String, Object> templateParam = new HashMap<>(5);
+ templateParam.put("partyOneName", contract.getPartyOneName());
+ templateParam.put("partyTwoName", contract.getPartyTwoName());
+ templateParam.put("houseAddress", tHouse.getHouseAddress());
+ templateParam.put("houseArea", tHouse.getHouseArea()+"m²");
+ templateParam.put("startTime", DateUtils.localDateTimeToStringYear(contract.getStartTime()));
+ 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()));
+ 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()));
+ templateParam.put("nextPayTime", contract.getPayType().equals("1")?"月":contract.getPayType().equals("2")?"季":"年");
+ templateParam.put("deposit", "￥"+contract.getDeposit()+"元");
+ templateParam.put("depositString", NumberToChineseUtils.numberToChinese(contract.getDeposit().setScale(2, BigDecimal.ROUND_DOWN).doubleValue()));
+ templateParam.put("partyOnePerson", contract.getPartyOnePerson());
+ 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:\\");
+ return R.ok(url);
+
+ }
}
--
Gitblit v1.7.1