打印统计表111

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/PdfUtil.java

@@ -59,6 +59,25 @@ public class PdfUtil {
         }
     }
 
+    public static void returnPdfStream3(HttpServletResponse response, String pathName, String subsidyNane) throws Exception {
+        InputStream in = null;
+        try {
+            File file = new File(pathName);
+            in = new BufferedInputStream(new FileInputStream(file));
+            String filename = new String((subsidyNane+".xls").getBytes(), "ISO8859_1");
+            response.setContentType("application/binary;charset=ISO8859_1");
+            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) {
+                in.close();
+            }
+        }
+    }
+
     /**
      * 返回水印图片路径
      *

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

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

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

@@ -229,7 +229,7 @@ public class BillSubsidyController {
                 map.put("code", "1");
                 iBillSubsidyService.printAmount(response, map);
                 String path = "/opt/subsidy/xian.xls";
-                PdfUtil.returnPdfStream2(response, path, "县阶段性统计表");
+                PdfUtil.returnPdfStream3(response, path, "县阶段性统计表");
             } else {
                 //打印镇
                 Map<String, String> map = new HashMap<>();
@@ -238,20 +238,20 @@ public class BillSubsidyController {
                 map.put("code", country);
                 iBillSubsidyService.printAmount(response, map);
                 String path = "/opt/subsidy/amount.xls";
-                PdfUtil.returnPdfStream2(response, path, "镇阶段性统计表");
+                PdfUtil.returnPdfStream3(response, path, "镇阶段性统计表");
             }
 
         } else {
             //专干
             SysUser user = iSysUserService.getById(id);
-            country = user.getDetailedAdressCode();//镇的编码
+            country = user.getBriefAddressCode();//镇的编码
             Map<String, String> map = new HashMap<>();
             map.put("start", startDate);
             map.put("end", endDate);
             map.put("code", country);
             iBillSubsidyService.printAmount(response, map);
             String path = "/opt/subsidy/amount.xls";
-            PdfUtil.returnPdfStream2(response, path, "镇阶段性统计表");
+            PdfUtil.returnPdfStream3(response, path, "镇阶段性统计表");
         }
 
     }
@@ -260,7 +260,7 @@ public class BillSubsidyController {
     @GetMapping("/printWaitPay")
     public void printWaitPay(HttpServletResponse response, @RequestParam(name = "country", required = false) String country
             , @RequestParam(name = "startDate", required = true) String startDate, @RequestParam(name = "endDate", required = true) String endDate,
-                             @RequestParam(name = "id", required = false) String id, @RequestParam(name = "endDate", required = true) Integer type
+                             @RequestParam(name = "id", required = false) Integer id, @RequestParam(name = "endDate", required = false) Integer type
     ) throws Exception {
 
         if (type == 0) {
@@ -271,17 +271,17 @@ public class BillSubsidyController {
             map.put("code", country);
             iBillSubsidyService.printWaitPay(response, map);
             String path = "/opt/subsidy/pay.xls";
-            PdfUtil.returnPdfStream2(response, path, "待支付表");
+            PdfUtil.returnPdfStream3(response, path, "待支付表");
         } else {
             //专干
             SysUser byId = iSysUserService.getById(id);
             Map<String, String> map = new HashMap<>();
             map.put("start", startDate);
             map.put("end", endDate);
-            map.put("code", byId.getDetailedAdressCode());
+            map.put("code", byId.getBriefAddressCode());
             iBillSubsidyService.printWaitPay(response, map);
             String path = "/opt/subsidy/pay.xls";
-            PdfUtil.returnPdfStream2(response, path, "待支付表");
+            PdfUtil.returnPdfStream3(response, path, "待支付表");
         }
 
         //文件删除 TODO

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

@@ -62,7 +62,7 @@ public class SysUserController {
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
             accessToken.setType(user.getUserType());
-            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getDetailedAdressCode(),user.getUserType()));
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getBriefAddressCode(),user.getUserType()));
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
             accessToken.setUserId(user.getId());
@@ -121,7 +121,7 @@ public class SysUserController {
                 accessToken.setAccountName(accountName);
                 accessToken.setCode(result.getCode());
                 accessToken.setMessage(result.getMessage());
-                String token = TokenSign.sign(accountName,accountEntity.getPhone(),accountEntity.getId(),accountEntity.getDetailedAdressCode(),accountEntity.getUserType());
+                String token = TokenSign.sign(accountName,accountEntity.getPhone(),accountEntity.getId(),accountEntity.getBriefAddressCode(),accountEntity.getUserType());
                 accessToken.setToken(token);
 
                 accessToken.setUserName(accountEntity.getUserName());
@@ -220,7 +220,7 @@ public class SysUserController {
             accessToken.setCreated(new Date());
             accessToken.setLoginIp(user.getLastIp());
             accessToken.setType(user.getUserType());
-            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getDetailedAdressCode(),user.getUserType()));
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getBriefAddressCode(),user.getUserType()));
             accessToken.setPhone(user.getPhone());
             accessToken.setUser(user);
             accessToken.setUserName(user.getUserName());
@@ -377,7 +377,7 @@ public class SysUserController {
             AccessToken accessToken = new AccessToken();
             accessToken.setUser(user);
             accessToken.setUserId(user.getId());
-            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(), user.getId(),user.getDetailedAdressCode(),user.getUserType()));
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(), user.getId(),user.getBriefAddressCode(),user.getUserType()));
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
             accessToken.setLoginIp(user.getLastIp());

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

@@ -751,18 +751,18 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         String code = paramsMap.get("code");
         String start = paramsMap.get("start");
         String end = paramsMap.get("end");
-        QueryWrapper<AreaAll> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id", code);
-        AreaAll areaAll = areaAllMapper.selectOne(queryWrapper);//得到乡镇地址
         if ("1".equals(code)) {
             List<BillSubsidyReportVo> billSubsidyReportVos = subsidyMapper.lisTowntReport("621121", start, end);
             try {
-                Print2.print2(billSubsidyReportVos, areaAll.getName(), end);
+                Print2.print2(billSubsidyReportVos, "通渭县", end);
             } catch (Exception e) {
                 System.out.println("打印县阶段统计表出异常！！！");
                 e.printStackTrace();
             }
         } else {
+            QueryWrapper<AreaAll> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("id", code);
+            AreaAll areaAll = areaAllMapper.selectOne(queryWrapper);//得到乡镇地址
             List<BillSubsidyReportVo> billSubsidyReportVos = subsidyMapper.listReport(code, start, end);
             try {
                 Print2.print(billSubsidyReportVos, areaAll.getName(), end);
@@ -812,7 +812,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         }
         if (userType == 4) {
             code = TokenSign.getAddressCode(httpServletRequest);
-            List<BillSubsidyReportVo> billSubsidyReportVos = subsidyMapper.listReport(code, start, end);//县
+            List<BillSubsidyReportVo> billSubsidyReportVos = subsidyMapper.listReport(code, start, end);//镇
             return new Result(ResultCode.SUCCESS, billSubsidyReportVos);
         }
         List<BillSubsidyReportVo> billSubsidyReportVos = subsidyMapper.listReport(code, start, end);

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

@@ -200,16 +200,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setIdCard(paramsMap.get("idCord"));
         user.setPhone(paramsMap.get("phone"));
         user.setAddress(paramsMap.get("address"));
-        user.setDetailedAdress(paramsMap.get("detailedAddress"));
         user.setDetailedAdressCode(paramsMap.get("detailedAdressCode"));
+        user.setDetailedAdress(paramsMap.get("detailedAddress"));
+
         user.setCreateTime(new Date());
+        String s = paramsMap.get("detailedAdressCode");
+        String[] split = s.split(",");
+        user.setBriefAddressCode(split[split.length - 1]);
+
 
-        String code = paramsMap.get("detailedAdressCode");
-        if (code.length() == 9) { //到镇的层次
-           user.setBriefAddressCode(code.substring(6));
-        }else {
-            user.setBriefAddressCode(code.substring(9));
-        }
         if (Integer.parseInt(paramsMap.get("type")) == 1) {
             System.out.println(paramsMap.get("veterId"));
             user.setVeterId((paramsMap.get("veterId")));
@@ -518,4 +517,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         IPage<SysUser> sysUsers = this.page(page,queryWrapper);
         return new Result(ResultCode.SUCCESS,sysUsers);
     }
+
+    public static void main(String[] args) {
+        String s = "6211621121621121101203";
+        if (s.length() == 19) {
+            System.out.println(s.substring(10));
+        } else {
+            System.out.println(s.substring(19));
+        }
+
+    }
 }