java/xizang.git

			@@ -229,7 +229,7 @@
			payMoney = payMoney.add(tBill.getPayFeesMoney()).add(tBill.getPayableFeesPenalty());
			}
			TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, id).one();
			res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)?tCheckAcceptRecord.getCheckResult():false);
			res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)&&Objects.nonNull(tCheckAcceptRecord.getCheckResult())?tCheckAcceptRecord.getCheckResult():false);
			res.setPayMoney(payMoney);

			return R.ok(res);

			@@ -148,4 +148,8 @@
			@ApiModelProperty(value = "合计年租金")
			private BigDecimal totalYear;

			@ApiModelProperty(value = "合同时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime contractTime;

			}

			@@ -23,7 +23,7 @@
			tc.id AS contractId, tc.contract_number, tc.contract_name, tc.start_time, tc.end_time,tc.deposit, tc.pay_type,
			tc.first_pay_time, tc.isIncreasing,tc.isIncreasing_deposit,tc.proportion, tc.house_id, tc.party_one_name, tc.party_one_person,
			tc.party_one_phone, tc.tenant_id, tc.party_two_name,tc.party_two_person, tc.party_two_phone,tc.memory, tc.contract_file_name,
			tc.signature, tc.terminate_remark, tc.total_year,tc.status AS contractStatus
			tc.signature, tc.terminate_remark, tc.total_year,tc.status AS contractStatus,tc.create_time AS contractTime
			from state_task_center stc
			LEFT JOIN t_contract tc ON stc.project_id = tc.id
			<where>

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/StateTaskCenterMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史