西藏国投
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
luofl
2025-04-03 dbf671285d9217f6ca84ee1e795aa9af386955e3 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java


@@ -26,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;


@@ -45,7 +56,13 @@


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;


@@ -56,7 +73,13 @@


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;




/**


 * <p>


@@ -294,7 +317,6 @@


    @Log(title = "合同管理-确认结算", businessType =  BusinessType.UPDATE)


    @ApiOperation(value = "确认结算")


    @PostMapping(value = "/confirmSettlement")




    public R<Boolean> confirmSettlement(String id) {


        TContract contract = contractService.getById(id);


        contract.setStatus("8");


@@ -307,7 +329,12 @@


        for (TBill tBill : tBills) {


            tBill.setPayFeesStatus("5");


        }


        billService.updateBatchById(tBills);        return R.ok();


        billService.updateBatchById(tBills);


        // 将房屋改成待出租


        THouse house = houseService.getById(contract.getHouseId());


        house.setLeaseStatus("1");


        houseService.updateById(house);


        return R.ok();


    }


    @ApiOperation(value = "终止合同剩余未缴费账单列表")


    @PostMapping(value = "/contractBillList")


@@ -371,7 +398,7 @@


        Map<String, Object> templateParam = new HashMap<>(5);


        fill(templateParam, "contractNumber", contract.getContractNumber());


        fill(templateParam, "partyOneName", contract.getPartyOneName());


        fill(templateParam, "partyTwoName", contract.getPartyTwoName());






        if (Objects.nonNull(tenant)) {


            fill(templateParam, "mailAddress", tenant.getMailAddress());


@@ -379,6 +406,7 @@


            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())


@@ -500,7 +528,7 @@


        if (StringUtils.isEmpty(key)){


            throw new RuntimeException("key不能为空");


        }


        templateParam.put(StringUtils.format("${{}}", "contractNumber"), value != null ? value : "");


        templateParam.put("${"+key+"}", value != null ? value : "");


    }




    /**


@@ -560,7 +588,36 @@


            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));


    }




}