修改文字

whepi-doc/mrsb.sql

@@ -30,9 +30,9 @@ CREATE TABLE ms_suspected  (
   suspected_id      bigint(20) NOT NULL DEFAULT 0                           COMMENT '疑似ID',
   report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
   user_name         varchar(50)  NOT NULL DEFAULT ''                        COMMENT '家人姓名',
-  grender            int(11)    NOT NULL DEFAULT 0                          COMMENT '性别:0未设置，1男,2女',
+  grender           int(11)    NOT NULL DEFAULT 0                           COMMENT '性别:0未设置，1男,2女',
   age               int(11)    NOT NULL DEFAULT 0                           COMMENT '年龄',
-  family_status     int(11)    NOT NULL DEFAULT 0                           COMMENT '基本状态:1,0,1,0,0,0,1 (0表示未选中，1表示选中)',
+  family_status     varchar(50) NOT NULL DEFAULT 0                          COMMENT '基本状态:1,0,1,0,0,0,1 (0表示未选中，1表示选中)',
   status_desp       varchar(100)  NOT NULL DEFAULT ''                       COMMENT '状态描述',
   medical           int(11)    NOT NULL DEFAULT 0                           COMMENT '是否确诊:0否,1是',
   temperature       decimal(14,2) NOT NULL DEFAULT 0                        COMMENT '体温',

whepi-ui/templates/user/changeRole.ftl

@@ -72,8 +72,8 @@
             $.alert("请选择用户角色！")
             return false;
         }
-        <#if (type?? )&&(type ="1") >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;</#if>
-        <#if (type?? )&&(type ="2") >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;</#if>
+        <#if (type?? )&&(type = 1) >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;</#if>
+        <#if (type?? )&&(type = 2) >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;</#if>
 
     }
 </script>

whepi-web/src/main/java/com/bofeng/controller/SweepCodeController.java

@@ -1,36 +0,0 @@
-package com.bofeng.controller;
-
-import com.bofeng.entity.LoginResult;
-import com.bofeng.entity.SysUptownHouse;
-import com.bofeng.service.SweepCodeService;
-import com.google.common.base.Strings;
-import com.yvan.Model;
-import com.yvan.mvc.Pd;
-import com.yvan.springmvc.HttpParameterParser;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-@Slf4j
-@RestController
-public class SweepCodeController {
-
-    @Autowired
-    private SweepCodeService sweepCodeService;
-
-    @ApiOperation("出入查询")
-    @GetMapping("/whepi/sweepCode/selectCode")
-    public Model<List<SysUptownHouse>> selectCode(HttpParameterParser parser) {
-//        HttpServletResponse response,HttpServletRequest request
-        List<SysUptownHouse> sysUptownHouses = sweepCodeService.selectCode(parser.getMap());
-
-        return Model.newSuccess(sysUptownHouses);
-    }
-}

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

@@ -123,25 +123,24 @@ public class WxController {
 //        );
 
         val btn1 = new WxMenuButton();
-        btn1.setName("我的");
-        val btn11 = new WxMenuButton();
-        btn11.setName("健康日报");
-        btn11.setType(WxConsts.MenuButtonType.VIEW);
-        btn11.setUrl(
+        btn1.setName("健康日报");
+        btn1.setType(WxConsts.MenuButtonType.VIEW);
+        btn1.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
                                 "/user/home.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
-        val btn12 = new WxMenuButton();
-        btn12.setName("商品团购");
-        btn12.setType(WxConsts.MenuButtonType.VIEW);
-        btn12.setUrl(
+        val btn2 = new WxMenuButton();
+        btn2.setName("商品团购");
+        btn2.setType(WxConsts.MenuButtonType.VIEW);
+        btn2.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
                                 "/tuangou/home.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
-        btn1.getSubButtons().add(btn11);
-        btn1.getSubButtons().add(btn12);
+
+        val btn3 = new WxMenuButton();
+        btn3.setName("我的");
 
         val btnDesc = new WxMenuButton();
         btnDesc.setName("平台简介");
@@ -160,7 +159,8 @@ public class WxController {
                                 "/home/homeHelp.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
-
+        btn3.getSubButtons().add(btnDesc);
+        btn3.getSubButtons().add(btnHelp);
 
 //        val btn2 = new WxMenuButton();
 //        btn2.setName("业委会");
@@ -223,8 +223,8 @@ public class WxController {
 //        btn3.getSubButtons().add(btn33);
 
         menu.getButtons().add(btn1);
-        menu.getButtons().add(btnDesc);
-        menu.getButtons().add(btnHelp);
+        menu.getButtons().add(btn2);
+        menu.getButtons().add(btn3);
 //        menu.getButtons().add(btn2);
 //        menu.getButtons().add(btn3);
         wxService.getMenuService().menuCreate(menu);