打印修改

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

@@ -156,16 +156,16 @@ public class BillSubsidyController {
         str = "hm:" + str;
         String encode = Base64.getEncoder().encodeToString(str.getBytes());
         System.out.println(encode);
-        codeExcelPrinter.test(encode);
-        Print.print(subsidy);
-        String path = "/opt/subsidy/order_contract.xls";
+        codeExcelPrinter.test("124");
+        Print.print();
+        String path = "G://order_contract.xls";
 
         //加载Excel文档
         Workbook wb = new Workbook();
         wb.loadFromFile(path);
         Worksheet sheet = wb.getWorksheets().get(0);
         //添加图片
-        ExcelPicture picture = sheet.getPictures().add(37, 10, "/opt/subsidy/a.png");
+        ExcelPicture picture = sheet.getPictures().add(1, 10, "/opt/subsidy/a.png");
         picture.setHeight(70);//设置图片高度
         picture.setWidth(75);//设置图片宽度
 
@@ -176,13 +176,13 @@ public class BillSubsidyController {
         worksheet.getRange().get("C18").getStyle().setWrapText(true);//耳标号
 
         //调用方法保存为PDF格式
-        String pdfPath = "/opt/subsidy/" + subsidy.getFarmerName() + ".pdf";
+        String pdfPath = "G://" +subsidy.getSubsidyName() + ".pdf";
         wb.saveToFile(pdfPath, FileFormat.PDF);
         wb.dispose();
 
 
-        PdfUtil.returnPdfStream2(response, pdfPath, subsidy.getFarmerName());
-        //文件删除 TODO
+        PdfUtil.returnPdfStream2(response, pdfPath, subsidy.getSubsidyName());
+//        文件删除 TODO
         File file = new File(pdfPath);
 //
         FileUtils.forceDelete(file);

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

@@ -127,7 +127,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             }
             billSubsidy.setRefuseReason(refuseReason);
             billSubsidy.setSubsidySch(2);
-            billSubsidy.setReviewedDepart("乡镇专干");
+            billSubsidy.setReviewedDepart(TokenSign.getUserName(httpServletRequest));
             billSubsidy.setAcceptTime(new Date());
             subsidyMapper.updateById(billSubsidy);
             return new Result(ResultCode.SUCCESS, billSubsidy);
@@ -137,7 +137,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
             billSubsidy.setSubsidySch(1);
             billSubsidy.setAcceptTime(new Date());
-            billSubsidy.setReviewedDepart("乡镇专干");
+            billSubsidy.setReviewedDepart(TokenSign.getUserName(httpServletRequest));
             subsidyMapper.updateById(billSubsidy);
             return new Result(ResultCode.SUCCESS, billSubsidy);
         }
@@ -164,7 +164,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             billSubsidy.setRejectReason(rejectReason);
             billSubsidy.setWorkAccptUrl(workAccptUrl);
             billSubsidy.setAcceptTime(new Date());
-            billSubsidy.setReviewedDepart("乡镇专干");
+            billSubsidy.setReviewedDepart(TokenSign.getUserName(httpServletRequest));
             QueryWrapper<BaseAnimal> animalQueryWrapper = new QueryWrapper<>();
             animalQueryWrapper.eq("inspection_num", billSubsidy.getInspectionNum());
             List<BaseAnimal> baseAnimals = animalMapper.selectList(animalQueryWrapper);
@@ -185,7 +185,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 billSubsidy.setIsPay(1);
             }
             billSubsidy.setReviewedTime(new Date());
-            billSubsidy.setReviewedDepart("乡镇专干");
+            billSubsidy.setReviewedDepart(TokenSign.getUserName(httpServletRequest));
             subsidyMapper.updateById(billSubsidy);
             return new Result(ResultCode.SUCCESS, billSubsidy);
         }

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

@@ -19,7 +19,7 @@ public class Print {
      * @throws Exception
      * @return
      */
-    public  static void print(BillSubsidy subsidy) throws Exception {
+    public  static void print() throws Exception {
         //准备数据
         //
         String path ="/opt/subsidy/order_contract.xls";
@@ -36,18 +36,15 @@ public class Print {
         //绑定数据
         Context context = new Context();
         //涉及太多只写了一个单独的
-        context.putVar("userName", subsidy.getFarmerName());
+     /*   context.putVar("userName", subsidy.getFarmerName());
 //        context.putVar("orderTime", new Date());
         context.putVar("address",subsidy.getCargoOwnedetailedAdressr());
         if (subsidy.getFarmerType() == 0) {
-            context.putVar("type","动态监测对象");
-        } else if (subsidy.getFarmerType() == 1) {
-            context.putVar("type","已脱贫");
+            context.putVar("type","动态动态监测对象");
         } else {
-            context.putVar("type","其他养殖场（户）");
+            context.putVar("type", "已脱贫及其他养殖户");
         }
 
-
         context.putVar("farmName",subsidy.getFarmName());
         context.putVar("idCard",subsidy.getIdCard());
         context.putVar("phone", subsidy.getPhone());
@@ -77,7 +74,7 @@ public class Print {
         context.putVar("earNum", subsidy.getEartagNo());
         context.putVar("money", subsidy.getApplyMoney());
         context.putVar("userNum", subsidy.getBankCardId());
-
+*/
         //生成
         JxlsHelper.getInstance().processTemplate(is, os, context);
 //        String path = String.valueOf(os);