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

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

@@ -7,6 +7,7 @@ import com.izouma.wenlvju.domain.Organization;
 import com.izouma.wenlvju.domain.Rate;
 import com.izouma.wenlvju.domain.User;
 import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.dto.ReviewTime;
 import com.izouma.wenlvju.enums.RateStatus;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.OrganizationRepo;
@@ -17,6 +18,7 @@ import com.izouma.wenlvju.service.RateService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.SecurityUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
+import com.sun.org.apache.regexp.internal.RE;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -135,5 +137,16 @@ public class RateController extends BaseController {
         Rate rate = rateRepo.findById(id).orElseThrow(new BusinessException("无申请"));
         rateService.export(response, rate);
     }
+
+    @GetMapping("/saveReviewTime")
+    public Rate saveReviewTime(Long id, LocalDateTime time) {
+        Rate rate = rateRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        rate.setReviewTime(time);
+        rate.getReviewTimes().add(ReviewTime.builder()
+                .reviewTime(time)
+                .operatingTime(LocalDateTime.now())
+                .build());
+        return rateRepo.save(rate);
+    }
 }
 

src/main/vue/src/views/RateList.vue

@@ -166,7 +166,7 @@
                 >
                     <el-option v-for="item in dismissReason" :key="item" :label="item" :value="item"> </el-option>
                 </el-select>
-                <div>
+                <div style="margin-top: 15px">
                     <el-button type="primary">确认</el-button>
                 </div>
             </div>

src/test/java/com/izouma/wenlvju/web/RateControllerTest.java

@@ -5,6 +5,8 @@ import com.izouma.wenlvju.ApplicationTests;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.time.LocalDateTime;
+
 public class RateControllerTest extends ApplicationTests {
     @Autowired
     private RateController rateController;
@@ -14,4 +16,9 @@ public class RateControllerTest extends ApplicationTests {
         System.out.println(rateController.get1(162L));
     }
 
+    @Test
+    public void test1(){
+        rateController.saveReviewTime(162L, LocalDateTime.now());
+    }
+
 }