java/xizang.git

			@@ -184,15 +184,13 @@
			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);
			List<TBill> list = billService.lambdaQuery()
			.eq(TBill::getContractId, id)

			@@ -16,6 +16,8 @@
			import lombok.Data;
			import lombok.EqualsAndHashCode;

			import javax.validation.constraints.NotBlank;

			/**
			* <p>
			* 合同管理
			@@ -127,6 +129,7 @@

			@ApiModelProperty(value = "合同附件,多个逗号拼接")
			@TableField("contract_file")
			@NotBlank(message = "合同附件不能为空")
			private String contractFile;

			@ApiModelProperty(value = "备注")

			@@ -251,9 +251,10 @@
			}
			}else{
			if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
			rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
			}else{
			rentBill.setEndTime(contract.getEndTime());

			}else{
			rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
			}
			// 不走递增递减
			long allDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), rentBill.getEndTime());

			@@ -43,6 +43,7 @@
			</if>
			AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
			</where>
			order by t1.create_time desc
			</select>
			<select id="userHistoryList" resultType="com.ruoyi.system.vo.HouseVO">
			select

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史