水库堤防白蚁普查资料当前页压缩导出新增条件优化v20240701

yxm

2024-07-01 fc2adc3521931c2f7bc5b2f3a3d94ebf407828d6

水库堤防白蚁普查资料当前页压缩导出新增条件优化v20240701

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java

@@ -11,6 +11,7 @@
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.DyketionVO;
import cn.gistack.sm.sjztmd.vo.TbDykeInvestigationParam;
import cn.gistack.sm.sjztmd.vo.TbResDykeVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@@ -147,9 +148,9 @@

    @GetMapping("/downloadZipCopy")
    @ApiOperation(value = "批量导出白蚁普查的图片视频zip文件")
    public R downloadZipCopy(Query query,String type)  {
    public R downloadZipCopy(Query query, String type,TbResDykeVO tbResDykeVO)  {

        List<DyketionVO> msg = tbDykeInvestigationService.downloadZipCopy(Condition.getPage(query),type);
        List<DyketionVO> msg = tbDykeInvestigationService.downloadZipCopy(Condition.getPage(query),type,tbResDykeVO);

        return  R.data(msg);
    }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java

@@ -149,9 +149,9 @@

    @GetMapping("/downloadZipCopy")
    @ApiOperation(value = "批量导出白蚁普查的图片视频zip文件")
    public R downloadZipCopy(Query query,String type){
    public R downloadZipCopy(Query query,String type,AttResBaseGeneralInvestigationVO attResBase){

        List<ResGentionVO> msg = tbResGeneralInvestigationService.downZipCopy(Condition.getPage(query),type);
        List<ResGentionVO> msg = tbResGeneralInvestigationService.downZipCopy(Condition.getPage(query),type,attResBase);

        return  R.data(msg);
    }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbDykeInvestigationService.java

@@ -52,5 +52,5 @@

    List<StatisticsBar> statisticsBar(StatisticsParams statisticsParams);

    List<DyketionVO> downloadZipCopy(IPage<TbResDykeVO> page, String type);
    List<DyketionVO> downloadZipCopy(IPage<TbResDykeVO> page, String type,TbResDykeVO tbResDykeVO);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResGeneralInvestigationService.java

@@ -50,5 +50,5 @@

    List<String> downZip(IPage<ImageAndVideoVO> page,String type) throws IOException;

    List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type);
    List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type,AttResBaseGeneralInvestigationVO attResBase);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java

@@ -278,7 +278,7 @@
        }

    @Override
    public List<DyketionVO> downloadZipCopy(IPage<TbResDykeVO> page,String type) {
    public List<DyketionVO> downloadZipCopy(IPage<TbResDykeVO> page,String type,TbResDykeVO tbResDykeVO) {
        //获取已审批的数据
        List<DyketionVO> iamgeAndVideoUrlcopy = baseMapper.getIamgeAndVideoUrlcopy();

@@ -308,8 +308,8 @@
        //分页情况下
        if(type.equals("1")){
            //获取分页信息
            TbResDykeVO tbResDykeVO = new TbResDykeVO();
            tbResDykeVO.setTbYear(2024);
//            TbResDykeVO tbResDykeVO = new TbResDykeVO();
//            tbResDykeVO.setTbYear(2024);
            List<TbResDykeVO> tbResDykeVOIPage = tbResDykeMapper.findTbResDykePcBy(page, tbResDykeVO);

            List<String> dykeCode = new ArrayList<>();

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java

@@ -211,7 +211,7 @@
    }

    @Override
    public List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type) {
    public List<ResGentionVO> downZipCopy(IPage<AttResBaseGeneralInvestigationVO> page,String type,AttResBaseGeneralInvestigationVO attResBase) {
        //获取已审批的数据
        List<ResGentionVO> iamgeAndVideoUrlcopy = baseMapper.getIamgeAndVideoUrlcopy();

@@ -239,9 +239,9 @@
        //分页情况下
        if(type.equals("1")){
            //获取分页信息
            AttResBaseGeneralInvestigationVO attResBaseGeneralInvestigationVO = new AttResBaseGeneralInvestigationVO();
            attResBaseGeneralInvestigationVO.setTbYear(2024);
            List<AttResBaseGeneralInvestigationVO> attResBaseGeneralInvestigationVOS = attResBaseMapper.selectAttResBaseGeneralInvestigation(page, attResBaseGeneralInvestigationVO);
//            AttResBaseGeneralInvestigationVO attResBaseGeneralInvestigationVO = new AttResBaseGeneralInvestigationVO();
//            attResBaseGeneralInvestigationVO.setTbYear(2024);
            List<AttResBaseGeneralInvestigationVO> attResBaseGeneralInvestigationVOS = attResBaseMapper.selectAttResBaseGeneralInvestigation(page, attResBase);

            List<String> resCode = new ArrayList<>();
            for (AttResBaseGeneralInvestigationVO imageAndVideoVO : attResBaseGeneralInvestigationVOS) {