Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package com.huimv.farm.damsubsidy.common.utils;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.farm.damsubsidy.entity.PovertyUserRegist;
 import org.apache.poi.ss.formula.functions.T;
 
@@ -116,4 +117,31 @@ public class PovertyUtils {
         }
         return  endList;
     }
+
+    public static List getEartagNo(String eartags){
+        if (StringUtils.isBlank(eartags)){
+            return null;
+        }
+        eartags = eartags.replace("，",",").replace(" ","");
+        String[] split = eartags.split(",");
+        List list = new ArrayList();
+        for (String input : split) {
+            if (input.contains("-")) {
+                String start = input.substring(0, input.indexOf("-"));
+                String end = input.substring(input.indexOf("-") + 1);
+                String substring1 = input.substring(start.length() - end.length(), start.length());
+                int starNo = Integer.parseInt(substring1);
+                int endNo = Integer.parseInt(end);
+                if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
+                    return null;
+                }
+                for (int i = starNo ;i<=endNo;i++) {
+                    list.add(start+i);
+                }
+            }else {
+                list.add(input);
+            }
+        }
+        return list;
+    }
 }

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

@@ -52,6 +52,12 @@ public class BillLandingInspectionController {
         return iBillLandingInspectionService.cancelApplication(httpServletRequest,paramsMap);
     }
 
+    //感觉检疫证号返回全部耳标
+    @PostMapping("/getEartagNoBy")
+    public Result getEartagNoBy(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return iBillLandingInspectionService.getEartagNoBy(httpServletRequest,paramsMap);
+    }
+
     @PostMapping("agreeApplication")
     public Result agreeApplication(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
         return iBillLandingInspectionService.agreeApplication(httpServletRequest,paramsMap);
@@ -124,4 +130,5 @@ public class BillLandingInspectionController {
         map.put("url", content);
         return billLandingInspectionService.addPay(httpServletRequest, map);
     }
+
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.entity.BillSubsidy;
 import com.huimv.farm.damsubsidy.service.IBillSubsidyService;
 import com.huimv.farm.damsubsidy.common.utils.PdfUtil;
@@ -23,9 +24,7 @@ import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -165,4 +164,26 @@ public class BillSubsidyController {
 //        Path path2 = Paths.get("/opt/subsidy/"+"order_contract"+".xls");
 //        Files.delete(path2);
     }
+
+    @PostMapping("/updatePayStatus")
+    public Result updatePayStatus(@RequestBody Map<String, String> paramsMap ) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        List list= new ArrayList();
+        for (String s : split) {
+
+            BillSubsidy billSubsidy = new BillSubsidy();
+            billSubsidy.setId(Integer.parseInt(s));
+            billSubsidy.setIsPay(2);
+            list.add(billSubsidy);
+        }
+        subsidyService.updateBatchById(list);
+        return new Result(10000,"批量修改成功",true);
+    }
+
+
+    @PostMapping("/printPay")
+    public Result printPay(HttpServletResponse response,@RequestBody Map<String, String> paramsMap ) throws IOException {
+      return subsidyService.printPay(response,paramsMap);
+    }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillLandingInspectionService.java

@@ -31,4 +31,6 @@ public interface IBillLandingInspectionService extends IService<BillLandingInspe
     Result rejectApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result agreeApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result getEartagNoBy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillSubsidyService.java

@@ -5,9 +5,11 @@ import com.huimv.farm.damsubsidy.entity.BillSubsidy;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -42,4 +44,6 @@ public interface IBillSubsidyService extends IService<BillSubsidy> {
     Result getLast(HttpServletRequest httpServletRequest, Map<String, String> parasMap);
 
     Result listFlow(Map<String, String> parasMap);
+
+    Result printPay(HttpServletResponse response, Map<String, String> paramsMap) throws IOException;
 }

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
+import com.huimv.farm.damsubsidy.common.utils.PovertyUtils;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
@@ -297,4 +298,16 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
             return Result.ERROR();
         }
     }
+
+    @Override
+    public Result getEartagNoBy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectById(id);
+        String eartags = billLandingInspection.getEartags();
+        List eartagNo = PovertyUtils.getEartagNo(eartags);
+        if (ObjectUtil.isEmpty(eartagNo)){
+            return new Result(10001,"当前检疫无耳标",false);
+        }
+        return new Result(ResultCode.SUCCESS,eartagNo);
+    }
 }

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

@@ -1,7 +1,10 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,14 +27,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -545,4 +548,60 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         }
         return new Result(ResultCode.SUCCESS,result);
     }
+
+    //打印待支付的  TODO 05-09
+    @Override
+    public Result printPay(HttpServletResponse response, Map<String, String> paramsMap) throws IOException {
+        String ids = paramsMap.get("ids");
+        String startDate = paramsMap.get("startDate");
+        String endDate = paramsMap.get("endDate");
+        String address = paramsMap.get("address");
+
+        QueryWrapper<BillSubsidy> wrapper = new QueryWrapper<>();
+        if (StringUtils.isBlank(startDate)){
+            Date date = new Date();
+             startDate = DateUtil.format(date, "yyyy-MM-dd");
+            wrapper.ge("create_time",startDate);
+        }
+        if (StringUtils.isNotBlank(endDate)){
+            String endTime = endDate +" 23:59:59";
+            wrapper.le("create_time",endTime);
+        }
+
+
+        if (StringUtils.isNotBlank(ids)){
+            List<String> list = Arrays.asList(ids.split(","));
+            wrapper.in("id",list);
+        }
+        wrapper.eq("is_pay",1);
+        wrapper.eq("subsidy_sch",3);
+        List<BillSubsidy> billSubsidies = subsidyMapper.selectList(wrapper);
+        if (ObjectUtil.isEmpty(billSubsidies)){
+            return new Result(10001,"当前无待支付名单",true);
+        }
+        ExcelWriter writer = ExcelUtil.getWriter();
+        ServletOutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+
+            writer.merge(5,startDate +"-"+endDate +"  待支付名单");
+            writer.write(billSubsidies,true);
+            writer.addHeaderAlias("farmerName","姓名");
+            writer.addHeaderAlias("bankCardId","卡号");
+            writer.addHeaderAlias("idCard","身份证");
+            writer.addHeaderAlias("bankName","开户行");
+            writer.addHeaderAlias("phone","手机号");
+            writer.addHeaderAlias("createTime","提交时间");
+            writer.addHeaderAlias("applyMoney","申报金额");
+
+            writer.flush(outputStream);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            writer.close();
+            outputStream.close();
+        }
+        return null;
+    }
 }