耳标检验

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

@@ -36,13 +36,21 @@ public class Print {
         //绑定数据
         Context context = new Context();
         //涉及太多只写了一个单独的
-        context.putVar("userName", subsidy.getFarmerName());
+
+
 //        context.putVar("orderTime", new Date());
         context.putVar("address",subsidy.getCargoOwnedetailedAdressr());
-        if (subsidy.getFarmerType() == 0) {
-            context.putVar("type","动态动态监测对象");
-        } else {
+
+        if (subsidy.getSubsidyType() ==0){
+            if (subsidy.getFarmerType() == 0) {
+                context.putVar("type","动态动态监测对象");
+            } else {
+                context.putVar("type", "已脱贫及其他养殖户");
+            }
+            context.putVar("userName", subsidy.getFarmerName());
+        }else {
             context.putVar("type", "已脱贫及其他养殖户");
+            context.putVar("userName", subsidy.getNameTwo());
         }
 
         context.putVar("farmName",subsidy.getFarmName());

admin/src/main/resources/application-formal.yml

@@ -14,6 +14,7 @@ spring:
       max-file-size: 10MB
 
   datasource:
+#    url: jdbc:mysql://36.133.251.176:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     url: jdbc:mysql://192.168.0.2:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: dam_subsidy
     password: Xnef*<bpo9+2

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