导出

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

@@ -13,7 +13,7 @@ import java.time.LocalDate;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel("监管管理")
+@ApiModel("备案管理")
 public class RecordDTO {
     @ApiModelProperty(value = "考级活动名称")
     private String examinationName;

src/main/java/com/izouma/wenlvju/repo/RecordSpecialtyRepo.java

@@ -7,10 +7,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface RecordSpecialtyRepo extends JpaRepository<RecordSpecialty, Long>, JpaSpecificationExecutor<RecordSpecialty> {
     @Query("update RecordSpecialty t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<RecordSpecialty> findAllByRecordIdIn(Iterable<Long> recordId);
 }

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

@@ -1,13 +1,13 @@
 package com.izouma.wenlvju.service;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.izouma.wenlvju.domain.Record;
+import com.izouma.wenlvju.domain.RecordSpecialty;
 import com.izouma.wenlvju.dto.PageQuery;
-import com.izouma.wenlvju.dto.RecordExcelDTO;
-import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.RecordRepo;
+import com.izouma.wenlvju.repo.RecordSpecialtyRepo;
 import com.izouma.wenlvju.utils.JpaUtils;
 import jodd.util.StringUtil;
 import lombok.AllArgsConstructor;
@@ -15,16 +15,19 @@ import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.Predicate;
+import java.io.IOException;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
 public class RecordService {
 
-    private RecordRepo recordRepo;
+    private RecordRepo          recordRepo;
+    private RecordSpecialtyRepo recordSpecialtyRepo;
 
     public Page<Record> all(PageQuery pageQuery) {
         return recordRepo.findAll(JpaUtils.toSpecification(pageQuery, Record.class), JpaUtils.toPageRequest(pageQuery));
@@ -51,17 +54,11 @@ public class RecordService {
         }, JpaUtils.toPageRequest(pageQuery));
     }
 
-    public Record addSupervisor(Long id, Long userId) {
-//        Record record = recordRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-//        record.setSupervisorUserId(userId);
-//        return recordRepo.save(record);
-        return null;
-    }
 
     /*
     展示今天的所有备案
      */
-    public List<Record> byToday( String district){
+    public List<Record> byToday(String district) {
         LocalDate now = LocalDate.now();
         return recordRepo.findAll((root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> and = new ArrayList<>();
@@ -73,4 +70,18 @@ public class RecordService {
             return criteriaBuilder.and(and.toArray(new Predicate[0]));
         });
     }
+
+    /*
+    导出
+     */
+    public void excel(List<Record> data) throws IOException {
+        List<Long> ids = data.stream().map(Record::getId).collect(Collectors.toList());
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        List<RecordSpecialty> specialties = recordSpecialtyRepo.findAllByRecordIdIn(ids);
+
+    }
+
+
 }

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

@@ -11,7 +11,6 @@ import com.izouma.wenlvju.repo.UserRepo;
 import com.izouma.wenlvju.security.Authority;
 import com.izouma.wenlvju.service.RecordService;
 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;
@@ -83,12 +82,6 @@ public class RecordController extends BaseController {
         return recordRepo.save(record);
     }
 
-    @ApiOperation("增加监管人")
-    @PostMapping("/addSupervisor")
-    public Record addSupervisor(@RequestParam Long id, @RequestParam Long userId) {
-        return recordService.addSupervisor(id, userId);
-    }
-
     @PostMapping("/allDTO")
     public Page<Record> allDTO(@RequestBody PageQuery pageQuery) {
         Map<Long, String> userMap = userRepo.findAllByAuthoritiesContainsAndDelFalse(Authority.get(AuthorityName.ROLE_SUPERVISOR))