From 2853852855d3a2ec606998c046470277a0773ed0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Dec 2022 09:01:26 +0800
Subject: [PATCH] 修改申请增改逻辑

---
 src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java b/src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java
index 33f7c06..26b6538 100644
--- a/src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java
@@ -87,18 +87,19 @@
 
 		GoodsEntity goods = goodsService.getOne(Condition.getQueryWrapper(new GoodsEntity(applicationId)));
 		applicationVO.setGoodsEntity(goods);
-		applicationVO.setGoodsEntity(goods);
+		applicationVO.setGoodsName(goods.getGoodsName());
 		return applicationVO;
 	}
 
 	@Override
 	@Transactional
 	public Boolean updateVoById(ApplicationEntity application, BasicInfoEntity basicInfoEntity, CarEntity carEntity, PlanEntity planEntity, SchemeEntity schemeEntity, GoodsEntity goodsEntity) {
-//		basicInfoEntity.setId(application.getBasicInfoId());
-//		carEntity.setId(application.getCarId());
-//		planEntity.setId(Long.parseLong(application.getPlanId()));
-//		schemeEntity.setId(Long.parseLong(application.getSchemeId()));
-//		goodsEntity.setId(application.getGoodsId());
+		String applicationId = application.getId().toString();
+		basicInfoEntity.setId(basicInfoService.getOne(Condition.getQueryWrapper(new BasicInfoEntity(applicationId))).getId());
+		carEntity.setId(carService.getOne(Condition.getQueryWrapper(new CarEntity(applicationId))).getId());
+		planEntity.setId(planService.getOne(Condition.getQueryWrapper(new PlanEntity(applicationId))).getId());
+		schemeEntity.setId(schemeService.getOne(Condition.getQueryWrapper(new SchemeEntity(applicationId))).getId());
+		goodsEntity.setId(goodsService.getOne(Condition.getQueryWrapper(new GoodsEntity(applicationId))).getId());
 
 		boolean b = basicInfoService.updateById(basicInfoEntity);
 		boolean c = carService.updateById(carEntity);

--
Gitblit v1.9.3