后台表格添加修改

admin/src/main/java/com/huimv/farm/damsubsidy/entity/vo/BillSubsidyBatchPay.java

@@ -33,6 +33,7 @@ public class BillSubsidyBatchPay extends BaseEntity implements Serializable {
     private String phone;
     private String saleName;
     private String address;
+    private String notes;
 
 
 

admin/src/main/java/com/huimv/farm/damsubsidy/entity/vo/BillSubsidyDto.java

@@ -29,7 +29,6 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("bill_subsidy")
 public class BillSubsidyDto extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -92,9 +92,13 @@ public class Print3 {
             payVo.setBankCard(subsidy.getBankCardId());
             payVo.setFarmType(subsidy.getFarmerType());
             payVo.setNumber(subsidy.getRewardNum());
+            if (subsidy.getRewardNum() > 10) {
+                payVo.setNotes("养殖大户");
+            } else {
+                payVo.setNotes("家庭牧场");
+            }
             payVo.setMoney(subsidy.getApplyMoney());
             payVo.setPhone(subsidy.getPhone());
-            payVo.setSaleName(subsidy.getSaleName());
             number = number + subsidy.getRewardNum();
             money = money.add(subsidy.getApplyMoney());
             list.add(payVo);
@@ -105,9 +109,11 @@ public class Print3 {
         context.putVar("moneyCount", money);
         context.putVar("word", address);
         String[] split = date.split("-");
+        String s = split[2];
+        String[] strings = s.split(" ");
         context.putVar("date1", split[0]);
         context.putVar("date2", split[1]);
-        context.putVar("date3", split[2]);
+        context.putVar("date3", strings[0]);
         //生成
         JxlsHelper.getInstance().processTemplate(is, os, context);
 //        String path = String.valueOf(os);
@@ -211,13 +217,13 @@ public class Print3 {
         }
         context.putVar("list", list);
         context.putVar("word", address);
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//        String format = sdf.format(date);
 
         String[] split = date.split("-");
+        String s = split[2];
+        String[] strings = s.split(" ");
         context.putVar("date1", split[0]);
         context.putVar("date2", split[1]);
-        context.putVar("date3", split[2]);
+        context.putVar("date3", strings[0]);
         context.putVar("numCount1",huNum);
         context.putVar("numCount2",number);
         context.putVar("numCount3",money);
@@ -282,12 +288,12 @@ public class Print3 {
         context.putVar("numCount", number);
         context.putVar("moneyCount", money);
         context.putVar("word", address);
-     /*   SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String format = sdf.format(date);*/
         String[] split = date.split("-");
+        String s = split[2];
+        String[] strings = s.split(" ");
         context.putVar("date1", split[0]);
         context.putVar("date2", split[1]);
-        context.putVar("date3", split[2]);
+        context.putVar("date3", strings[0]);
         //生成
         JxlsHelper.getInstance().processTemplate(is, os, context);
 //        String path = String.valueOf(os);

admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=formal
+#spring.profiles.active=dev
+spring.profiles.active=formal
 #spring.profiles.active=root
 
 #spring.profiles.active=prod