状态修改

src/main/java/com/izouma/wenlvju/domain/performance/Programme.java

@@ -8,6 +8,7 @@ import com.izouma.wenlvju.domain.BaseEntity;
 import com.izouma.wenlvju.domain.VideoObject;
 import com.izouma.wenlvju.dto.ProgUploadDTO;
 import com.izouma.wenlvju.dto.ProgrammeDTO;
+import com.izouma.wenlvju.enums.ProgrammeProcess;
 import com.izouma.wenlvju.enums.ProgrammeStatus;
 import com.izouma.wenlvju.enums.SignedIn;
 import com.izouma.wenlvju.enums.CompetitionGroup;
@@ -89,12 +90,16 @@ public class Programme extends BaseEntity {
     /*
     初始状态为0，已提交1，考级机构初审未通过2，初审中3，未进入复审4，复审中5，评奖中6，完成7
     */
-    private int status;
+//    private int status;
 
     @ApiModelProperty(value = "状态")
     @Enumerated(EnumType.STRING)
     private ProgrammeStatus programmeStatus;
 
+    @ApiModelProperty(value = "流程")
+    @Enumerated(EnumType.STRING)
+    private ProgrammeProcess programmeProcess;
+
     @ApiModelProperty(value = "签到管理")
     @Enumerated(EnumType.STRING)
     private SignedIn signedIn;

src/main/java/com/izouma/wenlvju/service/performance/ArrangeService.java

@@ -10,6 +10,7 @@ import com.izouma.wenlvju.domain.performance.ArrangeJudge;
 import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.dto.ArrangeDTO;
 import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.enums.ProgrammeProcess;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.ArtTypeRepo;
 import com.izouma.wenlvju.repo.UserRepo;
@@ -273,7 +274,9 @@ public class ArrangeService {
                 p.setShowBegin(beginAt[0]);
                 p.setShowEnd(endAt);
                 p.setAddress(arrange.getAddress());
-                p.setStatus(5);
+//                p.setStatus(5);
+                // 待签到
+                p.setProgrammeProcess(ProgrammeProcess.SIGN_IN);
                 beginAt[0] = endAt;
             });
         });

src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -12,6 +12,8 @@ import com.izouma.wenlvju.domain.*;
 import com.izouma.wenlvju.domain.performance.*;
 import com.izouma.wenlvju.dto.*;
 import com.izouma.wenlvju.enums.CompetitionGroup;
+import com.izouma.wenlvju.enums.ProgrammeProcess;
+import com.izouma.wenlvju.enums.ProgrammeStatus;
 import com.izouma.wenlvju.enums.SignedIn;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.ArtTypeRepo;
@@ -412,7 +414,8 @@ public class ProgrammeService {
     public void saveAll(List<Programme> programmes, Long arrangeId) {
         programmes.forEach(programme -> {
             programme.setArrangeId(arrangeId);
-            programme.setStatus(4);
+            programme.setProgrammeProcess(ProgrammeProcess.ARRANGE);
+//            programme.setStatus(4);
         });
         programmeRepo.saveAll(programmes);
     }
@@ -438,7 +441,8 @@ public class ProgrammeService {
     public void removeArrange(Long id) {
         Programme programme = programmeRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         Long arrangeId = programme.getArrangeId();
-        programme.setStatus(0);
+//        programme.setStatus(0);
+        programme.setProgrammeStatus(ProgrammeStatus.INITIAL);
         programme.setArrangeId(null);
         programmeRepo.save(programme);
         arrangeRepo.minusQuantity(arrangeId);
@@ -453,7 +457,8 @@ public class ProgrammeService {
         Programme programme = programmeRepo.findById(id).orElseThrow(new BusinessException("无记录"));
 //        programme.setShowTime(showTime.plusMinutes(arrange.getDuration()));
         programme.setArrangeId(arrangeId);
-        programme.setStatus(4);
+//        programme.setStatus(4);
+        programme.setProgrammeProcess(ProgrammeProcess.ARRANGE);
         programmeRepo.save(programme);
 
         arrange.setQuantity(arrange.getQuantity() + 1);
@@ -600,11 +605,13 @@ public class ProgrammeService {
     public void firstAudit(Long id, boolean pass) {
         Programme programme = programmeRepo.findById(id).orElseThrow(new BusinessException("无节目"));
         if (pass) {
-            programme.setStatus(3);
+//            programme.setStatus(3);
+            programme.setProgrammeStatus(ProgrammeStatus.UNDER_REVIEW);
             programmeRepo.save(programme);
             return;
         }
-        programme.setStatus(2);
+//        programme.setStatus(2);
+        programme.setProgrammeStatus(ProgrammeStatus.AUDIT_FAILED);
         programmeRepo.save(programme);
     }
 

src/main/java/com/izouma/wenlvju/web/performance/ArrangeController.java

@@ -81,8 +81,8 @@ public class ArrangeController extends BaseController {
     }
 
 
-    @ApiOperation("发布")
-    @PostMapping("/performanceId")
+    @ApiOperation("分组发布")
+    @PostMapping("/publish")
     public void publish(@RequestParam Long performanceId) {
         arrangeService.publish(performanceId);
     }

src/main/vue/src/components/ArrangeLog.vue

@@ -5,7 +5,7 @@
         title="备案管理信息"
         center
         :visible.sync="dialogVisible"
-        width="800px"
+        width="600px"
     >
         <div class="edit-view">
             <el-form