打印修改11

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

@@ -156,9 +156,9 @@ public class BillSubsidyController {
         str = "hm:" + str;
         String encode = Base64.getEncoder().encodeToString(str.getBytes());
         System.out.println(encode);
-        codeExcelPrinter.test("124");
-        Print.print();
-        String path = "G://order_contract.xls";
+        codeExcelPrinter.test(encode);
+        Print.print(subsidy);
+        String path = "/opt/subsidy/order_contract.xls";
 
         //加载Excel文档
         Workbook wb = new Workbook();
@@ -176,7 +176,7 @@ public class BillSubsidyController {
         worksheet.getRange().get("C18").getStyle().setWrapText(true);//耳标号
 
         //调用方法保存为PDF格式
-        String pdfPath = "G://" +subsidy.getSubsidyName() + ".pdf";
+        String pdfPath = "/opt/subsidy/" +subsidy.getSubsidyName() + ".pdf";
         wb.saveToFile(pdfPath, FileFormat.PDF);
         wb.dispose();
 

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

@@ -54,7 +54,6 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", buyerPhone));
         BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum));
 
-        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
         int sum = 0;
         int total = Integer.parseInt(num);
 

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

@@ -260,7 +260,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String[] split = s.split(",");
         String s1 = split[split.length - 1];
         user.setBriefAddressCode(s1);
-        AreaAll id = areaAllMapper.selectById(new QueryWrapper<AreaAll>().eq("id", s1));
+        AreaAll id = areaAllMapper.selectOne(new QueryWrapper<AreaAll>().eq("id", s1));
 
         user.setBriefAddress(id.getName());
 
@@ -271,7 +271,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
         user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
-        if ( Integer.parseInt(paramsMap.get("type")) == 3) {
+
+
+        if ( Integer.parseInt(paramsMap.get("type")) == 2||Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("XM", paramsMap.get("userName")).eq("ZJHM", paramsMap.get("idCord"));
             PovertyUserRegist povertyUserRegist = povertyUserRegistMapper.selectOne(queryWrapper);
@@ -284,7 +286,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
             user.setFarmName(paramsMap.get("farmName"));
             user.setAccoutType(1);
-            user.setIsRealName(1);
+
             QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("id_card", paramsMap.get("idCord"));
             SysUser user2 = userMapper.selectOne(queryWrapper1);
@@ -294,14 +296,78 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("phone", paramsMap.get("phone"));
             SysUser sysUser = userMapper.selectOne(queryWrapper2);
-            if (ObjectUtil.isNotEmpty(sysUser)) {
-                return new Result(10001, "", false);
+            if (ObjectUtil.isNotEmpty(sysUser) ) {
+                if (sysUser.getIsRealName() == 1){
+                    return new Result(10001, "用户已存在", false);
+                }else {
+                     /*   if (Integer.parseInt(paramsMap.get("type")) == 2) {
+            user.setUserType(Integer.parseInt(paramsMap.get("type")));
+            user.setUserName(paramsMap.get("userName"));
+            user.setPhone(TokenSign.getPhone(httpServletRequest));
+            user.setAddress(paramsMap.get("address"));
+            user.setDetailedAdress(paramsMap.get("detailedAddress"));
+            user.setDetailedAdressCode(paramsMap.get("detailedAdressCode"));
+            user.setCreateTime(new Date());
+            user.setPermit(paramsMap.get("idCordFrontUrl"));
+            String s = paramsMap.get("detailedAdressCode");
+            String[] split = s.split(",");
+            user.setBriefAddressCode(split[split.length - 1]);
+            user.setAccoutType(1);
+            user.setIsRealName(1);
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("phone",TokenSign.getPhone(httpServletRequest));
+            Integer integer = userMapper.selectCount(queryWrapper);
+            QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("user_name", paramsMap.get("userName"));
+            Integer integer1 = userMapper.selectCount(queryWrapper1);
+            if (integer1 == 0) {
+                if (integer == 0) {
+                    userMapper.insert(user);
+                    return new Result(ResultCode.SUCCESS, user);
+                } else {
+                    return new Result(10001, "该手机号已被其他用户使用！", false);
+                }
+            }else{
+                return new Result(10001, "该企业已存在，请重新注册！", false);
             }
-            if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
-                return new Result(10001, "实名手机号与当前手机号不一致", false);
+        }*/
+                    sysUser.setUserType(Integer.parseInt(paramsMap.get("type")));
+                    sysUser.setUserName(paramsMap.get("userName"));
+                    sysUser.setIdCard(paramsMap.get("idCord"));
+                    sysUser.setPhone(paramsMap.get("phone"));
+                    sysUser.setAddress(paramsMap.get("address"));
+                    sysUser.setDetailedAdressCode(paramsMap.get("detailedAdressCode"));
+                    sysUser.setDetailedAdress(paramsMap.get("detailedAddress"));
+                    sysUser.setBriefAddressCode(s1);
+                    sysUser.setBriefAddress(id.getName());
+
+                    sysUser.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
+                    sysUser.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
+
+                    sysUser.setCreateTime(new Date());
+                    sysUser.setIsRealName(1);
+
+                    if (ObjectUtil.isEmpty(povertyUserRegist)) {
+                        sysUser.setFarmType(2);
+                    } else if (povertyUserRegist.getIsDelete() == 1) {
+                        sysUser.setFarmType(1);
+                    } else {
+                        sysUser.setFarmType(0);
+                    }
+                    sysUser.setFarmName(paramsMap.get("farmName"));
+                    sysUser.setAccoutType(1);
+                    userMapper.updateById(sysUser);
+                    return new Result(ResultCode.SUCCESS,sysUser);
+                }
+
+            }else {
+                if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
+                    return new Result(10001, "实名手机号与当前手机号不一致", false);
+                }
+                user.setIsRealName(1);
+                userMapper.insert(user);
+                return new Result(ResultCode.SUCCESS, userMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", paramsMap.get("phone"))));
             }
-            userMapper.insert(user);
-            return new Result(ResultCode.SUCCESS, userMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", paramsMap.get("phone"))));
         } else {
             user.setAccoutType(0);
             user.setIsRealName(1);

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

@@ -19,7 +19,7 @@ public class Print {
      * @throws Exception
      * @return
      */
-    public  static void print() throws Exception {
+    public  static void print(BillSubsidy subsidy) throws Exception {
         //准备数据
         //
         String path ="/opt/subsidy/order_contract.xls";
@@ -36,7 +36,7 @@ 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) {
@@ -74,7 +74,6 @@ 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);