Merge remote-tracking branch 'origin/master'

whepi-ui/templates/yeweihui/home.ftl

@@ -16,11 +16,11 @@
     <#--<h1>页面四</h1> </div>-->
     </div>
     <div class="weui-tabbar">
-        <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
+        <a id="tab1a" href="#tab1" class="weui-tabbar__item weui-bar__item--on">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/order.png" alt=""></div>
             <p class="weui-tabbar__label">每日上报</p>
         </a>
-        <a href="#tab2" class="weui-tabbar__item">
+        <a id="tab2a" href="#tab2" class="weui-tabbar__item">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">求助</p>
         </a>
@@ -46,6 +46,8 @@
     var taskList = ${taskList!'[]'};
     var statisticsOrderList =${rbList!'[]'};
 
+    var showQZ = ${showQZ!'"-"'};
+
     (function ($) {
         $(function () {
             $('.weui-navbar__item').on('click', function () {
@@ -106,5 +108,16 @@
             }
         });
 
+        function selectqiuzhu() {
+            $("#tab1").removeClass('weui-tab__bd-item--active');
+            $("#tab1a").removeClass('weui-bar__item--on');
+            $("#tab2").addClass('weui-tab__bd-item--active');
+            $("#tab2a").addClass('weui-bar__item--on');
+        }
+
+        if (showQZ != '-') {
+            selectqiuzhu();
+        }
+
     })(jQuery);
 </script>

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -93,7 +93,7 @@
             },
             success: function (data) {
                 $.closePopup();
-                window.location.href = "/yeweihui/home.html?userId=" + userId;
+                window.location.href = "/yeweihui/home.html?showQZ=true&userId=" + userId;
             },
             error: function () {
                 $.alert("网络异常");
@@ -102,7 +102,7 @@
     }
 
     function goback() {
-        window.location.href = "/yeweihui/home.html?userId=" + userId;
+        window.location.href = "/yeweihui/home.html?showQZ=true&userId=" + userId;
     }
 
     function getdealdetail() {

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

@@ -6,8 +6,9 @@ import com.bofeng.entity.Uptown;
 import com.bofeng.entity.UptownUnit;
 import com.bofeng.service.SysAreaService;
 import com.yvan.Model;
+import com.yvan.mvc.Pd;
 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;
@@ -22,15 +23,15 @@ public class WxSysAreaController {
     private SysAreaMapper sysAreaMapper;
 
     //选择省
-    @GetMapping("/admin/selectProvince")
+    @PostMapping("/admin/selectProvince")
     public Model<List<SysArea>> selectProvince() {
         return Model.newSuccess(sysAreaService.selectProvince());
     }
 
     //选择城市
-    @GetMapping("/admin/selectCityByProvince")
-    public Model<List<SysArea>> selectCityByProvince(HttpServletRequest request) {
-        Long areaId = Long.parseLong(request.getParameter("areaId"));
+    @PostMapping("/admin/selectCityByProvince")
+    public Model<List<SysArea>> selectCityByProvince(@Pd(name = "areaId", desc = "省份的ID") Long areaId) {
+        //Long areaId = Long.parseLong(request.getParameter("areaId"));
         if (areaId == null || areaId == 0L) {
             return Model.newFail("请选择所在省");
         }
@@ -38,7 +39,7 @@ public class WxSysAreaController {
     }
 
     //选择区
-    @GetMapping("/admin/selectAreaByCity")
+    @PostMapping("/admin/selectAreaByCity")
     public Model<List<SysArea>> selectAreaByCity(HttpServletRequest request) {
         Long areaId = Long.parseLong(request.getParameter("areaId"));
         if (areaId == null || areaId == 0L) {
@@ -48,7 +49,7 @@ public class WxSysAreaController {
     }
 
     //选择小区
-    @GetMapping("/admin/selectUptownByArea")
+    @PostMapping("/admin/selectUptownByArea")
     public Model<List<Uptown>> selectUptownByArea(HttpServletRequest request) {
         Long areaId = Long.parseLong(request.getParameter("areaId"));
         if (areaId == null || areaId == 0L) {
@@ -58,7 +59,7 @@ public class WxSysAreaController {
     }
 
     //选择栋
-    @GetMapping("/admin/selectRidgepoleByArea")
+    @PostMapping("/admin/selectRidgepoleByArea")
     public Model<List<String>> selectRidgepoleByArea(HttpServletRequest request) {
         Long uptownId = Long.parseLong(request.getParameter("uptownId"));
         if (uptownId == null || uptownId == 0L) {
@@ -68,7 +69,7 @@ public class WxSysAreaController {
     }
 
     //选择单元
-    @GetMapping("/admin/selectUnitByArea")
+    @PostMapping("/admin/selectUnitByArea")
     public Model<List<UptownUnit>> selectUnitByArea(HttpServletRequest request) {
         Long uptownId = Long.parseLong(request.getParameter("uptownId"));
         Long ridgepole = Long.parseLong(request.getParameter("ridgepole"));

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

@@ -9,7 +9,6 @@ import com.yvan.Model;
 import com.yvan.platform.StringUtils;
 import io.swagger.annotations.ApiOperation;
 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;
 
@@ -28,7 +27,7 @@ public class WxUserOpenController {
     private WxUserOpenService wxUserOpenService;
 
     @ApiOperation("用户注册页面点登录")
-    @GetMapping("/userOpen/login")
+    @PostMapping("/userOpen/login")
     public Model<Long> login() {
         UserOpen userOpen = homeService.getUserOpen();
         if (userOpen == null) {
@@ -51,7 +50,7 @@ public class WxUserOpenController {
     }
 
     @ApiOperation("完善基础数据之获取创建的角色")
-    @GetMapping("/userOpen/queryUserRoles")
+    @PostMapping("/userOpen/queryUserRoles")
     public Model<List<UserRole>> queryUserRoles() {
         UserOpen userOpen = homeService.getUserOpen();
         List<UserRole> list = new ArrayList<>();

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

@@ -9,7 +9,6 @@ import com.yvan.Model;
 import com.yvan.ModelOps;
 import com.yvan.mvc.Pd;
 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;
 
@@ -31,31 +30,31 @@ public class RiBaoController {
     private RiBaoService riBaoService;
 
 
-    private String suspected_id;
-    private String report_id;
-    private String user_name;
-    private String grender;
-    private String age;
-    private String family_status;
-    private String status_desp;
-    private String medical;
-    private String temperature;
-    private String cough;
-    private String muscle;
-    private String dyspnea;
-    private String fatigue;
-    private String diarrhea;
-    private String single_room;
-    private String suspected_status;
-    private String others;
-    private String user_create;
-    private String time_create;
-    private String user_update;
-    private String time_update;
+//    private String suspected_id;
+//    private String report_id;
+//    private String user_name;
+//    private String grender;
+//    private String age;
+//    private String family_status;
+//    private String status_desp;
+//    private String medical;
+//    private String temperature;
+//    private String cough;
+//    private String muscle;
+//    private String dyspnea;
+//    private String fatigue;
+//    private String diarrhea;
+//    private String single_room;
+//    private String suspected_status;
+//    private String others;
+//    private String user_create;
+//    private String time_create;
+//    private String user_update;
+//    private String time_update;
 
 
     //查询家人
-    @GetMapping("/riBao/getRibao")
+    @PostMapping("/riBao/getRibao")
     public MsReport queryRibao(@Pd(name = "userCreate") Long userCreate) {
         Long reportId = riBaoService.getNowByYesterday(userCreate);
         MsReport msReport = riBaoService.selectById(reportId);
@@ -65,7 +64,7 @@ public class RiBaoController {
     }
 
     // 进入日报首页
-    @GetMapping("/riBao/queryRibaoDetailList")
+    @PostMapping("/riBao/queryRibaoDetailList")
     public Model<List<MsSuspected>> queryRibaoDetailList(@Pd(name = "userCreate") Long userCreate) {
         Long reportId = riBaoService.getNowByYesterday(userCreate);
         List<MsSuspected> listSuspected = riBaoService.queryRibaoDetailList(reportId);
@@ -73,7 +72,7 @@ public class RiBaoController {
     }
 
     // 添加日报
-    @GetMapping("/riBao/addOrEditRibao")
+    @PostMapping("/riBao/addOrEditRibao")
     public ModelOps addOrEditRibao(
             @Pd(name = "suspectedId") Long suspectedId,
             @Pd(name = "userName") String userName,// 家人姓名
@@ -98,7 +97,7 @@ public class RiBaoController {
 
 
     //查询家人
-    @GetMapping("/riBao/selectSuspected")
+    @PostMapping("/riBao/selectSuspected")
     public MsSuspected selectSuspected(HttpServletRequest request) {
         //初始化今日日报
         Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
@@ -123,7 +122,7 @@ public class RiBaoController {
 //    }
 
     //根据日报获取家人
-    @GetMapping("/riBao/queryRibaoRefresh")
+    @PostMapping("/riBao/queryRibaoRefresh")
     public Model<List<MsSuspected>> queryRibaoRefresh(@Pd(name = "reportId") Long reportId) {
         return Model.newSuccess(riBaoService.getByReportId(reportId));
     }
@@ -142,7 +141,7 @@ public class RiBaoController {
     }
 
     //根据日期获取家人
-    @GetMapping("/riBao/queryRibaoReportDate")
+    @PostMapping("/riBao/queryRibaoReportDate")
     public Model<List<MsSuspected>> queryRibaoReportDate(
             @Pd(name = "reportDate") String reportDate,
             @Pd(name = "userCreate") Long userCreate) {

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

@@ -48,7 +48,7 @@ public class YeWeiHuiController {
     private RbMapper rbMapper;
 
     @GetMapping("/yeweihui/home.html")
-    public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId) {
+    public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId, @RequestParam(value = "showQZ", required = false, defaultValue = "-") String showQZ) {
 
 //        List<QzTask> taskList = qzTaskService.selectAll(1225321682867105793L);
 //        List<sysUptownUnit> rbList = rbService.selectAll(1225321682867105793L);
@@ -57,6 +57,7 @@ public class YeWeiHuiController {
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));
         model.put("user_id", "\""+userId+"\"");
+        model.put("showQZ", "\""+showQZ+"\"");
 
         return new ModelAndView("/yeweihui/home.ftl", model);
     }