java/xizang.git

			@@ -80,7 +80,6 @@
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;
			import java.util.stream.Collectors;

			/**
			* <p>
			@@ -318,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");
			@@ -326,11 +324,17 @@
			// 将所有未缴费账单设置未已失效
			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); 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")
			@@ -594,7 +598,7 @@
			if (Objects.isNull(contract)) {
			throw new ServiceException("合同不存在");
			}
			if (StringUtils.isNotBlank(contract.getContractFile())) {
			/* 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());
			@@ -608,7 +612,10 @@
			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));
			}