修改

whepi-ui/templates/home/homeHelp.ftl

@@ -0,0 +1,19 @@
+<#assign title="操作帮助"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="page__bd" style="height: 300px">
+    <div class="container">
+        <img src="/static/homeHelp.jpg" style="width: 100%"/>
+</div>
+
+
+<#include "/home/frag.foot.ftl" />
+
+<script>
+
+    (function ($) {
+
+    })(jQuery);
+
+
+</script>

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoPrivate.java

@@ -32,12 +32,21 @@ public class ExcelRiBaoPrivate {
 
     public String getLoudong() {
         if (loudong.length() <= 0) {
-            loudong = ridgepole + "栋" + unit + "单元";
+            loudong = ridgepole;
         }
         return loudong;
     }
 
-    @ExcelProperty(value = "房号", index = 1)
+    @ExcelProperty(value = "单元", index = 1)
+    private String danyuan = "";
+    public String getDanyuan() {
+        if (danyuan.length() <= 0) {
+            danyuan = ridgepole;
+        }
+        return danyuan;
+    }
+
+    @ExcelProperty(value = "房号", index = 2)
     private String fanghao = "";
 
     public String getFanghao() {
@@ -47,31 +56,31 @@ public class ExcelRiBaoPrivate {
         return fanghao;
     }
 
-    @ExcelProperty(value = "联系人", index = 2)
+    @ExcelProperty(value = "联系人", index = 3)
     private String linkman;
 
-    @ExcelProperty(value = "联系电话", index = 3)
+    @ExcelProperty(value = "联系电话", index = 4)
     private String phone;
 
-    @ExcelProperty(value = "今日居家人数", index = 4)
+    @ExcelProperty(value = "今日居家人数", index = 5)
     private int safetyNum;
 
-    @ExcelProperty(value = "确诊人数", index = 5)
+    @ExcelProperty(value = "确诊人数", index = 6)
     private int sureNum;
 
-    @ExcelProperty(value = "隔离人数", index = 6)
+    @ExcelProperty(value = "隔离人数", index = 7)
     private int singleNum;
 
-    @ExcelProperty(value = "异常观察人数", index = 7)
+    @ExcelProperty(value = "异常观察人数", index = 8)
     private int suspectedNum;
 
-    @ExcelProperty(value = "身体正常人数", index = 8)
+    @ExcelProperty(value = "身体正常人数", index = 9)
     private int normalNum;
 
-    @ExcelProperty(value = "居家人员姓名", index = 9)
+    @ExcelProperty(value = "居家人员姓名", index = 10)
     private String userName;
 
-    @ExcelProperty(value = "性别", index = 10)
+    @ExcelProperty(value = "性别", index = 11)
     private String grenderStr;
 
     public String getGrenderStr() {
@@ -85,13 +94,13 @@ public class ExcelRiBaoPrivate {
         return grenderStr;
     }
 
-    @ExcelProperty(value = "年龄", index = 11)
+    @ExcelProperty(value = "年龄", index = 12)
     private String age;
 
-    @ExcelProperty(value = "体温", index = 12)
+    @ExcelProperty(value = "体温", index = 13)
     private BigDecimal temperature;
 
-    @ExcelProperty(value = "确诊", index = 13)
+    @ExcelProperty(value = "确诊", index = 14)
     private String medicalStr;
     public String getMedicalStr() {
         if (medical == 0) {
@@ -102,7 +111,7 @@ public class ExcelRiBaoPrivate {
         return medicalStr;
     }
 
-    @ExcelProperty(value = "单间隔离", index = 14)
+    @ExcelProperty(value = "单间隔离", index = 15)
     private String singleRoomStr;
     public String getSingleRoomStr() {
         if (singleRoom == 0) {
@@ -113,7 +122,7 @@ public class ExcelRiBaoPrivate {
         return singleRoomStr;
     }
 
-    @ExcelProperty(value = "身体基本情况", index = 15)
+    @ExcelProperty(value = "身体基本情况", index = 16)
     private String baseDesc;
     public String getBaseDesc() {
         if (familyStatus == 0) {
@@ -138,7 +147,7 @@ public class ExcelRiBaoPrivate {
         return baseDesc;
     }
 
-    @ExcelProperty(value = "病情描述", index = 16)
+    @ExcelProperty(value = "病情描述", index = 17)
     private String bingqingDesc = "";
     public String getBingqingDesc() {
 

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -130,6 +130,16 @@ public class WxController {
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
 
+        val btnHelp = new WxMenuButton();
+        btnHelp.setName("帮助");
+        btnHelp.setType(WxConsts.MenuButtonType.VIEW);
+        btnHelp.setUrl(
+                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
+                                "/home/homeHelp.html",
+                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
+        );
+
+
 //        val btn2 = new WxMenuButton();
 //        btn2.setName("业委会");
 //
@@ -192,6 +202,7 @@ public class WxController {
 
         menu.getButtons().add(btn1);
         menu.getButtons().add(btnDesc);
+        menu.getButtons().add(btnHelp);
 //        menu.getButtons().add(btn2);
 //        menu.getButtons().add(btn3);
         wxService.getMenuService().menuCreate(menu);

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -185,4 +185,9 @@ public class UserOpenController {
     public ModelAndView descHome(ModelMap model) {
         return new ModelAndView("/home/desc.ftl", model);
     }
+
+    @GetMapping("/home/homeHelp.html")
+    public ModelAndView homeHelp(ModelMap model) {
+        return new ModelAndView("/home/homeHelp.ftl", model);
+    }
 }