wwh 2 tahun lalu
induk
melakukan
dfe7d9b969

+ 1 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/PdfUtil.java

@@ -50,6 +50,7 @@ public class PdfUtil {
             response.setHeader("Content-disposition", "attachment; filename=" + filename);// 组装附件名称和格式
             IoUtil.copy(in, response.getOutputStream());
         } catch (Exception e) {
+            System.out.println("------------ 这里除了问题!!!-----------");
             System.out.println(e);
         }finally {
             if (in != null) {

+ 1 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/config/InterceptorConfig.java

@@ -17,7 +17,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/sys-user/*");
+                excludePathPatterns("/sys-user/*","/bill-subsidy/print");
     }
 }
 

+ 4 - 4
admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillSubsidyController.java

@@ -156,9 +156,9 @@ public class BillSubsidyController {
 //        File file = new File("G://"+subsidy.getFarmerName() + ".pdf");
 //
 //        FileUtils.forceDelete(file);
-        Path path1 = Paths.get("/opt/subsidy"+subsidy.getFarmerName()+".pdf");
-        Files.delete(path1);
-        Path path2 = Paths.get("/opt/subsidy"+"order_contract"+".xls");
-        Files.delete(path2);
+//        Path path1 = Paths.get("/opt/subsidy/"+subsidy.getFarmerName()+".pdf");
+//        Files.delete(path1);
+//        Path path2 = Paths.get("/opt/subsidy/"+"order_contract"+".xls");
+//        Files.delete(path2);
     }
 }

+ 4 - 4
admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -63,13 +63,13 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 
         QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
         if (type == null || type == "") {
-            queryWrapper.orderByAsc("accept_time");
+            queryWrapper.orderByDesc("accept_time");
         } else if (Integer.parseInt(type) == 1) {
-            queryWrapper.eq("subsidy_sch", 0).orderByAsc("accept_time");
+            queryWrapper.eq("subsidy_sch", 0).orderByDesc("accept_time");
         } else if (Integer.parseInt(type) == 2) {
-            queryWrapper.eq("subsidy_sch", 1).orderByAsc("accept_time");
+            queryWrapper.eq("subsidy_sch", 1).orderByDesc("accept_time");
         } else {
-            queryWrapper.ge("subsidy_sch", 2).orderByAsc("accept_time");
+            queryWrapper.ge("subsidy_sch", 2).orderByDesc("accept_time");
         }
         Page<BillSubsidy> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
 //        List<BillSubsidy> billSubsidies = subsidyMapper.selectList(queryWrapper);