From a9ff7eed9494a33ea5e3056d765f35d32228b9f6 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Wed, 14 Jun 2023 19:59:10 +0800
Subject: [PATCH] bug fix

---
 .../service/impl/AppealMediationServiceImpl.java     |  2 ++
 .../service/impl/LargeScreenServiceImpl.java         | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
index 7ee4d17..c313bff 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
@@ -77,6 +77,8 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 		appeal.setSkipGrant((Func.isEmpty(appeal.getSkipGrant()) || appeal.getSkipGrant() == -1) ? BusinessConstant.CODE_FALSE : appeal.getSkipGrant());
 		appeal.setDisputeLevel((Func.isEmpty(appeal.getDisputeLevel()) || appeal.getDisputeLevel() == -1) ? BusinessConstant.DISPUTE_LEVEL_ZERO : appeal.getDisputeLevel());
 		appeal.setStatus(entity.getAppealStatus());
+		if (BusinessConstant.APPEAL_STATUS_AGREEMENT == entity.getAppealStatus() || BusinessConstant.APPEAL_STATUS_FINISH == entity.getAppealStatus())
+			appeal.setFinishTime(DateUtil.now());
 		appealService.updateById(appeal);
 		reg.setId(entity.getAppealRegId());
 		appealRegService.updateById(reg);
diff --git a/src/main/java/org/springblade/modules/business/service/impl/LargeScreenServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/LargeScreenServiceImpl.java
index 498e73a..052eccf 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/LargeScreenServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/LargeScreenServiceImpl.java
@@ -370,9 +370,9 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 	@Override
 	public IPage<Appeal> getImmediateList(String streetId, IPage<Appeal> page) {
 		LambdaQueryWrapper<Appeal> wrapper = new LambdaQueryWrapper<>();
-		wrapper.select(Appeal::getId, Appeal::getFirstRegTime, Appeal::getDisputeName);
+		wrapper.select(Appeal::getId, Appeal::getFirstRegTime, Appeal::getDisputeId, Appeal::getDisputeName);
 		wrapper.eq(Appeal::getStreetId, streetId);
-		wrapper.eq(Appeal::getSkipGrant, 1);
+		wrapper.eq(Appeal::getSkipGrant, BusinessConstant.CODE_TRUE);
 		wrapper.orderByDesc(Appeal::getCreateTime);
 		IPage<Appeal> iPage = appealService.page(page, wrapper);
 
@@ -380,10 +380,12 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 		List<Appeal> records = iPage.getRecords();
 		if (CollectionUtils.isNotEmpty(records)) {
 			for (Appeal record : records) {
+				if (Func.isNotEmpty(record.getDisputeId()))
+					record.setDisputeName(DictBizCache.getById(record.getDisputeId()).getDictValue());
 				// 获取sort=1的来访人
-				AppealVisitor visitor = appealVisitorService.getOne(new LambdaQueryWrapper<AppealVisitor>().eq(AppealVisitor::getAppealId, record.getId()).eq(AppealVisitor::getSort, 1));
-				if (visitor != null) {
-					record.setUsername(visitor.getUsername());
+				List<AppealVisitor> visitorList = appealVisitorService.list(new LambdaQueryWrapper<AppealVisitor>().eq(AppealVisitor::getAppealId, record.getId()));
+				if (Func.isNotEmpty(visitorList)) {
+					record.setUsername(visitorList.get(0).getUsername());
 				}
 			}
 			iPage.setRecords(records);