From 290924fd5695abafa800e555fd51549c370d8b52 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 26 Oct 2021 16:27:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041389=20=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE--=E5=9C=A8=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E7=BC=96=E8=BE=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=90=8E,=E4=B8=AA=E5=88=AB=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=B2=A1=E6=9C=89=E5=90=8C=E6=AD=A5=E5=88=B0=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=B3=BB=E7=BB=9F=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StableCrossTrainingServiceImpl.java  | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
index 881f8dad..d09f3d52 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
@@ -198,31 +198,6 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
         //创建时间/创建人/修改时间/修改人
         LoginUser user = TokenUtils.getUserByToken();
         BaseUtil.update(stableCrossTraining, user.getId());
-        //添加宣贯培训
-        LambdaUpdateWrapper<StableCrossTraining> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(StableCrossTraining::getId, stableCrossTraining.getId())
-                .set(StringUtils.isNotBlank(stableCrossTraining.getName()), StableCrossTraining::getName, stableCrossTraining.getName())//会议名称
-                .set(stableCrossTraining.getMeetingType() != null, StableCrossTraining::getMeetingType, stableCrossTraining.getMeetingType())//培训类型：1.标准宣贯, 2.学习培训
-                .set(stableCrossTraining.getMeetingState() != null, StableCrossTraining::getMeetingState, stableCrossTraining.getMeetingState())//会议状态: 1.可报名, 2.已结束
-                .set(StringUtils.isNotBlank(stableCrossTraining.getYear()), StableCrossTraining::getYear, stableCrossTraining.getYear())//年份
-                .set(stableCrossTraining.getConvokeStartTime() != null, StableCrossTraining::getConvokeStartTime, stableCrossTraining.getConvokeStartTime())//召开开始时间
-                .set(stableCrossTraining.getConvokeEndTime() != null, StableCrossTraining::getConvokeEndTime, stableCrossTraining.getConvokeEndTime())//召开结束时间
-                .set(StringUtils.isNotBlank(stableCrossTraining.getConvokeLocale()), StableCrossTraining::getConvokeLocale, stableCrossTraining.getConvokeLocale())//召开地点
-                .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingApply()), StableCrossTraining::getMeetingApply, stableCrossTraining.getMeetingApply())//会议报名：校验网址格式
-                .set(StableCrossTraining::getMeetingFiles, stableCrossTraining.getMeetingFiles())//会议文件
-                .set(StableCrossTraining::getMeetingNotifyFiles, stableCrossTraining.getMeetingNotifyFiles())//会议通知文件
-                .set(StableCrossTraining::getPaymentQrCode, stableCrossTraining.getPaymentQrCode())//付款二维码
-                .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingDescription()), StableCrossTraining::getMeetingDescription, stableCrossTraining.getMeetingDescription())//会议简介
-                .set(StringUtils.isNotBlank(stableCrossTraining.getRemark()), StableCrossTraining::getRemark, stableCrossTraining.getRemark())//备注
-                .set(StringUtils.isNotBlank(stableCrossTraining.getQrCode()), StableCrossTraining::getQrCode, stableCrossTraining.getQrCode())//二维码
-                .set(StringUtils.isNotBlank(stableCrossTraining.getPlaceName()), StableCrossTraining::getPlaceName, stableCrossTraining.getPlaceName())//召开省市地点名称
-                .set(StringUtils.isNotBlank(stableCrossTraining.getSignInTime()), StableCrossTraining::getSignInTime, stableCrossTraining.getSignInTime())//召开省市地点名称
-                .set(stableCrossTraining.getSignInStart() != null, StableCrossTraining::getSignInStart, stableCrossTraining.getSignInStart())//召开省市地点名称
-                .set(stableCrossTraining.getSignInEnd() != null, StableCrossTraining::getSignInEnd, stableCrossTraining.getSignInEnd())//召开省市地点名称
-                .set(StableCrossTraining::getUpdateBy, stableCrossTraining.getUpdateBy())//修改人
-                .set(StableCrossTraining::getUpdateTime, stableCrossTraining.getUpdateTime());//修改时间
-        //TODO 酒店信息
-//        stableCrossTraining.getId()
         //添加酒店信息
         LambdaQueryWrapper<HotelManagement> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(HotelManagement::getTrainingId, stableCrossTraining.getId());
@@ -237,7 +212,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
                 .setMeetingType(1).setId(hotelManagements.get(0).getId());
         hotelManagementService.edit(hotelManagement);
         //编辑宣贯信息
-        return stableCrossTrainingService.update(updateWrapper);
+        return stableCrossTrainingService.updateById(stableCrossTraining);
     }