yxm
2024-07-01 fc2adc3521931c2f7bc5b2f3a3d94ebf407828d6
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) {