523096025 2 years ago
parent
commit
c3cbc459c8

+ 6 - 1
admin/pom.xml

@@ -144,8 +144,13 @@
         <dependency>
             <groupId>e-iceblue</groupId>
             <artifactId>spire.xls.free</artifactId>
-            <version>2.2.0</version>
+            <version>3.9.1</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>e-iceblue</groupId>-->
+<!--            <artifactId>spire.xls</artifactId>-->
+<!--            <version>13.3.1</version>-->
+<!--        </dependency>-->
 
     </dependencies>
 

+ 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/*","/bill-subsidy/print");
+                excludePathPatterns("/sys-user/*","/bill-subsidy/print","/bill-subsidy/printPay");
     }
 }
 

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

@@ -182,8 +182,15 @@ public class BillSubsidyController {
     }
 
 
-    @PostMapping("/printPay")
+    @PostMapping("/printPay2")
     public Result printPay(HttpServletResponse response,@RequestBody Map<String, String> paramsMap ) throws IOException {
       return subsidyService.printPay(response,paramsMap);
     }
+
+    @GetMapping("/printPay")
+    public void printPay2(HttpServletResponse response,@RequestParam(name = "startDate", required = false) String startDate,
+                          @RequestParam(name = "endDate", required = true) String endDate
+                          ) throws IOException {
+        subsidyService.printPay2(response, startDate, endDate);
+    }
 }

+ 2 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillSubsidyService.java

@@ -46,4 +46,6 @@ public interface IBillSubsidyService extends IService<BillSubsidy> {
     Result listFlow(Map<String, String> parasMap);
 
     Result printPay(HttpServletResponse response, Map<String, String> paramsMap) throws IOException;
+
+    void printPay2(HttpServletResponse response,String startDate,String endDate) throws IOException;
 }

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

@@ -549,7 +549,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         return new Result(ResultCode.SUCCESS,result);
     }
 
-    //打印待支付的  TODO 05-09
+    //打印待支付的
     @Override
     public Result printPay(HttpServletResponse response, Map<String, String> paramsMap) throws IOException {
         String ids = paramsMap.get("ids");
@@ -604,4 +604,45 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         }
         return null;
     }
+    @Override
+    public void printPay2(HttpServletResponse response, String startDate,String endDate) throws IOException {
+
+        QueryWrapper<BillSubsidy> wrapper = new QueryWrapper<>();
+        if (StringUtils.isBlank(startDate)){
+            Date date = new Date();
+            startDate = DateUtil.format(date, "yyyy-MM-dd");
+            wrapper.ge("create_time",startDate);
+        }
+        if (StringUtils.isNotBlank(endDate)){
+            String endTime = endDate +" 23:59:59";
+            wrapper.le("create_time",endTime);
+        }
+
+        wrapper.eq("is_pay",1);
+        wrapper.eq("subsidy_sch",3);
+        List<BillSubsidy> billSubsidies = subsidyMapper.selectList(wrapper);
+        ExcelWriter writer = ExcelUtil.getWriter();
+        ServletOutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+
+            writer.merge(5,startDate +"-"+endDate +"  待支付名单");
+            writer.write(billSubsidies,true);
+            writer.addHeaderAlias("farmerName","姓名");
+            writer.addHeaderAlias("bankCardId","卡号");
+            writer.addHeaderAlias("idCard","身份证");
+            writer.addHeaderAlias("bankName","开户行");
+            writer.addHeaderAlias("phone","手机号");
+            writer.addHeaderAlias("createTime","提交时间");
+            writer.addHeaderAlias("applyMoney","申报金额");
+
+            writer.flush(outputStream);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            writer.close();
+            outputStream.close();
+        }
+    }
 }