Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_2023_03

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TempLittleArtistTrainingCampDto.java

@@ -44,10 +44,10 @@ public class TempLittleArtistTrainingCampDto implements Serializable {
     private Date trainEndDate;
 
     @ApiModelProperty(value = "适用分部")
-    private String organIds = "";
+    private String organIds;
 
     @ApiModelProperty(value = "适用学校")
-    private String musicGroupIds = "";
+    private String musicGroupIds;
 
     @NotNull(message = "打卡标准不能为空")
     @ApiModelProperty(value = "打卡标准")

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempLittleArtistTrainingCampServiceImpl.java

@@ -109,28 +109,27 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         SysUser user = getUser();
         Date now = DateUtil.toDate(LocalDate.now().toString());
         checkDateTime(dto, now);
-        TempLittleArtistTrainingCamp entity = Optional.ofNullable(dto.getId())
-                .map(this::getById)
-                .orElseThrow(() -> new BizException("训练营不存在"));
+        Optional.ofNullable(dto.getId()).map(this::getById).orElseThrow(() -> new BizException("训练营不存在"));
         /*int count = tempLittleArtistTrainingCampUserRelationService.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getActivityId, entity.getId()));
         if (count > 0) {
             throw new BizException("训练营已有学生报名，无法修改");
         }*/
-        entity.setName(dto.getName());
-        entity.setApplyStartDate(dto.getApplyStartDate());
-        entity.setApplyEndDate(dto.getApplyEndDate());
-        entity.setTrainStartDate(dto.getTrainStartDate());
-        entity.setTrainEndDate(dto.getTrainEndDate());
-        entity.setPicUrl(dto.getPicUrl());
-        entity.setEnableFlag(dto.getEnableFlag());
-        entity.setMusicGroupIds(dto.getMusicGroupIds());
-        entity.setOrganIds(dto.getOrganIds());
-        entity.setSignStandard(dto.getSignStandard());
-        entity.setStandardDays(dto.getStandardDays());
-        entity.setUpdateBy(user.getId());
-        entity.setUpdateTime(new Date());
-        this.updateById(entity);
+        this.lambdaUpdate()
+                .set(TempLittleArtistTrainingCamp::getName,dto.getName())
+                .set(TempLittleArtistTrainingCamp::getApplyStartDate,dto.getApplyStartDate())
+                .set(TempLittleArtistTrainingCamp::getApplyEndDate,dto.getApplyEndDate())
+                .set(TempLittleArtistTrainingCamp::getTrainStartDate,dto.getTrainStartDate())
+                .set(TempLittleArtistTrainingCamp::getTrainEndDate,dto.getTrainEndDate())
+                .set(TempLittleArtistTrainingCamp::getPicUrl,dto.getPicUrl())
+                .set(TempLittleArtistTrainingCamp::getEnableFlag,dto.getEnableFlag())
+                .set(TempLittleArtistTrainingCamp::getMusicGroupIds,dto.getMusicGroupIds())
+                .set(TempLittleArtistTrainingCamp::getOrganIds,dto.getOrganIds())
+                .set(TempLittleArtistTrainingCamp::getSignStandard,dto.getSignStandard())
+                .set(TempLittleArtistTrainingCamp::getStandardDays,dto.getStandardDays())
+                .set(TempLittleArtistTrainingCamp::getUpdateBy,user.getId())
+                .set(TempLittleArtistTrainingCamp::getUpdateTime,new Date())
+                        .eq(TempLittleArtistTrainingCamp::getId,dto.getId()).update();
     }
 
     /**