From ef30e3f2eebad385c8b26bd0ff931c028d46f3ce Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 21 四月 2025 10:39:00 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java |  881 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 850 insertions(+), 31 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 c0cda84..6987379 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
@@ -1,35 +1,86 @@
 package com.ruoyi.web.controller.api;
 
 
+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;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.ImmutableMap;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.constant.DictConstants;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.enums.DisabledEnum;
+import com.ruoyi.common.enums.ProcessCategoryEnum;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.*;
+import com.ruoyi.system.bo.ProcessStartBO;
+import com.ruoyi.system.dto.RevokeDTO;
+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.system.export.ContractExport;
+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.query.THouseQuery;
-import com.ruoyi.system.query.TUserHistoryQuery;
+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.vo.HouseVO;
+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;
+import com.ruoyi.system.vo.BillVO;
+import com.ruoyi.system.vo.CheckAcceptRecordVO;
 import com.ruoyi.system.vo.TContractVO;
+import com.ruoyi.web.controller.tool.NumberToChineseUtils;
+import com.ruoyi.web.controller.tool.TencentCosUtil;
+import com.ruoyi.web.controller.tool.WordUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+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.*;
+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.annotation.Resource;
+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.time.temporal.TemporalAdjusters;
+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;
 
 /**
  * <p>
@@ -49,77 +100,845 @@
     private TContractRentTypeService contractRentTypeService;
     @Autowired
     private THouseService houseService;
+    @Autowired
+    private TBillService billService;
+    @Autowired
+    private TCheckAcceptRecordService checkAcceptRecordService;
+    @Autowired
+    private StateProcessTemplateService stateProcessTemplateService;
+    @Autowired
+    private FlwTaskMapper flwTaskMapper;
+    @Autowired
+    private TTenantService tenantService;
+
     @ApiOperation(value = "获取合同分页列表")
     @PostMapping(value = "/contractList")
-    public AjaxResult<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
-        return AjaxResult.success(contractService.contractList(query));
+    @PreAuthorize("@ss.hasPermi('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")
-    public AjaxResult<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
+    @PreAuthorize("@ss.hasPermi('contract:list:add')")
+    public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
+        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("房产信息不存在");
+        }
+        house.setRentalReturnStatus("1");
+        houseService.updateById(house);
+        dto.setBusinessDeptId(house.getBusinessDeptId());
+        // 生成合同编号
+        dto.setContractNumber(CodeGenerateUtils.generateVolumeSn(house.getBusinessDeptId()));
         contractService.save(dto);
-        if (dto.getIsIncreasing()==1){
+        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
+                    );
+                }
+            }
+        }
+        if (dto.getIsIncreasing()){
             TContractRentType tContractRentType = new TContractRentType();
             tContractRentType.setContractId(dto.getId());
             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);
         }
-        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) {
+    @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()));
-        if (dto.getIsIncreasing()==1){
+        if (dto.getIsIncreasing()){
             TContractRentType tContractRentType = new TContractRentType();
             tContractRentType.setContractId(dto.getId());
             tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
             tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
             tContractRentType.setNumericalValue(dto.getNumericalValue());
             tContractRentType.setChangeTime(dto.getChangeTime());
+            tContractRentType.setCycleTime(dto.getCycleTime());
             contractRentTypeService.save(tContractRentType);
         }
-        return AjaxResult.success();
+        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();
     }
     @Log(title = "合同管理-批量删除合同", businessType = BusinessType.DELETE)
     @ApiOperation(value = "批量删除合同")
+    @PreAuthorize("@ss.hasPermi('contract:list:delete')")
     @DeleteMapping(value = "/deleteContractByIds")
-    public AjaxResult<Boolean> deleteContractByIds3
-            (@RequestParam String ids) {
+    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) {
+    @PreAuthorize("@ss.hasPermi('contract:list:detail')")
+    public R<TContractVO> getContractById(@RequestParam String id) {
         TContractVO res = new TContractVO();
         TContract contract = contractService.getById(id);
         BeanUtils.copyProperties(contract,res);
-        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);
         }
-        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()));
+//        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());
-        }
+        house.setTenantType(contract.getPayType());
         res.setHouse(house);
-        return AjaxResult.success();
+        List<TBill> list = billService.lambdaQuery()
+                .eq(TBill::getContractId, id)
+                .ne(TBill::getPayFeesStatus, 3)
+                .list();
+        BigDecimal payMoney = new BigDecimal("0");
+        for (TBill tBill : list) {
+            payMoney = payMoney.add(tBill.getOutstandingMoney()).add(tBill.getPayableFeesPenalty());
+        }
+        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);
+    }
+    @Log(title = "合同管理-撤销审批", businessType =  BusinessType.UPDATE)
+    @ApiOperation(value = "撤销审批")
+    @PreAuthorize("@ss.hasPermi('contract:list:cancel')")
+    @PostMapping(value = "/updateContractStatus")
+    public R<Boolean> updateContractStatus(@RequestBody RevokeDTO dto) {
+        TContract contract = contractService.getById(dto.getContractId());
+        contract.setStatus("1");
+        contractService.updateById(contract);
+        // 撤销审批实例
+        stateProcessTemplateService.revoke(dto.getInstanceId());
+
+        return R.ok();
+    }
+    @PreAuthorize("@ss.hasPermi('contract:list:settlement')")
+    @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);
+        // 将所有未缴费账单设置未已失效
+        List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
+                .ne(TBill::getPayFeesStatus, 3)
+                        .ne(TBill::getBillType,4)
+                .eq(TBill::getContractId, contract.getId()));
+        for (TBill tBill : tBills) {
+            tBill.setPayFeesStatus("5");
+        }
+        billService.updateBatchById(tBills);
+        // 将房屋改成待出租
+        THouse house = houseService.getById(contract.getHouseId());
+        house.setLeaseStatus("1");
+        houseService.updateById(house);
+        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")
+    @PreAuthorize("@ss.hasPermi('contract:list:break')")
+    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;
+    @Autowired
+    private TencentCosUtil tencentCosUtil;
+    @ApiOperation(value = "生成合同附件")
+    @PostMapping("/set")
+    @Log(title = "生成合同附件", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('contract:list:generate')")
+    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) {
+            String url = generateContract(contract,new TContractDTO());
+            res.add(url);
+        }
+
+        return R.ok(res);
+    }
+
+    // 计算两个日期相差天数的方法实现:
+    public static long calculateDaysBetween(LocalDateTime start, LocalDateTime end) {
+        return ChronoUnit.DAYS.between(start, end);
+    }
+
+    public static void main(String[] args) {
+        LocalDateTime start = LocalDateTime.of(2024, 1, 1, 0, 0);
+        LocalDateTime end = LocalDateTime.of(2024, 1, 5, 12, 0);
+        long days = calculateDaysBetween(start, end); // 返回4天(不满一天不计)
+
+    }
+
+    private String generateContract(TContract contract,TContractDTO dto) {
+        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)
+                    .eq(TBill::getBillType, 1)
+                    .orderByAsc(TBill::getStartTime)
+                    .ne(TBill::getManualAddition, DisabledEnum.YES.getCode())
+                    .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());
+            fill(templateParam, "email", tenant.getEmail());
+
+            // 企业、政府机构、国有企业
+            if (Objects.nonNull(tenant.getTenantAttributes())
+                    && (tenant.getTenantAttributes().equals("2")
+                    || tenant.getTenantAttributes().equals("5")
+                    || tenant.getTenantAttributes().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", StringUtils.isNotEmpty(contract.getHouseUseScope()) ? 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);
+        BigDecimal extracted = extracted(contract,dto);
+        System.out.println("金额========================="+extracted);
+        fill(templateParam, "firstRent", "¥" + extracted + "元");
+        // 其他财务字段
+        fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(extracted.doubleValue()));
+
+
+//        fill(templateParam, "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, 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", "");
+        }
+
+        String url = "";
+        if (StringUtils.isNotEmpty(contract.getSignature())){
+            url = tencentCosUtil.downLoadFileImg(contract.getSignature());
+        }
+
+
+        return wordUtil.generatePdf(
+                "/usr/local/project/file/",
+                templateFileName,
+                templateParam,
+                "租赁合同",
+                "/usr/local/project/file/",url);
+    }
+
+    private BigDecimal extracted(TContract contract,TContractDTO dto) {
+        TContractRentType tContractRentType = null;
+        if (contract.getIsIncreasing()){
+            tContractRentType = new TContractRentType();
+            tContractRentType.setContractId(contract.getId());
+            tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
+            tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
+            tContractRentType.setNumericalValue(dto.getNumericalValue());
+            tContractRentType.setChangeTime(dto.getChangeTime());
+            tContractRentType.setCycleTime(dto.getCycleTime());
+        }
+        // 生成第一笔账单
+        // 第一次应缴费日期
+
+        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());
+        if (contract.getPayType().equals("2")) {
+            // 季付 取3 6 9 12
+            int temp = 0 ;
+            if (contract.getStartPayTime().getMonthValue() <= 3 ) {
+                temp = 3;
+            } else if (contract.getStartPayTime().getMonthValue() <= 6) {
+                temp = 6;
+            } else if (contract.getStartPayTime().getMonthValue() <= 9) {
+                temp = 9;
+            } else {
+                temp = 12;
+            }
+            if (contract.getEndTime().isAfter(contract.getStartPayTime().withMonth(temp).with(TemporalAdjusters.lastDayOfMonth()))){
+                rentBill.setEndTime(contract.getStartPayTime().withMonth(temp).with(TemporalAdjusters.lastDayOfMonth()));
+            }else {
+                rentBill.setEndTime(contract.getEndTime());
+            }
+        } else if (contract.getPayType().equals("3")) {
+            if (contract.getEndTime().isAfter(contract.getStartPayTime().withMonth(12).with(TemporalAdjusters.lastDayOfMonth()))){
+                rentBill.setEndTime(contract.getStartPayTime().withMonth(12).with(TemporalAdjusters.lastDayOfMonth()));
+            }else {
+                rentBill.setEndTime(contract.getEndTime());
+            }
+        } else {
+            rentBill.setEndTime(rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()));
+        }
+        if (tContractRentType != null && rentBill.getEndTime().isAfter(tContractRentType.getChangeTime())){
+            long moneyDays = 0;
+            if (tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(rentBill.getEndTime())){
+                moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth())) + 1;
+            }else{
+                moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(),rentBill.getEndTime()) + 1;
+            }
+            // 计算租金变动的天数
+            contract.setChangeTime(tContractRentType.getChangeTime());
+            // 递增递减的租金
+            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)).setScale(2, BigDecimal.ROUND_DOWN));
+                            // 变动后的每月租金
+                            contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
+                            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)).setScale(2, BigDecimal.ROUND_DOWN));
+                            contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
+                            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)).setScale(2, BigDecimal.ROUND_DOWN);
+                            contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
+                            break;
+                        case 2:
+                            contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).setScale(2, BigDecimal.ROUND_DOWN);
+                            contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
+                            break;
+                    }
+                    break;
+            }
+            LocalDateTime localDateTime = tContractRentType.getChangeTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+            while(true){
+                if (localDateTime.isBefore(rentBill.getEndTime())){
+                    if (localDateTime.plusMonths(1).isBefore(rentBill.getEndTime())){
+                        contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent());
+                        localDateTime = localDateTime.plusMonths(1);
+                    }else {
+                        break;
+                    }
+                }else{
+                    break;
+                }
+            }
+            long temp  = ChronoUnit.DAYS.between(localDateTime,rentBill.getEndTime()) + 1;
+            contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(temp)));
+            // 不需要涨租金的时间段
+            long originalDays = 0;
+            if (contract.getFirstPayTime().with(TemporalAdjusters.lastDayOfMonth()).isBefore(tContractRentType.getChangeTime())){
+                originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), contract.getFirstPayTime().with(TemporalAdjusters.lastDayOfMonth())));
+            }else{
+                originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()));
+            }
+            originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
+            LocalDateTime originalTime = contract.getFirstPayTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+            while(true){
+                if (originalTime.isBefore(tContractRentType.getChangeTime())){
+                    if (originalTime.plusMonths(1).isBefore(tContractRentType.getChangeTime())){
+                        originalMoney = originalMoney.add(contract.getMonthRent());
+                        originalTime = originalTime.plusMonths(1);
+                    }else {
+                        break;
+                    }
+                }else{
+                    break;
+                }
+            }
+            long tempOriginal  = ChronoUnit.DAYS.between(localDateTime,tContractRentType.getChangeTime()) ;
+            originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(tempOriginal)));
+            rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
+            rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+        } else {
+            // 不走递增递减
+            if (contract.getPayType().equals("2")){
+                BigDecimal money = new BigDecimal("0");
+                // 第一个月计算天
+                int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
+                if (dayOfMonth == 1) {
+                    System.err.println("第一笔账单 1号计算整月:");
+                    money = money.add(contract.getMonthRent());
+                } else {
+                    long allDays = Math.abs(ChronoUnit.DAYS.between(rentBill.getStartTime(), rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())) + 1);
+                    System.err.println("第一笔账单 计算天数"+allDays);
+                    money =money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+                    System.err.println("第一笔账单 计算天数金额"+money);
+                }
+                // 后续
+                if (contract.getStartPayTime().getMonthValue()==3|| contract.getStartPayTime().getMonthValue()==6|| contract.getStartPayTime().getMonthValue()==9|| contract.getStartPayTime().getMonthValue()==12){
+                    System.err.println("后续账单 月为3 6 9 12金额"+money);
+                    rentBill.setPayableFeesMoney(money);
+                    rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                }else{
+
+                    LocalDateTime localDateTime = rentBill.getStartTime().plusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
+                    System.err.println("后续账单逻辑时间"+localDateTime);
+                    while (true){
+                        if (localDateTime.toLocalDate().isBefore(rentBill.getEndTime().toLocalDate())){
+                            System.err.println("后续while 在结束之前");
+                            money = money.add(contract.getMonthRent());
+                        }else if(localDateTime.toLocalDate().equals(rentBill.getEndTime().toLocalDate())){
+                            System.err.println("后续while 结束");
+                            money = money.add(contract.getMonthRent());
+                            break;
+                        }else {
+                            System.err.println("后续while 加一个月大于结束时间");
+                            if (localDateTime.with(TemporalAdjusters.firstDayOfMonth()).isBefore(rentBill.getEndTime())){
+                                long a = ChronoUnit.DAYS.between(localDateTime.with(TemporalAdjusters.firstDayOfMonth()),rentBill.getEndTime())+1;
+                                System.err.println("后续while 加一个月大于结束时间 计算天数"+a);
+                                money = money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(
+                                        new BigDecimal(ChronoUnit.DAYS.between(localDateTime.with(TemporalAdjusters.firstDayOfMonth()),rentBill.getEndTime())+1))
+                                );
+                            }
+
+                            break;
+                        }
+                        localDateTime = localDateTime.plusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
+                    }
+                    rentBill.setPayableFeesMoney(money);
+                    rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                }
+            }else if (contract.getPayType().equals("3")){
+                BigDecimal money = new BigDecimal("0");
+                // 第一个月计算天
+                int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
+                if (dayOfMonth == 1) {
+                    money = money.add(contract.getMonthRent());
+                } else {
+                    long allDays = ChronoUnit.DAYS.between(rentBill.getStartTime(), rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth())) ;
+                    money =money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+                }
+                // 后续
+                if (contract.getStartPayTime().getMonthValue()==12){
+                    rentBill.setPayableFeesMoney(money);
+                    rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                }else{
+//                                LocalDateTime localDateTime = rentBill.getStartTime().plusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
+                    LocalDateTime localDateTime = rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
+                    while (true){
+                        if (localDateTime.isBefore(rentBill.getEndTime())){
+                            localDateTime = localDateTime.plusMonths(1);
+                            money = money.add(contract.getMonthRent());
+                        }else{
+                            money = money.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(ChronoUnit.DAYS.between(rentBill.getEndTime(),localDateTime.with(TemporalAdjusters.firstDayOfMonth())))));
+                            break;
+                        }
+                    }
+                    rentBill.setPayableFeesMoney(money);
+                    rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+                }
+            }else {
+                long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime()) + 1;
+                int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
+                if (dayOfMonth == 1) {
+                    rentBill.setPayableFeesMoney(contract.getMonthRent());
+                } else {
+                    rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+                }
+                rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+            }
+        }
+        // 押金账单
+        TBill depositBill = new TBill();
+        depositBill.setContractId(contract.getId());
+        depositBill.setContractNumber(contract.getContractNumber());
+        depositBill.setPayableFeesMoney(contract.getDeposit());
+        depositBill.setOutstandingMoney(depositBill.getPayableFeesMoney());
+        depositBill.setStartTime(contract.getStartPayTime());
+        depositBill.setEndTime(contract.getEndTime());
+        depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
+        depositBill.setPayFeesStatus("1");
+        depositBill.setBillType("2");
+        rentBill.setBusinessDeptId(contract.getBusinessDeptId());
+        depositBill.setBusinessDeptId(contract.getBusinessDeptId());
+        return rentBill.getPayableFeesMoney() ;
+
+    }
+
+
+    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)
+    {
+        String contractName = dto.getContractName();
+        if (StringUtils.isEmpty(contractName)){
+            return R.fail("合同名称不能为空");
+        }
+        LocalDateTime startTime = dto.getStartTime();
+        if (startTime == null){
+            return R.fail("合同生效日期不能为空");
+        }
+        LocalDateTime endTime = dto.getEndTime();
+        if (endTime == null){
+            return R.fail("合同生效日期不能为空");
+        }
+
+        BigDecimal monthRent = dto.getMonthRent();
+        if (monthRent == null){
+            return R.fail("月租金不能为空");
+        }
+
+        BigDecimal deposit = dto.getDeposit();
+        if (deposit == null){
+            return R.fail("押金不能为空");
+        }
+
+        String payType = dto.getPayType();
+        if (StringUtils.isEmpty(payType)){
+            return R.fail("租金支付方式不能为空");
+        }
+
+        LocalDateTime startPayTime = dto.getStartPayTime();
+        if (startPayTime == null){
+            return R.fail("开始计费日期不能为空");
+        }
+
+        String partyOneName = dto.getPartyOneName();
+        if (StringUtils.isEmpty(partyOneName)){
+            return R.fail("甲方名称不能为空");
+        }
+
+        String partyOnePerson = dto.getPartyOnePerson();
+        if (StringUtils.isEmpty(partyOnePerson)){
+            return R.fail("甲方联系人不能为空");
+        }
+
+        String partyOnePhone = dto.getPartyOnePhone();
+        if (StringUtils.isEmpty(partyOnePhone)){
+            return R.fail("甲方联系电话不能为空");
+        }
+
+        String partyTwoName = dto.getPartyTwoName();
+        if (StringUtils.isEmpty(partyTwoName)){
+            return R.fail("乙方名称不能为空");
+        }
+        String partyTwoPerson = dto.getPartyTwoPerson();
+        if (StringUtils.isEmpty(partyTwoPerson)){
+            return R.fail("乙方联系人不能为空");
+        }
+        String partyTwoPhone = dto.getPartyTwoPhone();
+        if (StringUtils.isEmpty(partyTwoPhone)){
+            return R.fail("乙方联系电话不能为空");
+        }
+
+        TContract contract = new TContract();
+        BeanUtil.copyProperties(dto,contract);
+        return R.ok(generateContract(contract,dto));
+    }
+
+    /**
+     * 导出
+     */
+    @ApiOperation(value = "导出")
+    @PreAuthorize("@ss.hasPermi('contract:list:export')")
+    @Log(title = "导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    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());
+            contractExport.setContractName(contract.getContractName());
+            contractExport.setPartyOneName(contract.getPartyOneName());
+            contractExport.setPartyTwoName(contract.getPartyTwoName());
+            contractExport.setCreateTime(DateUtils.localDateTimeToStringYear(contract.getCreateTime()));
+            contractExport.setStartTime(DateUtils.localDateTimeToStringYear(contract.getStartTime()));
+            contractExport.setEndTime(DateUtils.localDateTimeToStringYear(contract.getEndTime()));
+            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()));
+        }
+
+        HttpServletResponse response = WebUtils.response();
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        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();
+        }
+    }
+    @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());
+        }*/
+        contract.setContractFile(dto.getContractFile());
+        contract.setContractFileName(dto.getContractFileName());
+        contract.setMemory(dto.getMemory());
+        return R.ok(contractService.updateById(contract));
     }
 
 }

--
Gitblit v1.7.1