peiguo 5 роки тому
батько
коміт
f44968bca9

+ 1 - 1
whepi-ui/templates/home/frag.head.ftl

@@ -36,7 +36,7 @@
         }
         .user-title-long {
             text-align: center;
-            font-size: 25px;
+            font-size: 20px;
             color: #000000;
             font-weight: 900;
             margin: 0 15%;

+ 2 - 2
whepi-ui/templates/user/scan.ftl

@@ -11,8 +11,8 @@
                     <#if (uptownId??) && (uptownId != 1238790987234 && uptownId != 5 )><br/>
                         <br/>
                         <br/></#if>
-                    <p class="user-title-long">${doorplate!''}
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${name!''}</p>
+                    <p class="user-title-long">${doorplate!''}</p>
+                    <p class="user-title-long">${name!''}</p>
                     <h1 class="user-title-long ${collor!''}">${door!''}</h1>
                     <br/>
                     <h1 class="user-title-big ${collor!''}">${into!""}</h1>

+ 2 - 2
whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -133,7 +133,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
             "union\n" +
             "select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 2 day) and user_create=#{userId}\n" +
             "union\n" +
-            "select * from ms_report where report_status=1 and report_date=curdate() and user_create=#{userId}")
+            "select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 3 day) and user_create=#{userId}")
     List<MsReport> selectMsReportLate(@Param("userId") Long userId);
 
     /**
@@ -147,7 +147,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
 
     @Select("select * from (select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 1 day) and user_create=#{userId}\n" +
             "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 2 day) and user_create=#{userId}\n" +
-            "union select * from ms_report where report_status=1 and report_date=curdate() and user_create=#{userId}) aa where aa.ms_status = 2")
+            "union select * from ms_report where report_status=1 and date_sub(curdate(),interval 3 day) and user_create=#{userId}) aa where aa.ms_status = 2")
     List<MsReport> selectMsReportThereError(@Param("userId") Long userId);
 
     /**