打印修

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

@@ -174,6 +174,8 @@ public class BillSubsidyController {
         worksheet.getRange().get("E3").getStyle().setWrapText(true);//地址自动换行
         worksheet.getRange().get("C3").getStyle().setWrapText(true);//名字自动换行
         worksheet.getRange().get("C18").getStyle().setWrapText(true);//耳标号
+        worksheet.getRange().get("E20").getStyle().setWrapText(true);//开户行
+        worksheet.getRange().get("H20").getStyle().setWrapText(true);//银行卡号
 
         //调用方法保存为PDF格式
         String pdfPath = "/opt/subsidy/" +subsidy.getSubsidyName() + ".pdf";
@@ -190,13 +192,20 @@ public class BillSubsidyController {
     }
 
     @PostMapping("/QRCode")
-    public Result QrCode(@RequestBody Map<String, String> paramsMap) {
+    public Result QrCode(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
         BillSubsidy subsidy = subsidyService.getById(id);
         if (ObjectUtil.isEmpty(subsidy)) {
             return new Result(10001, "订单编号错误！！", false);
-        } else {
-            return new Result(ResultCode.SUCCESS,subsidy);
+        }else {
+            String addressCode = TokenSign.getAddressCode(httpServletRequest);
+            String detailedAdressCode = subsidy.getDetailedAdressCode();
+            String[] split = detailedAdressCode.split(",");
+            if (addressCode.equals(split[2])) {
+                return new Result(ResultCode.SUCCESS, subsidy);
+            }else {
+                return new Result(10003, "该订单与您所在乡镇不符！！！", false);
+            }
         }
     }
 

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

@@ -73,6 +73,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         }
 
         QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like("brief_address_code", TokenSign.getAddressCode(httpServletRequest));
         if (type == null || type == "") {
             queryWrapper.orderByDesc("create_time");
         } else if (Integer.parseInt(type) == 1) {

admin/src/main/java/com/huimv/farm/test/Print.java

@@ -66,7 +66,7 @@ public class Print {
         }
 
 
-
+        context.putVar("bankName",subsidy.getBankName());
         context.putVar("num3", subsidy.getRewardNum());
         context.putVar("context1", subsidy.getRewardLastYear());
         context.putVar("card", subsidy.getInspectionNum());