qu

whepi-ui/templates/user/scanEstate.ftl

@@ -11,9 +11,9 @@
                     <br/>
                     <br/>
                     <br/>
-                    <p class="user-title-long">${doorplate!''}
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${name!''}</p>
+                    <p class="user-title-long">${doorplate!''}</p>
                     <br/>
+                    <p class="user-title-long">${name!''}</p>
                     <br/>
                     <h1 class="user-title-big ${collor!''}">${into!""}</h1>
                     <br/>

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

@@ -186,7 +186,7 @@ public class ScanController {
         } else {
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
-            model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
+            model.put("doorplate", unit.getUptownName() + "小区" +unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
             model.put("name", uptownHomes.get(0).getLinkman());
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             model.put("now", format.format(new Date()));
@@ -209,7 +209,7 @@ public class ScanController {
             if (msReports.size() != 3) {
                 model.put("collor", "red");
                 model.put("into", "禁止通行");
-                model.put("errorMsg", "您近期有未提交健康日报，无法判断您健康状态，请尽快返回住处。");
+                model.put("errorMsg", "您近期有漏报健康日报，无法判断您健康状态，请尽快返回住处。");
                 return new ModelAndView("/user/scanEstate.ftl", model);
             }
             MsReport msReport = msReportMapper.selectMsReportToday(userOpen.getUserId());