From 6bfd9e219ef6e51cd89f77a4cb6e5fb37779e9fe Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 10:27:58 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 396 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 336 insertions(+), 60 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 d6f9f12..824db47 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.bean.BeanUtil;
import com.aizuda.bpm.engine.entity.FlwTask;
import com.aizuda.bpm.mybatisplus.mapper.FlwTaskMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,6 +15,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.ProcessCategoryEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -24,10 +26,21 @@
import com.ruoyi.system.dto.TContractDTO;
import com.ruoyi.system.dto.TerminateContractDTO;
import com.ruoyi.system.export.ContractExport;
-import com.ruoyi.system.model.*;
+import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.model.TCheckAcceptRecord;
+import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.model.TContractRentType;
+import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.TContractBillQuery;
import com.ruoyi.system.query.TContractQuery;
-import com.ruoyi.system.service.*;
+import com.ruoyi.system.service.StateProcessTemplateService;
+import com.ruoyi.system.service.TBillService;
+import com.ruoyi.system.service.TCheckAcceptRecordService;
+import com.ruoyi.system.service.TContractRentTypeService;
+import com.ruoyi.system.service.TContractService;
+import com.ruoyi.system.service.THouseService;
+import com.ruoyi.system.service.TTenantService;
import com.ruoyi.system.task.base.QuartzManager;
import com.ruoyi.system.task.base.TimeJobType;
import com.ruoyi.system.task.jobs.StateProcessJob;
@@ -43,16 +56,31 @@
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.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -80,6 +108,8 @@
private StateProcessTemplateService stateProcessTemplateService;
@Autowired
private FlwTaskMapper flwTaskMapper;
+ @Autowired
+ private TTenantService tenantService;
@ApiOperation(value = "获取合同分页列表")
@PostMapping(value = "/contractList")
@@ -92,11 +122,20 @@
@PostMapping(value = "/addContract")
@PreAuthorize("@ss.hasPermi('contract:list:add')")
public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
- long count = contractService.count(new LambdaQueryWrapper<TContract>().eq(TContract::getContractNumber, dto.getContractNumber()));
+ LocalDateTime changeTime = dto.getChangeTime();
+ long count = contractService.count(new LambdaQueryWrapper<TContract>()
+ .eq(TContract::getContractNumber, dto.getContractNumber()));
if (count!=0){
return R.fail("合同编号不可重复");
}
dto.setChangeRent(dto.getMonthRent());
+ dto.setChangeTime(null);
+ //查询房产信息，获取所属营业部
+ THouse house = houseService.getById(dto.getHouseId());
+ if (Objects.isNull(house)) {
+ throw new ServiceException("房产信息不存在");
+ }
+ dto.setBusinessDeptId(house.getBusinessDeptId());
contractService.save(dto);
if (dto.getStatus().equals("2")){
//发起合同新增审批
@@ -124,7 +163,13 @@
new ImmutableMap.Builder<String, Long>().
put("id", flwTask.getId())
.build();
- QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+10*1000L), maps);
+ QuartzManager.addJob(
+ StateProcessJob.class,
+ (StateProcessJob.name+flwTask.getId()).toUpperCase(),
+ TimeJobType.AUTO_AUDIT,
+ new Date(new Date().getTime()+48*60*60*1000L),
+ maps
+ );
}
}
}
@@ -134,7 +179,7 @@
tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
tContractRentType.setNumericalValue(dto.getNumericalValue());
- tContractRentType.setChangeTime(dto.getChangeTime());
+ tContractRentType.setChangeTime(changeTime);
tContractRentType.setCycleTime(dto.getCycleTime());
contractRentTypeService.save(tContractRentType);
}
@@ -145,6 +190,13 @@
@PostMapping(value = "/updateContract")
@PreAuthorize("@ss.hasPermi('contract:list:edit')")
public R<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
+ dto.setChangeTime(null);
+ //查询房产信息，获取所属营业部
+ THouse house = houseService.getById(dto.getHouseId());
+ if (Objects.isNull(house)) {
+ throw new ServiceException("房产信息不存在");
+ }
+ dto.setBusinessDeptId(house.getBusinessDeptId());
contractService.updateById(dto);
contractRentTypeService.remove(new LambdaQueryWrapper<TContractRentType>()
.eq(TContractRentType::getContractId,dto.getId()));
@@ -157,6 +209,42 @@
tContractRentType.setChangeTime(dto.getChangeTime());
tContractRentType.setCycleTime(dto.getCycleTime());
contractRentTypeService.save(tContractRentType);
+ }
+ 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);
+ //开启工作流程
+ Boolean start = stateProcessTemplateService.start(processStartBO);
+ if(start){
+ FlwTask flwTask = flwTaskMapper.selectOne(Wrappers.lambdaQuery(FlwTask.class)
+ .like(FlwTask::getVariable, dto.getId())
+ .orderByDesc(FlwTask::getCreateTime)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(flwTask)){
+ // 添加定时任务
+ Map<String, ? extends Object> maps =
+ new ImmutableMap.Builder<String, Long>().
+ put("id", flwTask.getId())
+ .build();
+ QuartzManager.addJob(
+ StateProcessJob.class,
+ (StateProcessJob.name + flwTask.getId()).toUpperCase(),
+ TimeJobType.AUTO_AUDIT,
+ new Date(new Date().getTime() + 48 * 60 * 60 * 1000L),
+ maps
+ );
+ }
+ }
}
return R.ok();
}
@@ -178,9 +266,9 @@
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();
+ TContractRentType contractRentType = contractRentTypeService.lambdaQuery()
+ .eq(TContractRentType::getContractId, id)
+ .one();
if (contractRentType!=null){
BeanUtils.copyProperties(contractRentType,res);
}
@@ -194,14 +282,21 @@
res.setHouse(house);
List<TBill> list = billService.lambdaQuery()
.eq(TBill::getContractId, id)
- .in(TBill::getPayFeesStatus, Arrays.asList("1,4"))
+ .ne(TBill::getPayFeesStatus, 3)
.list();
BigDecimal payMoney = new BigDecimal("0");
for (TBill tBill : list) {
- payMoney = payMoney.add(tBill.getPayFeesMoney()).add(tBill.getPayableFeesPenalty());
+ payMoney = payMoney.add(tBill.getOutstandingMoney()).add(tBill.getPayableFeesPenalty());
}
- TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, id).one();
- res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)?tCheckAcceptRecord.getCheckResult():false);
+ TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
+ .eq(TCheckAcceptRecord::getContractId, id)
+ .one();
+ res.setCheckResult(
+ Objects.nonNull(tCheckAcceptRecord)
+ &&Objects.nonNull(tCheckAcceptRecord.getCheckResult())
+ ?tCheckAcceptRecord.getCheckResult()
+ :null
+ );
res.setPayMoney(payMoney);
return R.ok(res);
@@ -228,7 +323,14 @@
TContract contract = contractService.getById(id);
contract.setStatus("8");
contractService.updateById(contract);
- return R.ok();
+ // 将所有未缴费账单设置未已失效
+ List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
+ .ne(TBill::getPayFeesStatus, 3)
+ .eq(TBill::getContractId, contract.getId()));
+ for (TBill tBill : tBills) {
+ tBill.setPayFeesStatus("5");
+ }
+ billService.updateBatchById(tBills); return R.ok();
}
@ApiOperation(value = "终止合同剩余未缴费账单列表")
@PostMapping(value = "/contractBillList")
@@ -257,35 +359,184 @@
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("/template", "1_yzj_租赁合同.xml", templateParam, "租赁合同", "E:\\");
+ String url = generateContract(contract);
res.add(url);
}
return R.ok(res);
+ }
+
+ private String generateContract(TContract contract) {
+ String templateFileName = "1_yzj_租赁合同_个人.docx";
+ String contractId = contract.getId();
+ TBill firstBill = null;
+ TCheckAcceptRecord tCheckAcceptRecord = null;
+
+ if (StringUtils.isNotEmpty(contractId)) {
+ firstBill = billService.lambdaQuery()
+ .eq(TBill::getContractId, contractId)
+ .orderByDesc(TBill::getStartTime)
+ .last("limit 1")
+ .one();
+ tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
+ .eq(TCheckAcceptRecord::getContractId, contractId)
+ .last("limit 1")
+ .one();
+ }
+
+ TTenant tenant = null;
+ THouse tHouse = null;
+ if (StringUtils.isNotEmpty(contract.getTenantId())) {
+ tenant = tenantService.getById(contract.getTenantId());
+ tHouse = houseService.getById(contract.getHouseId());
+ }
+
+ Map<String, Object> templateParam = new HashMap<>(5);
+ fill(templateParam, "contractNumber", contract.getContractNumber());
+ fill(templateParam, "partyOneName", contract.getPartyOneName());
+
+
+ if (Objects.nonNull(tenant)) {
+ fill(templateParam, "mailAddress", tenant.getMailAddress());
+ fill(templateParam, "idCard", tenant.getIdCard());
+ fill(templateParam, "residentName", tenant.getResidentName());
+ fill(templateParam, "bankNumber", tenant.getBankNumber());
+ fill(templateParam, "bankName", tenant.getBankName());
+ fill(templateParam, "partyTwoName", tenant.getLessee());
+
+ // 企业、政府机构、国有企业
+ if (Objects.nonNull(tenant.getTenantType())
+ && (tenant.getTenantType().equals("2")
+ || tenant.getTenantType().equals("5")
+ || tenant.getTenantType().equals("7"))) {
+ fill(templateParam, "creditCode", tenant.getCreditCode());
+ fill(templateParam, "legalPerson", tenant.getLegalPerson());
+ templateFileName = "1_yzj_租赁合同_企业.docx";
+ }
+ }
+
+
+
+ if (Objects.nonNull(tHouse)) {
+ fill(templateParam, "houseAddress", tHouse.getHouseAddress());
+ fill(templateParam, "houseArea", tHouse.getHouseArea() + "m²");
+ }
+
+ // 日期相关参数处理
+ fill(templateParam, "remark", contract.getRemark());
+ fill(templateParam, "houseUseScope", contract.getHouseUseScope());
+ fill(templateParam, "days", ChronoUnit.DAYS.between(
+ contract.getStartTime(), contract.getEndTime()));
+
+ long between = ChronoUnit.DAYS.between(
+ contract.getStartTime(), contract.getStartPayTime()) + 1;
+ fill(templateParam, "day", between);
+
+ // 财务相关参数处理
+ fill(templateParam, "endTimeFree", DateUtils.localDateTimeToStringYear(
+ contract.getStartPayTime().plusDays(1)));
+ fill(templateParam, "startPayTime", DateUtils.localDateTimeToStringYear(
+ contract.getStartPayTime()));
+ fill(templateParam, "startTime", DateUtils.localDateTimeToStringYear(
+ contract.getStartTime()));
+ fill(templateParam, "endTime", DateUtils.localDateTimeToStringYear(
+ contract.getEndTime()));
+
+ // 金额格式化处理
+ fill(templateParam, "monthRent", "￥" + contract.getMonthRent() + "元");
+ fill(templateParam, "monthRentString", "人民币" + NumberToChineseUtils.numberToChinese(
+ contract.getMonthRent().setScale(2, RoundingMode.DOWN).doubleValue()));
+
+ String totalYear = Objects.nonNull(contract.getTotalYear())
+ ? contract.getTotalYear().toString()
+ : "";
+ fill(templateParam, "totalYear", "￥" + totalYear + "元");
+
+ String totalYearString = StringUtils.isNotEmpty(totalYear)
+ ? NumberToChineseUtils.numberToChinese(
+ contract.getTotalYear().setScale(2, RoundingMode.DOWN).doubleValue())
+ : "";
+ fill(templateParam, "totalYearString", "人民币" + totalYearString);
+
+ // 支付类型处理
+ String payType = contract.getPayType().equals("1") ? "月"
+ : contract.getPayType().equals("2") ? "季"
+ : "年";
+ fill(templateParam, "payType", payType);
+
+ // 首期租金处理
+ if (firstBill != null) {
+ fill(templateParam, "firstRent", "￥" + firstBill.getPayableFeesMoney() + "元");
+ } else {
+ fill(templateParam, "firstRent", "");
+ }
+
+ // 其他财务字段
+ fill(templateParam, "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, RoundingMode.DOWN).doubleValue()));
+
+ fill(templateParam, "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, RoundingMode.DOWN)).doubleValue()));
+
+
+
+
+ fill(templateParam, "nextPayTime", payType);
+ fill(templateParam, "deposit", "￥" + contract.getDeposit() + "元");
+ fill(templateParam, "depositString", NumberToChineseUtils.numberToChinese(
+ contract.getDeposit().setScale(2, RoundingMode.DOWN).doubleValue()));
+
+ // 联系方式
+ fill(templateParam, "partyOnePerson", contract.getPartyOnePerson());
+ fill(templateParam, "partyOnePhone", contract.getPartyOnePhone());
+ fill(templateParam, "partyTwoPerson", contract.getPartyTwoPerson());
+ fill(templateParam, "partyTwoPhone", contract.getPartyTwoPhone());
+
+ // 验收时间处理
+ if (tCheckAcceptRecord != null && tCheckAcceptRecord.getCheckTime() != null) {
+ fill(templateParam, "checkTime", DateUtils.localDateTimeToStringYear(
+ tCheckAcceptRecord.getCheckTime()));
+ } else {
+ fill(templateParam, "checkTime", "");
+ }
+
+ return wordUtil.generatePdf(
+ "/usr/local/project/file/",
+ templateFileName,
+ templateParam,
+ "租赁合同",
+ "/usr/local/project/file/");
+ }
+
+
+ private void fill(Map<String, Object> templateParam, String key, Object value) {
+ if (StringUtils.isEmpty(key)){
+ throw new RuntimeException("key不能为空");
+ }
+ templateParam.put("${"+key+"}", value != null ? value : "");
+ }
+
+ /**
+ * 生成预览版合同附件
+ */
+ @ApiOperation(value = "生成预览版合同附件")
+ @PostMapping("/generateContractPreview")
+ public R<String> generateContractPreview(@RequestBody TContractDTO dto)
+ {
+ TContract contract = new TContract();
+ BeanUtil.copyProperties(dto,contract);
+ return R.ok(generateContract(contract));
}
/**
@@ -295,10 +546,10 @@
@PreAuthorize("@ss.hasPermi('contract:list:export')")
@Log(title = "导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void exportOpticalInspection(@RequestBody TContractQuery query)
- {
+ public void exportOpticalInspection(@RequestBody TContractQuery query) throws UnsupportedEncodingException {
List<ContractExport> contractExports = new ArrayList<>();
List<TContract> exportList = contractService.contractExportList(query);
+
for (TContract contract : exportList) {
ContractExport contractExport = new ContractExport();
contractExport.setContractNumber(contract.getContractNumber());
@@ -308,33 +559,58 @@
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()));
+ contractExport.setDeposit(contract.getDeposit() + "");
contractExports.add(contractExport);
+ contractExport.setPayType(
+ DictUtils.getDictLabel(
+ DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE, contract.getPayType())
+ );
+ contractExport.setStatus(
+ DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS, contract.getStatus()));
}
- Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), ContractExport.class, contractExports);
+
HttpServletResponse response = WebUtils.response();
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- ServletOutputStream outputStream = null;
- try {
- String fileName = URLEncoder.encode("合同列表.xls", "utf-8");
- response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
- response.setContentType("application/vnd.ms-excel;charset=UTF-8");
- response.setHeader("Pragma", "no-cache");
- response.setHeader("Cache-Control", "no-cache");
- outputStream = response.getOutputStream();
+ response.setHeader("Content-Disposition",
+ "attachment;filename=" + URLEncoder.encode("合同列表.xls", "utf-8"));
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache");
+
+ try (Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), ContractExport.class, contractExports);
+ ServletOutputStream outputStream = response.getOutputStream()) {
workbook.write(outputStream);
} catch (IOException e) {
e.printStackTrace();
- } finally {
- try {
- outputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
}
}
+ @ApiOperation("上传合同附件")
+ @PostMapping(value = "/upload-file")
+ public R<Boolean> uploadFile(@RequestBody TContractDTO dto ) {
+ if (Objects.isNull(dto.getId())) {
+ throw new ServiceException("合同id不能为空");
+ }
+ TContract contract = contractService.getById(dto.getId());
+ if (Objects.isNull(contract)) {
+ throw new ServiceException("合同不存在");
+ }
+ if (StringUtils.isNotBlank(contract.getContractFile())) {
+ List<String> contractFileList = Arrays.stream(contract.getContractFile().split(",")).collect(Collectors.toList());
+ List<String> memoryList = Arrays.stream(contract.getMemory().split(",")).collect(Collectors.toList());
+ List<String> contractNameList = Arrays.stream(contract.getContractFileName().split(",")).collect(Collectors.toList());
+ contractFileList.addAll(Arrays.asList(dto.getContractFile().split(",")));
+ contractNameList.addAll(Arrays.asList(dto.getContractFileName().split(",")));
+ memoryList.addAll(Arrays.asList(dto.getMemory().split(",")));
+ contract.setContractFile(String.join(",", contractFileList));
+ contract.setContractFileName(String.join(",", contractNameList));
+ contract.setMemory(String.join(",", memoryList));
+ } else {
+ contract.setContractFile(dto.getContractFile());
+ contract.setContractFileName(dto.getContractFileName());
+ contract.setMemory(dto.getMemory());
+ }
+ return R.ok(contractService.updateById(contract));
+ }
+
}
--
Gitblit v1.7.1