Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/home/home.js

@@ -139,7 +139,7 @@ define(function (require) {
                                         }
                                         var uptownId = $form1.formGet().uptownId;
                                         var date = $form1.formGet().date;
-                                        window.open(api('/epi/yeweihui/exportRiBao?uptownId=' + uptownId + '&date=' + date));
+                                        window.open(api('/yeweihui/exportRiBao?uptownId=' + uptownId + '&date=' + date));
                                     }
                                 },
                                 {
@@ -150,7 +150,7 @@ define(function (require) {
                                             return false;
                                         }
                                         var date = $form1.formGet().date;
-                                        window.open(api('/epi/lun/exportRiBao?date=' + date));
+                                        window.open(api('/lun/exportRiBao?date=' + date));
                                     }
                                 },
                                 {

whepi-ui/templates/home/buytc.ftl

@@ -32,7 +32,7 @@
         </div>
     </div>
 </div>
-    <#include "/home/frag.foot.ftl"/>
+<#include "/home/frag.foot.ftl"/>
 
 <script>
     (function ($) {
@@ -104,8 +104,9 @@
             $('#myPhone').attr("disabled", "disabled");
             $('#Myremarks').attr("disabled", "disabled");
             $('#buyCommit')[0].style.display = 'none';
-            $('#MybuyRepeal')[0].style.display = 'none';
-
+            if ($('#MybuyRepeal')[0] != undefined) {
+                $('#MybuyRepeal')[0].style.display = 'none';
+            }
         }
 
     })(jQuery);

whepi-web/src/main/java/com/bofeng/dao/RbMapper.java

@@ -54,7 +54,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
                     "from ms_report a \n" +
                     "INNER JOIN sys_uptown_house b ON a.house_id = b.house_id\n" +
                     "INNER JOIN sys_uptown_unit c ON c.unit_id = b.unit_id and c.uptown_id = #{uptownId}\n" +
-                    "where a.report_date = #{date} and a.ms_status = 2"
+                    "where a.report_date = #{date} and a.ms_status = 2 and a.report_status = 1"
     )
     Map<String, Integer> selectyicahng(@Param("uptownId") Long uptownId, @Param("date") String date);
 
@@ -64,7 +64,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
                     "from ms_report a \n" +
                     "INNER JOIN sys_uptown_house b ON a.house_id = b.house_id\n" +
                     "INNER JOIN sys_uptown_unit c ON c.unit_id = b.unit_id and c.uptown_id = #{uptownId}\n" +
-                    "where a.report_date = #{date}"
+                    "where a.report_date = #{date} and a.report_status = 1"
     )
     Map<String, Integer> selecthuiz(@Param("uptownId") Long uptownId, @Param("date") String date);
 

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

@@ -64,10 +64,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-//            UserOpen userOpen = homeService.getUserOpen();
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");

whepi-web/src/main/resources/mapper/BuyMapper.xml

@@ -35,7 +35,6 @@
        SELECT a.tg_status, a.tg_price, IFNULL(( SELECT SUM(b.buy_count) FROM jm_buy b WHERE a.jm_id = b.jm_id AND buy_status = 1 ), 0 ) AS count,
        ( SELECT phone FROM sys_user_role aa INNER JOIN sys_uptown_home bb ON aa.property_id = bb.house_id WHERE aa.role_id = 1 AND aa.user_id = #{userId}
        LIMIT 1 ) AS phone FROM jm_tuangou a WHERE a.jm_id = #{jmId}
-       AND a.user_id = #{userId}
        LIMIT 1
     </select>