java/xizang.git

			@@ -227,7 +227,7 @@
			.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)&&Objects.nonNull(tCheckAcceptRecord.getCheckResult())?tCheckAcceptRecord.getCheckResult():false);

			@@ -372,6 +372,8 @@
			System.err.println("生成后续账单");
			TBill tBill = new TBill();
			tBill.setContractId(contract.getId());
			tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
			tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
			tBill.setContractNumber(contract.getContractNumber());
			if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).getDayOfMonth() <= 15) {
			tBill.setPayableFeesTime(contract.getEndTime().toLocalDate());
			@@ -500,8 +502,7 @@
			tBill.setContractNumber(contract.getContractNumber());
			tBill.setPayFeesStatus("1");
			tBill.setBillType("1");
			tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
			tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));

			billService.save(tBill);
			beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
			}

			@@ -90,7 +90,7 @@
			left join t_house h on t.house_id = h.id
			<where>

			<if test="query.status != null">
			<if test="query.status != null and query.status != ''">
			AND t.status = #{query.status}
			</if>
			<if test="query.houseNameOrAddress != null and query.houseNameOrAddress != ''">

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史