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/mapper/ApplicationMapper.xml | 8 +++++++-
src/main/resources/application-dev.yml | 2 +-
src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java | 13 +++++++------
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml b/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
index 0a6f0ad..7221387 100644
--- a/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
+++ b/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
@@ -29,7 +29,13 @@
<select id="selectApplicationPage" resultType="org.springblade.modules.application.vo.ApplicationVO">
- select app.*,CONCAT(car.car_license,car.trailer_license) licensePlate,
+ select app.*,
+ (
+ CASE
+ WHEN car.trailer_license IS NOT NULL
+ THEN CONCAT( car.car_license, car.trailer_license )
+ ELSE car.car_license
+ END) licensePlate,
goods.goods_name,
enterprise.enterprise_name,
enterprise.legal_person
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);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fc46f14..cc3f40b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,7 +13,7 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://localhost:3306/approval-system?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://192.168.0.116:3306/approval-system?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: 123456
# PostgreSQL
--
Gitblit v1.9.3