From d58fb9c0ac9e3f7bd7346fed8146ddba3cb9c886 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 二月 2025 11:35:17 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 116 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 82 insertions(+), 34 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 ea54862..f3681a7 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
@@ -14,9 +14,7 @@
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WebUtils;
-import com.ruoyi.system.dto.TContractDTO;
-import com.ruoyi.system.dto.THouseDTO;
-import com.ruoyi.system.dto.TerminateContractDTO;
+import com.ruoyi.system.dto.*;
import com.ruoyi.system.export.ContractExport;
import com.ruoyi.system.export.OpticalInspectionExport;
import com.ruoyi.system.model.*;
@@ -37,6 +35,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -45,7 +44,9 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.*;
/**
@@ -70,15 +71,27 @@
private TBillService billService;
@Autowired
private TCheckAcceptRecordService checkAcceptRecordService;
+ @ApiOperation(value = "测试生成账单")
+ @PostMapping(value = "/testBill")
+ public R testBill(String id) {
+ SignContractDTO signContractDTO = new SignContractDTO();
+ signContractDTO.setId(id);
+ contractService.signContract(signContractDTO);
+ return R.ok();
+ }
@ApiOperation(value = "获取合同分页列表")
@PostMapping(value = "/contractList")
+ @PreAuthorize("@ss.hasPermi('system:contract:list')")
+
public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
return R.ok(contractService.contractList(query));
}
@Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增合同")
@PostMapping(value = "/addContract")
+ @PreAuthorize("@ss.hasPermi('system:contract:add')")
public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
+ dto.setChangeRent(dto.getMonthRent());
contractService.save(dto);
if (dto.getIsIncreasing()){
TContractRentType tContractRentType = new TContractRentType();
@@ -87,6 +100,7 @@
tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
tContractRentType.setNumericalValue(dto.getNumericalValue());
tContractRentType.setChangeTime(dto.getChangeTime());
+ tContractRentType.setCycleTime(dto.getCycleTime());
contractRentTypeService.save(tContractRentType);
}
return R.ok();
@@ -94,6 +108,8 @@
@Log(title = "合同管理-编辑合同", businessType = BusinessType.UPDATE)
@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>()
@@ -105,15 +121,17 @@
tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
tContractRentType.setNumericalValue(dto.getNumericalValue());
tContractRentType.setChangeTime(dto.getChangeTime());
+ tContractRentType.setCycleTime(dto.getCycleTime());
contractRentTypeService.save(tContractRentType);
}
return R.ok();
}
@Log(title = "合同管理-批量删除合同", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除合同")
+ @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(",")));
}
@@ -122,6 +140,8 @@
@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);
@@ -151,31 +171,50 @@
payMoney = payMoney.add(tBill.getPayFeesMoney()).add(tBill.getPayableFeesPenalty());
}
TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, id).one();
- res.setCheckResult(tCheckAcceptRecord.getCheckResult());
+ res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)?tCheckAcceptRecord.getCheckResult():false);
res.setPayMoney(payMoney);
+
return R.ok(res);
}
@Log(title = "合同管理-撤销审批", businessType = BusinessType.UPDATE)
@ApiOperation(value = "撤销审批")
+ @PreAuthorize("@ss.hasPermi('system:contract:revoke')")
+
@GetMapping(value = "/updateContractStatus")
public R<Boolean> updateContractStatus(String id) {
TContract contract = contractService.getById(id);
contract.setStatus("1");
+ contractService.updateById(contract);
+ return R.ok();
+ }
+ @PreAuthorize("@ss.hasPermi('system:contract:confirm')")
+
+ @Log(title = "合同管理-确认结算", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "确认结算")
+ @PostMapping(value = "/confirmSettlement")
+
+ public R<Boolean> confirmSettlement(String id) {
+ TContract contract = contractService.getById(id);
+ contract.setStatus("8");
+ contractService.updateById(contract);
return R.ok();
}
@ApiOperation(value = "终止合同剩余未缴费账单列表")
@PostMapping(value = "/contractBillList")
+ @PreAuthorize("@ss.hasPermi('system:contract:billList')")
public R<PageInfo<BillVO>> contractBillList(@RequestBody TContractBillQuery query) {
return R.ok(contractService.contractBillList(query));
}
@ApiOperation(value = "终止合同")
@PostMapping(value = "/terminateContract")
+ @PreAuthorize("@ss.hasPermi('system:contract:terminate')")
public R terminateContract(@RequestBody TerminateContractDTO dto) {
contractService.terminateContract(dto);
return R.ok();
}
@ApiOperation(value = "根据合同id查看验收记录")
@GetMapping(value = "/getCheckByContractId")
+ @PreAuthorize("@ss.hasPermi('system:contract:checkDetail')")
public R<CheckAcceptRecordVO> getCheckByContractId(String id) {
return R.ok(contractService.getCheckByContractId(id));
}
@@ -183,44 +222,53 @@
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);
+ @Log(title = "生成合同附件", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:contract:set')")
+ public R<List<String>> set(@RequestBody SetContractDto dto,HttpServletResponse response){
+ List<TContract> list = contractService.lambdaQuery().in(TContract::getId, dto.getIds()).list();
+ List<String> res = new ArrayList<>();
+ for (TContract contract : list) {
+ 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()));
+ 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()));
+ 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:\\");
+ res.add(url);
+ }
+
+ return R.ok(res);
}
/**
- * 光缆巡检列表导出
+ * 导出
*/
@ApiOperation(value = "导出")
+ @PreAuthorize("@ss.hasPermi('system:contract:export')")
@Log(title = "导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void exportOpticalInspection(@RequestBody TContractQuery query)
{
List<ContractExport> contractExports = new ArrayList<>();
-
List<TContract> exportList = contractService.contractExportList(query);
for (TContract contract : exportList) {
ContractExport contractExport = new ContractExport();
--
Gitblit v1.7.1