Merge branch 'dev' of http://git.izouma.com/licailing/wenlvju into dev

src/main/java/com/izouma/wenlvju/dto/RecordDTO.java

@@ -1,9 +1,5 @@
 package com.izouma.wenlvju.dto;
 
-import com.izouma.wenlvju.annotations.Searchable;
-import com.izouma.wenlvju.domain.BaseEntity;
-import com.izouma.wenlvju.enums.RecordStatus;
-import com.izouma.wenlvju.enums.WorkCategory;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,9 +7,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import java.time.LocalDate;
 
 @Data

src/main/java/com/izouma/wenlvju/service/PerformanceApplyService.java

@@ -1,17 +1,20 @@
 package com.izouma.wenlvju.service;
 
+import cn.hutool.core.collection.CollUtil;
+import com.izouma.wenlvju.domain.Performance;
 import com.izouma.wenlvju.domain.PerformanceApply;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.enums.ApplyStatus;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.PerformanceApplyRepo;
+import com.izouma.wenlvju.repo.PerformanceRepo;
 import com.izouma.wenlvju.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.Comparator;
+import java.time.LocalTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -20,6 +23,7 @@ import java.util.stream.Collectors;
 public class PerformanceApplyService {
 
     private PerformanceApplyRepo performanceApplyRepo;
+    private PerformanceRepo      performanceRepo;
 
     public Page<PerformanceApply> all(PageQuery pageQuery) {
         return performanceApplyRepo.findAll(JpaUtils.toSpecification(pageQuery, PerformanceApply.class), JpaUtils.toPageRequest(pageQuery));
@@ -46,10 +50,25 @@ public class PerformanceApplyService {
                 .filter(apply -> apply.showTime != null)
                 .sorted((a, b) -> b.showTime.compareTo(a.getShowTime()))
                 .collect(Collectors.toList());
-        final LocalDateTime[] time = {showTime.get(0).getShowTime().plusMinutes(10)};
         List<PerformanceApply> showTimeNull = applyList.stream()
                 .filter(apply -> apply.showTime == null)
                 .collect(Collectors.toList());
+
+        if (CollUtil.isEmpty(showTimeNull)) {
+            return;
+        }
+
+        if (CollUtil.isEmpty(showTime)) {
+            Performance performance = performanceRepo.findById(performanceId).orElseThrow(new BusinessException("无记录"));
+            final LocalDateTime[] time = {LocalDateTime.of(performance.getStartTime().plusDays(3), LocalTime.now())};
+            showTimeNull.forEach(apply -> {
+                apply.setShowTime(time[0]);
+                performanceApplyRepo.save(apply);
+                time[0] = time[0].plusMinutes(10);
+            });
+            return;
+        }
+        final LocalDateTime[] time = {showTime.get(0).getShowTime().plusMinutes(10)};
         showTimeNull.forEach(apply -> {
             apply.setShowTime(time[0]);
             performanceApplyRepo.save(apply);

src/main/java/com/izouma/wenlvju/web/RateController.java

@@ -1,16 +1,15 @@
 package com.izouma.wenlvju.web;
 
 import com.izouma.wenlvju.domain.Rate;
-import com.izouma.wenlvju.enums.RateStatus;
-import com.izouma.wenlvju.service.RateService;
 import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.enums.RateStatus;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.RateRepo;
+import com.izouma.wenlvju.service.RateService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/izouma/wenlvju/web/RecordController.java

@@ -2,21 +2,19 @@ package com.izouma.wenlvju.web;
 
 import com.izouma.wenlvju.domain.Record;
 import com.izouma.wenlvju.domain.User;
-import com.izouma.wenlvju.dto.RecordDTO;
+import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.enums.AuthorityName;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.RecordRepo;
 import com.izouma.wenlvju.repo.UserRepo;
 import com.izouma.wenlvju.security.Authority;
 import com.izouma.wenlvju.service.RecordService;
-import com.izouma.wenlvju.dto.PageQuery;
-import com.izouma.wenlvju.exception.BusinessException;
-import com.izouma.wenlvju.repo.RecordRepo;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.SecurityUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/izouma/wenlvju/web/RegulatoryController.java

@@ -2,18 +2,17 @@ package com.izouma.wenlvju.web;
 
 import com.izouma.wenlvju.domain.Record;
 import com.izouma.wenlvju.domain.Regulatory;
-import com.izouma.wenlvju.enums.RegulatoryStatus;
-import com.izouma.wenlvju.repo.RecordRepo;
-import com.izouma.wenlvju.service.RegulatoryService;
 import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.enums.RegulatoryStatus;
 import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.RecordRepo;
 import com.izouma.wenlvju.repo.RegulatoryRepo;
+import com.izouma.wenlvju.service.RegulatoryService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/vue/src/views/PerformanceList.vue

@@ -28,8 +28,8 @@
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
             <el-table-column prop="name" label="名称"> </el-table-column>
-            <el-table-column prop="startTime" label="时间"> </el-table-column>
-            <el-table-column prop="endTime" label="时间"> </el-table-column>
+            <el-table-column prop="startTime" label="开始时间"> </el-table-column>
+            <el-table-column prop="endTime" label="结束时间"> </el-table-column>
             <el-table-column prop="address" label="地点"> </el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">