接口134

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

@@ -141,8 +141,8 @@ public class BillSubsidyController {
     public void print(HttpServletResponse response, HttpServletRequest httpServletRequest,@RequestParam(name = "id", required = true) Integer id) throws Exception {
 //        Integer id=Integer.parseInt(parasMap.get("id"));
         BillSubsidy subsidy = subsidyService.getById(id);
-        Print print = new Print();
-        String path = print.print(subsidy);
+        Print.print(subsidy);
+        String path = "/opt/subsidy/order_contract.xls";
 
         //加载Excel文档
         Workbook wb = new Workbook();
@@ -151,6 +151,10 @@ public class BillSubsidyController {
         //调用方法保存为PDF格式
        String pdfPath =   "/opt/subsidy/"+subsidy.getFarmerName()+".pdf";
         wb.saveToFile(pdfPath, FileFormat.PDF);
+//        wb.getConverterSetting().setSheetFitToPage(true);
+//        OutputStream outputStream = null;
+//        wb.saveToStream(outputStream);
+
         PdfUtil.returnPdfStream2(response,pdfPath,subsidy.getFarmerName());
         //文件删除 TODO
 //        File file = new File("G://"+subsidy.getFarmerName() + ".pdf");

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

@@ -138,16 +138,16 @@ public class SysUserController {
 
 
     @PostMapping(value = "/add")
-    public Result add(HttpServletRequest req,@RequestParam("idCordFrontUrl") MultipartFile idCordFrontUrl,
+    public Result add(HttpServletRequest req,@RequestParam(name = "idCordFrontUrl" ,required=false) MultipartFile idCordFrontUrl,
                       @RequestParam("idCordBackUrl") MultipartFile idCordBackUrl,
                       @RequestParam("type") String type,
                       @RequestParam("userName") String userName,
                       @RequestParam("idCord") String idCord,
                       @RequestParam("phone") String phone,
-                      @RequestParam("farmName") String farmName,
-                      @RequestParam("veterId") String veterId,
-                      @RequestParam("detailedAdressCode") String detailedAdressCode,
-                      @RequestParam("permitImg") MultipartFile permitImg) throws UnsupportedEncodingException {
+                      @RequestParam(name = "farmName",required = false) String farmName,
+                      @RequestParam(name = "veterId",required = false) String veterId,
+                      @RequestParam(name = "detailedAdressCode",required = false) String detailedAdressCode
+    ) throws UnsupportedEncodingException {
         req.setCharacterEncoding("UTF-8");
         System.out.println(userName);
         String imgname = "成功";
@@ -215,11 +215,16 @@ public class SysUserController {
             accessToken.setLoginIp(user.getLastIp());
             accessToken.setType(user.getUserType());
             accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId()));
+            accessToken.setPhone(user.getPhone());
+            accessToken.setUser(user);
+            accessToken.setUserName(user.getUserName());
+            accessToken.setUserId(user.getId());
+            accessToken.setMessage(result.getMessage());
             return new Result(ResultCode.SUCCESS, accessToken);
-        } else if (result.getCode() == 10002) {
-            return new Result(10002, "待审核",false);
+        } else if (result.getCode() == 10004) {
+            return new Result(10004, "待审核",false);
         } else {
-            return new Result(10001, "用户已实名",false);
+            return iSysUserService.add(req,map);
         }
     }
 

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

@@ -148,7 +148,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         billSubsidy.setSubsidySch(3);
         billSubsidy.setIsPay(2);
         subsidyMapper.updateById(billSubsidy);
-        return new Result(ResultCode.SUCCESS);
+        return new Result(ResultCode.SUCCESS,subsidyMapper.selectById(id));
     }
 
     @Override

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.orderByDesc("accept_time");
+            queryWrapper.orderByDesc("create_time");
         } else if (Integer.parseInt(type) == 1) {
-            queryWrapper.eq("subsidy_sch", 0).orderByDesc("accept_time");
+            queryWrapper.eq("subsidy_sch", 0).orderByDesc("create_time");
         } else if (Integer.parseInt(type) == 2) {
-            queryWrapper.eq("subsidy_sch", 1).orderByDesc("accept_time");
+            queryWrapper.eq("subsidy_sch", 1).orderByDesc("create_time");
         } else {
-            queryWrapper.ge("subsidy_sch", 2).orderByDesc("accept_time");
+            queryWrapper.ge("subsidy_sch", 2).orderByDesc("create_time");
         }
         Page<BillSubsidy> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
 //        List<BillSubsidy> billSubsidies = subsidyMapper.selectList(queryWrapper);

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

@@ -61,7 +61,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (sysUser.getAccoutType() == 1) {
                 return new Result(ResultCode.SUCCESS, sysUser);
             }else {
-                return new Result(10001, "未审核或者账号异常！", false);
+                return new Result(10002, "未审核或者账号异常！", false);
             }
         }
     }
@@ -182,7 +182,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             } else {
                 user.setFarmType(0);
             }
-            user.setDetailedAdress(paramsMap.get("address"));
+            user.setDetailedAdress(paramsMap.get("detailedAdressCode"));
             user.setFarmName(paramsMap.get("farmName"));
         }
         if (Integer.parseInt(paramsMap.get("type")) == 2 ||Integer.parseInt(paramsMap.get("type")) == 3) {

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

@@ -19,7 +19,7 @@ public class Print {
      * @throws Exception
      * @return
      */
-    public  String print(BillSubsidy subsidy) throws Exception {
+    public  static void print(BillSubsidy subsidy) throws Exception {
         //准备数据
         String path ="/opt/subsidy/order_contract.xls";
         //获取模板文件，你自己当前模板的位置  我这里为当前项目下
@@ -52,7 +52,7 @@ public class Print {
         //生成
         JxlsHelper.getInstance().processTemplate(is, os, context);
 //        String path = String.valueOf(os);
-        return path;
+
     }