|
|
@@ -3,8 +3,12 @@ package com.izouma.yzzscq.service.supply;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+import com.izouma.yzzscq.domain.Information;
|
|
|
+import com.izouma.yzzscq.domain.Setting;
|
|
|
import com.izouma.yzzscq.domain.supply.TechnicalManager;
|
|
|
import com.izouma.yzzscq.dto.PageQuery;
|
|
|
+import com.izouma.yzzscq.enums.ApplyStatus;
|
|
|
+import com.izouma.yzzscq.exception.BusinessException;
|
|
|
import com.izouma.yzzscq.repo.InformationRepo;
|
|
|
import com.izouma.yzzscq.repo.SettingRepo;
|
|
|
import com.izouma.yzzscq.repo.supply.TechnicalManagerRepo;
|
|
|
@@ -12,9 +16,11 @@ import com.izouma.yzzscq.utils.JpaUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.PageRequest;
|
|
|
+import org.springframework.data.domain.Pageable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.persistence.criteria.Expression;
|
|
|
+import javax.persistence.criteria.Predicate;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -110,9 +116,9 @@ public class TechnicalManagerService {
|
|
|
TechnicalManager record = technicalManagerRepo.findById(id).orElseThrow(new BusinessException("无记录"));
|
|
|
|
|
|
Information information = Information.builder()
|
|
|
- .receiveUserId(record.getUserId())
|
|
|
- .isRead(false)
|
|
|
- .build();
|
|
|
+ .receiveUserId(record.getUserId())
|
|
|
+ .isRead(false)
|
|
|
+ .build();
|
|
|
|
|
|
if (pass) {
|
|
|
record.setStatus(ApplyStatus.PASS);
|