Merge remote-tracking branch 'origin/master'

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) {

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");
     }
 }
 

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);
     }
 }

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);
@@ -199,6 +199,9 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if(!(BankUtil.checkBankCard(bankCardId))){
             return new Result(10001,"银行卡号不符合标准!",false);
         }
+        if (ObjectUtil.isEmpty(BankUtil.getname(bankCardId))){
+            return new Result(10001,"补贴账号有误,请检查!",false);
+        }
         for (String eartag : eartags) {
             if (!eartag.contains("-")){
                 BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartag));
@@ -408,7 +411,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             addApplication.setTime(billSubsidy.getCreateTime());
             result.add(addApplication);
 
-            BaseApplication lastApplication = new BaseApplication();
+            RejectApplication lastApplication = new RejectApplication();
+            lastApplication.setStatus(true);
             lastApplication.setTitle("待受理");
             result.add(lastApplication);
         }else if (billSubsidy.getSubsidySch() == 1){
@@ -426,7 +430,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             receiveApplication.setTime(billSubsidy.getAcceptTime());
             result.add(receiveApplication);
 
-            BaseApplication lastApplication = new BaseApplication();
+            RejectApplication lastApplication = new RejectApplication();
+            lastApplication.setStatus(true);
             lastApplication.setTitle("审核中");
             result.add(lastApplication);
         }else if (billSubsidy.getSubsidySch() == 2){
@@ -436,7 +441,6 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             addApplication.setStatus(true);
             addApplication.setTime(billSubsidy.getCreateTime());
             result.add(addApplication);
-
             RejectApplication rejectApplication = new RejectApplication();
             rejectApplication.setTitle("已拒绝");
             rejectApplication.setStatus(false);
@@ -479,6 +483,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             }else {
                 RejectApplication lastApplication = new RejectApplication();
                 lastApplication.setTitle("待支付");
+                lastApplication.setReason("");
+                lastApplication.setStatus(true);
                 result.add(lastApplication);
             }
         }else if (billSubsidy.getSubsidySch() == 4){
@@ -531,8 +537,10 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             appealApplication.setReason("申诉内容描述: "+billSubsidy.getAppeal());
             result.add(appealApplication);
 
-            BaseApplication lastApplication = new BaseApplication();
+            RejectApplication lastApplication = new RejectApplication();
             lastApplication.setTitle("待受理");
+            lastApplication.setStatus(true);
+            lastApplication.setReason("");
             result.add(lastApplication);
         }
         return new Result(ResultCode.SUCCESS,result);