原gitlab中LaboratoryRiskManageServer
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
heheng
2025-01-13 a27162cb82ef0cabf9b43cbfd1f3eb8c177d1e14 
 src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/OldRiskAssessServiceImpl.java


@@ -3,6 +3,7 @@


import com.gkhy.labRiskManage.api.controller.basic.dto.repDto.OldRiskAssessQueryReqBO;


import com.gkhy.labRiskManage.api.controller.basic.dto.respDto.OldRiskAssessExportRespDTO;


import com.gkhy.labRiskManage.api.controller.basic.dto.respDto.OldRiskAssessQueryRespDTO;


import com.gkhy.labRiskManage.api.controller.basic.dto.respDto.OldRiskAssessResDTO;


import com.gkhy.labRiskManage.commons.domain.Result;


import com.gkhy.labRiskManage.commons.domain.SearchResult;


import com.gkhy.labRiskManage.commons.enums.ResultCode;


@@ -15,7 +16,6 @@


import com.gkhy.labRiskManage.domain.basic.repository.jpa.OldRiskAssessRepository;


import com.gkhy.labRiskManage.domain.basic.service.OldRiskAssessService;


import org.apache.poi.hssf.usermodel.*;


import org.apache.poi.ss.usermodel.*;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.data.domain.Page;


import org.springframework.data.domain.PageRequest;


@@ -23,7 +23,6 @@


import org.springframework.data.jpa.domain.Specification;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.Base64Utils;


import org.springframework.util.ObjectUtils;


import org.springframework.web.multipart.MultipartFile;




@@ -31,14 +30,9 @@


import javax.persistence.criteria.CriteriaQuery;


import javax.persistence.criteria.Predicate;


import javax.persistence.criteria.Root;


import javax.servlet.ServletOutputStream;


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;


import java.io.File;


import java.io.FileOutputStream;


import java.io.IOException;


import java.io.OutputStream;


import java.net.URLEncoder;


import java.text.NumberFormat;


import java.time.LocalDateTime;


import java.util.ArrayList;


@@ -454,6 +448,33 @@


    }




    @Override


    public List<OldRiskAssessResDTO> getOldRiskAssessListByRegion(List<String> region) {




        Specification<OldRiskAssess> specification = new Specification<OldRiskAssess>() {


            @Override


            public Predicate toPredicate(Root<OldRiskAssess> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {


                query.orderBy(criteriaBuilder.asc(root.get("region")));


                List<Predicate> predicateList = new ArrayList<>();


                predicateList.add(criteriaBuilder.in(root.get("region")).value(region));




                predicateList.add(criteriaBuilder.equal(root.get("deleteStatus"),StatusEnum.DELETE_NOT.getCode()));


                //返回组装的条件


                return criteriaBuilder.and(predicateList.toArray(predicateList.toArray(new Predicate[0])));


            }


        };




        List<OldRiskAssess> all = repository.findAll(specification);


        if (ObjectUtils.isEmpty(all)){


            return null;


        }


        List<OldRiskAssessResDTO> oldRiskAssessResDTOS = BeanCopyUtils.copyBeanList(all, OldRiskAssessResDTO.class);


        oldRiskAssessResDTOS.forEach(oldRiskAssessResDTO -> {


            oldRiskAssessResDTO.setSort(oldRiskAssessResDTOS.indexOf(oldRiskAssessResDTO) + 1);


        });


        return oldRiskAssessResDTOS;


    }




    @Override


    public SearchResult<OldRiskAssessQueryRespDTO> getOldRiskAssessPage(Long currentUserId, OldRiskAssessQueryReqBO queryReqDO) {




        //校验参数