测试

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

@@ -53,7 +53,7 @@ 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);

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

@@ -195,7 +195,7 @@ public class BillSubsidyController {
 
     @GetMapping("/printPay")
     public void printPay2(HttpServletResponse response,@RequestParam(name = "startDate", required = false) String startDate,
-                          @RequestParam(name = "endDate", required = true) String endDate
+                          @RequestParam(name = "endDate", required = false) String endDate
                           ) throws IOException {
         subsidyService.printPay2(response, startDate, endDate);
     }

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

@@ -113,7 +113,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         return new Result(10001,"耳标号"+input+"格式错误,包含-号耳标号需递增",false);
                     }
                     for (int i = Integer.parseInt(substring1); i <=  Integer.parseInt(end); i++){
-                        eartagNos.add(substring+i);
+                       String earTag  = getEndEartag(substring,i);
+                        eartagNos.add(earTag);
                     }
                     for (String eartagNo : eartagNos) {
                         Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartagNo));
@@ -165,7 +166,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     return new Result(10001,"耳标号"+eartags+"格式错误,包含-号耳标号需递增",false);
                 }
                 for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
-                    eartagNos.add(substring+i);
+                    String earTag  = getEndEartag(substring,i);
+                    eartagNos.add(earTag);
                 }
                 for (String number : eartagNos) {
                     Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
@@ -208,6 +210,19 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
     }
 
+    private String getEndEartag(String substring, int i) {
+        Integer lenth = String.valueOf(i).length();
+        if (lenth ==3) {
+            return substring+i;
+        }
+        for (int i1 = 0; i1 < 2; i1++) {
+          String endEartag  ="0"+i;
+          if (endEartag.length() ==3){
+              return substring+i;
+          }
+        }
+        return null;
+    }
 
 
     @Override
@@ -305,7 +320,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         }
                         List<String> eartagNos = new ArrayList<>();
                         for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
-                            eartagNos.add(substring+i);
+                            String earTag  = getEndEartag(substring,i);
+                            eartagNos.add(earTag);
                         }
                         for (String number : eartagNos) {
                             BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
@@ -341,7 +357,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     }
                     List<String> eartagNos = new ArrayList<>();
                     for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
-                        eartagNos.add(substring+i);
+                        String earTag  = getEndEartag(substring,i);
+                        eartagNos.add(earTag);
                     }
                     for (String number : eartagNos) {
                         // TODO

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

@@ -154,7 +154,8 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     }
 
     @Override
-    public Result addApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection) {
+    public Result
+    addApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection) {
         QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
         landingInspectionQueryWrapper.eq("inspection_num", billLandingInspection.getInspectionNum());
         if (this.count(landingInspectionQueryWrapper) != 0) {
@@ -265,7 +266,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
             landingInspectionQueryWrapper.eq("veter_id",user.getVeterId());
         }
 
-        if (inspectionSch.equals("4")){
+        if ("4".equals(inspectionSch)){
             landingInspectionQueryWrapper.in("inspection_sch",4,5);
         } else if (ObjectUtil.isNotEmpty(inspectionSch)){
             landingInspectionQueryWrapper.eq("inspection_sch",inspectionSch);

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

@@ -5,6 +5,7 @@ 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 cn.hutool.poi.excel.StyleSet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,6 +34,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -632,20 +634,49 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         wrapper.eq("is_pay",1);
         wrapper.eq("subsidy_sch",3);
         List<BillSubsidy> billSubsidies = subsidyMapper.selectList(wrapper);
+       List list = new ArrayList();
+        for (BillSubsidy billSubsidy : billSubsidies) {
+            Map<String,Object> map = new HashMap();
+            map.put("姓名",billSubsidy.getFarmerName());
+            map.put("卡号",billSubsidy.getBankCardId());
+            map.put("身份证",billSubsidy.getIdCard());
+            map.put("开户行",billSubsidy.getBankName());
+            map.put("手机号",billSubsidy.getPhone());
+            map.put("提交时间",billSubsidy.getCreateTime());
+            map.put("申报金额",billSubsidy.getApplyMoney());
+            list.add(map);
+        }
+
         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","申报金额");
+            StringBuffer  fileName = new StringBuffer();
+            if (StringUtils.isNotBlank(endDate)){
+                fileName.append(startDate);
+                fileName.append(" 至 ");
+                fileName.append(endDate);
+                fileName.append( "   待支付名单");
+            }else {
+                fileName.append(startDate);
+                fileName.append(" 至  待支付名单");
+            }
+            writer.merge(6,fileName.toString());
+
+            System.out.println(fileName);
+            fileName.append(".xlsx");
+            response.setHeader("content-disposition", "attachment;fileName="+ URLEncoder.encode(fileName.toString(), "UTF-8"));
+
+            writer.write(list,true);
+            writer.setRowHeight(0,25);
+            writer.setRowHeight(1,15);
+            writer.setColumnWidth(0,10);
+            writer.setColumnWidth(1,20);
+            writer.setColumnWidth(2,20);
+            writer.setColumnWidth(3,25);
+            writer.setColumnWidth(4,25);
+            writer.setColumnWidth(5,30);
+            writer.setColumnWidth(6,30);
 
             writer.flush(outputStream);