Merge remote-tracking branch 'origin/master'

whepi-doc/mrsb.sql

@@ -44,7 +44,7 @@ CREATE TABLE ms_suspected  (
   diarrhea          int(11)    NOT NULL DEFAULT 0                           COMMENT '腹泻:0无,1轻度腹泻少于于3次，2中度腹泻4-6次，3重度腹泻超过6次',
   score_histroy     int(11)    NOT NULL DEFAULT 0                           COMMENT '历史数据，没有历史数据，就是1分以下为安全，2分到3分为注意观察，3分以上联系医生，5分尽快就诊。有历史数据，一天增加三分及以上就是建议马上就医',
   score             int(11)    NOT NULL DEFAULT 0                           COMMENT '今日数据',
-  score_rezult      int(11)    NOT NULL DEFAULT 0                           COMMENT '评分结果，未评分(0)，安全(1)，注意观察(2)，联系医生(3)，尽快就诊(4)',
+  score_rezult      int(11)    NOT NULL DEFAULT 0                           COMMENT '评分结果，未评分(0)，正常(1)，注意观察(2)，联系医生(3)，尽快就诊(4)',
   single_room       int(11)    NOT NULL DEFAULT 0                           COMMENT '单间隔离:0否,1是',
   suspected_status  int(11)    NOT NULL DEFAULT 0                           COMMENT '是否疑似:0否,1是',
   others            varchar(600)  NOT NULL DEFAULT ''                       COMMENT '其他',

whepi-ui/templates/yeweihui/home.ftl

@@ -30,10 +30,10 @@
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">求助</p>
         </a>
-        <#--<a id="tab3a" href="#tab3" 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>-->
+        <a id="tab3a" href="#tab3" 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>
     <#--<a href="#tab3" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">发现</p>-->

whepi-ui/templates/yeweihui/tgPublish.ftl

@@ -49,49 +49,49 @@
 
         let title = $("#tg_input_title").val();
         if (title.length <= 0) {
-            alert("请输入组团标题");
+            $.alert("请输入组团标题");
             return;
         }
 
         let supplier = $("#tg_input_supplier").val();
         if (supplier.length <= 0) {
-            alert("请输入供应商名称");
+            $.alert("请输入供应商名称");
             return;
         }
 
         let goods = $("#tg_input_goods").val();
         if (goods.length <= 0) {
-            alert("请输入套餐内容");
+            $.alert("请输入套餐内容");
             return;
         }
 
         let price = $("#tg_input_price").val();
         if (price.length <= 0) {
-            alert("请输入套餐单价");
+            $.alert("请输入套餐单价");
             return;
         }
 
         let mixnum = $("#tg_input_mixnum").val();
         if (mixnum.length <= 0) {
-            alert("请输入最小起订量");
+            $.alert("请输入最小起订量");
             return;
         }
 
         let end_time = $("#tg_input_end_time").val();
         if (end_time.length <= 0) {
-            alert("请选择截止时间");
+            $.alert("请选择截止时间");
             return;
         }
 
         let deliver_time = $("#tg_input_deliver_time").val();
         if (deliver_time.length <= 0) {
-            alert("请选择送货时间");
+            $.alert("请选择送货时间");
             return;
         }
 
         let phone_number = $("#tg_input_phone_number").val();
         if (phone_number.length <= 0) {
-            alert("请输入服务电话");
+            $.alert("请输入服务电话");
             return;
         }
 

whepi-ui/templates/yeweihui/tuangouMemberList.ftl

@@ -9,7 +9,7 @@
 
     <div class="weui-btn-area">
         <div style="display: flex; flex-direction: row; justify-content: space-around;">
-            <div id="tg_member_xiaoqu">敬业小区</div>
+            <div id="tg_member_xiaoqu"></div>
             <div id="tg_member_num">当前已团: </div>
         </div>
 

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBao.java

@@ -14,6 +14,7 @@ public class ExcelRiBao {
     private String ridgepole;
     private String unit;
     private String doorplate;
+    private BigDecimal temperature;
     private int grender;
     private int familyStatus;
     private int medical;
@@ -89,7 +90,11 @@ public class ExcelRiBao {
 //    private String age;
 
     @ExcelProperty(value = "体温", index = 10)
-    private BigDecimal temperature;
+    private String temperatureStr;
+    public String getTemperatureStr() {
+        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        return temperatureStr;
+    }
 
     @ExcelProperty(value = "确诊", index = 11)
     private String medicalStr;
@@ -113,90 +118,90 @@ public class ExcelRiBao {
         return singleRoomStr;
     }
 
-//    @ExcelProperty(value = "身体基本情况", index = 14)
-//    private String baseDesc;
-//    public String getBaseDesc() {
-//        if (familyStatus == 0) {
-//            baseDesc = "无病史";
-//        } else if (familyStatus == 1) {
-//            baseDesc = "心血管疾病（服用ARB）";
-//        } else if (familyStatus == 2) {
-//            baseDesc = "心血管疾病（未服用ARB）";
-//        } else if (familyStatus == 3) {
-//            baseDesc = "呼吸系统病史";
-//        } else if (familyStatus == 4) {
-//            baseDesc = "肿瘤病史";
-//        } else if (familyStatus == 5) {
-//            baseDesc = "糖尿病史";
-//        } else if (familyStatus == 6) {
-//            baseDesc = "服用过激素药物";
-//        } else if (familyStatus == 7) {
-//            baseDesc = "妊娠期";
-//        } else {
-//            baseDesc = "其他";
-//        }
-//        return baseDesc;
-//    }
-//
-//    @ExcelProperty(value = "病情描述", index = 15)
-//    private String bingqingDesc = "";
-//    public String getBingqingDesc() {
-//
-//        if (medical == 1) {
-//            bingqingDesc += "已确诊、";
-//        }
-//
-//        if (singleRoom == 1) {
-//            bingqingDesc += "单间隔离、";
-//        }
-//
-//        bingqingDesc = bingqingDesc + "体温：" + temperature + "、";
-//
-//        if (cough == 1) {
-//            bingqingDesc += "偶尔短暂咳嗽、";
-//        } else if (cough == 2) {
-//            bingqingDesc += "咳嗽轻度影响生活、";
-//        } else if (cough == 3) {
-//            bingqingDesc += "咳嗽严重影响生活、";
-//        }
-//        if (muscle == 1) {
-//            bingqingDesc += "肌肉按压有酸痛、";
-//        } else if (muscle == 2) {
-//            bingqingDesc += "偶尔肌肉按压酸痛、";
-//        } else if (muscle == 3) {
-//            bingqingDesc += "肌肉按压持续酸痛、";
-//        }
-//        if (dyspnea == 1) {
-//            bingqingDesc += "呼吸急走或上坡气短、";
-//        } else if (dyspnea == 2) {
-//            bingqingDesc += "呼吸气短而走路变慢、";
-//        } else if (dyspnea == 3) {
-//            bingqingDesc += "呼吸走路数分钟后气短、";
-//        } else if (dyspnea == 4) {
-//            bingqingDesc += "呼吸气短无法离开房间、";
-//        }
-//        if (fatigue == 1) {
-//            bingqingDesc += "可体力劳动但觉得累、";
-//        } else if (fatigue == 2) {
-//            bingqingDesc += "轻体力劳动后长时间不能恢复、";
-//        } else if (fatigue == 3) {
-//            bingqingDesc += "不能正常生活、";
-//        }
-//        if (diarrhea == 1) {
-//            bingqingDesc += "轻度腹泻少于于3次、";
-//        } else if (diarrhea == 2) {
-//            bingqingDesc += "中度腹泻4-6次、";
-//        } else if (diarrhea == 3) {
-//            bingqingDesc += "重度腹泻超过6次、";
-//        }
-//
-//        if (!Strings.isNullOrEmpty(statusDesp)) {
-//            bingqingDesc += statusDesp;
-//            bingqingDesc += "、";
-//        }
-//        if (!Strings.isNullOrEmpty(others)) {
-//            bingqingDesc += others;
-//        }
-//        return bingqingDesc;
-//    }
+    @ExcelProperty(value = "身体基本情况", index = 13)
+    private String baseDesc;
+    public String getBaseDesc() {
+        if (familyStatus == 0) {
+            baseDesc = "无病史";
+        } else if (familyStatus == 1) {
+            baseDesc = "心血管疾病（服用ARB）";
+        } else if (familyStatus == 2) {
+            baseDesc = "心血管疾病（未服用ARB）";
+        } else if (familyStatus == 3) {
+            baseDesc = "呼吸系统病史";
+        } else if (familyStatus == 4) {
+            baseDesc = "肿瘤病史";
+        } else if (familyStatus == 5) {
+            baseDesc = "糖尿病史";
+        } else if (familyStatus == 6) {
+            baseDesc = "服用过激素药物";
+        } else if (familyStatus == 7) {
+            baseDesc = "妊娠期";
+        } else {
+            baseDesc = "其他";
+        }
+        return baseDesc;
+    }
+
+    @ExcelProperty(value = "病情描述", index = 14)
+    private String bingqingDesc = "";
+    public String getBingqingDesc() {
+
+        if (medical == 1) {
+            bingqingDesc += "已确诊、";
+        }
+
+        if (singleRoom == 1) {
+            bingqingDesc += "单间隔离、";
+        }
+
+        bingqingDesc = bingqingDesc + "体温：" + temperatureStr + "、";
+
+        if (cough == 1) {
+            bingqingDesc += "偶尔短暂咳嗽、";
+        } else if (cough == 2) {
+            bingqingDesc += "咳嗽轻度影响生活、";
+        } else if (cough == 3) {
+            bingqingDesc += "咳嗽严重影响生活、";
+        }
+        if (muscle == 1) {
+            bingqingDesc += "肌肉按压有酸痛、";
+        } else if (muscle == 2) {
+            bingqingDesc += "偶尔肌肉按压酸痛、";
+        } else if (muscle == 3) {
+            bingqingDesc += "肌肉按压持续酸痛、";
+        }
+        if (dyspnea == 1) {
+            bingqingDesc += "呼吸急走或上坡气短、";
+        } else if (dyspnea == 2) {
+            bingqingDesc += "呼吸气短而走路变慢、";
+        } else if (dyspnea == 3) {
+            bingqingDesc += "呼吸走路数分钟后气短、";
+        } else if (dyspnea == 4) {
+            bingqingDesc += "呼吸气短无法离开房间、";
+        }
+        if (fatigue == 1) {
+            bingqingDesc += "可体力劳动但觉得累、";
+        } else if (fatigue == 2) {
+            bingqingDesc += "轻体力劳动后长时间不能恢复、";
+        } else if (fatigue == 3) {
+            bingqingDesc += "不能正常生活、";
+        }
+        if (diarrhea == 1) {
+            bingqingDesc += "轻度腹泻少于于3次、";
+        } else if (diarrhea == 2) {
+            bingqingDesc += "中度腹泻4-6次、";
+        } else if (diarrhea == 3) {
+            bingqingDesc += "重度腹泻超过6次、";
+        }
+
+        if (!Strings.isNullOrEmpty(statusDesp)) {
+            bingqingDesc += statusDesp;
+            bingqingDesc += "、";
+        }
+        if (!Strings.isNullOrEmpty(others)) {
+            bingqingDesc += others;
+        }
+        return bingqingDesc;
+    }
 }

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLY.java

@@ -1,6 +1,7 @@
 package com.bofeng.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.base.Strings;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,6 +14,7 @@ public class ExcelRiBaoLY {
     private String ridgepole;
     private String unit;
     private String doorplate;
+    private BigDecimal temperature;
     private int grender;
     private int familyStatus;
     private int medical;
@@ -87,8 +89,14 @@ public class ExcelRiBaoLY {
 //    @ExcelProperty(value = "年龄", index = 11)
 //    private String age;
 
+
     @ExcelProperty(value = "体温", index = 10)
-    private BigDecimal temperature;
+    private String temperatureStr;
+    public String getTemperatureStr() {
+        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        return temperatureStr;
+    }
+
 
     @ExcelProperty(value = "确诊", index = 11)
     private String medicalStr;
@@ -112,90 +120,90 @@ public class ExcelRiBaoLY {
         return singleRoomStr;
     }
 
-//    @ExcelProperty(value = "身体基本情况", index = 14)
-//    private String baseDesc;
-//    public String getBaseDesc() {
-//        if (familyStatus == 0) {
-//            baseDesc = "无病史";
-//        } else if (familyStatus == 1) {
-//            baseDesc = "心血管疾病（服用ARB）";
-//        } else if (familyStatus == 2) {
-//            baseDesc = "心血管疾病（未服用ARB）";
-//        } else if (familyStatus == 3) {
-//            baseDesc = "呼吸系统病史";
-//        } else if (familyStatus == 4) {
-//            baseDesc = "肿瘤病史";
-//        } else if (familyStatus == 5) {
-//            baseDesc = "糖尿病史";
-//        } else if (familyStatus == 6) {
-//            baseDesc = "服用过激素药物";
-//        } else if (familyStatus == 7) {
-//            baseDesc = "妊娠期";
-//        } else {
-//            baseDesc = "其他";
-//        }
-//        return baseDesc;
-//    }
-//
-//    @ExcelProperty(value = "病情描述", index = 15)
-//    private String bingqingDesc = "";
-//    public String getBingqingDesc() {
-//
-//        if (medical == 1) {
-//            bingqingDesc += "已确诊、";
-//        }
-//
-//        if (singleRoom == 1) {
-//            bingqingDesc += "单间隔离、";
-//        }
-//
-//        bingqingDesc = bingqingDesc + "体温：" + temperature + "、";
-//
-//        if (cough == 1) {
-//            bingqingDesc += "偶尔短暂咳嗽、";
-//        } else if (cough == 2) {
-//            bingqingDesc += "咳嗽轻度影响生活、";
-//        } else if (cough == 3) {
-//            bingqingDesc += "咳嗽严重影响生活、";
-//        }
-//        if (muscle == 1) {
-//            bingqingDesc += "肌肉按压有酸痛、";
-//        } else if (muscle == 2) {
-//            bingqingDesc += "偶尔肌肉按压酸痛、";
-//        } else if (muscle == 3) {
-//            bingqingDesc += "肌肉按压持续酸痛、";
-//        }
-//        if (dyspnea == 1) {
-//            bingqingDesc += "呼吸急走或上坡气短、";
-//        } else if (dyspnea == 2) {
-//            bingqingDesc += "呼吸气短而走路变慢、";
-//        } else if (dyspnea == 3) {
-//            bingqingDesc += "呼吸走路数分钟后气短、";
-//        } else if (dyspnea == 4) {
-//            bingqingDesc += "呼吸气短无法离开房间、";
-//        }
-//        if (fatigue == 1) {
-//            bingqingDesc += "可体力劳动但觉得累、";
-//        } else if (fatigue == 2) {
-//            bingqingDesc += "轻体力劳动后长时间不能恢复、";
-//        } else if (fatigue == 3) {
-//            bingqingDesc += "不能正常生活、";
-//        }
-//        if (diarrhea == 1) {
-//            bingqingDesc += "轻度腹泻少于于3次、";
-//        } else if (diarrhea == 2) {
-//            bingqingDesc += "中度腹泻4-6次、";
-//        } else if (diarrhea == 3) {
-//            bingqingDesc += "重度腹泻超过6次、";
-//        }
-//
-//        if (!Strings.isNullOrEmpty(statusDesp)) {
-//            bingqingDesc += statusDesp;
-//            bingqingDesc += "、";
-//        }
-//        if (!Strings.isNullOrEmpty(others)) {
-//            bingqingDesc += others;
-//        }
-//        return bingqingDesc;
-//    }
+    @ExcelProperty(value = "身体基本情况", index = 13)
+    private String baseDesc;
+    public String getBaseDesc() {
+        if (familyStatus == 0) {
+            baseDesc = "无病史";
+        } else if (familyStatus == 1) {
+            baseDesc = "心血管疾病（服用ARB）";
+        } else if (familyStatus == 2) {
+            baseDesc = "心血管疾病（未服用ARB）";
+        } else if (familyStatus == 3) {
+            baseDesc = "呼吸系统病史";
+        } else if (familyStatus == 4) {
+            baseDesc = "肿瘤病史";
+        } else if (familyStatus == 5) {
+            baseDesc = "糖尿病史";
+        } else if (familyStatus == 6) {
+            baseDesc = "服用过激素药物";
+        } else if (familyStatus == 7) {
+            baseDesc = "妊娠期";
+        } else {
+            baseDesc = "其他";
+        }
+        return baseDesc;
+    }
+
+    @ExcelProperty(value = "病情描述", index = 14)
+    private String bingqingDesc = "";
+    public String getBingqingDesc() {
+
+        if (medical == 1) {
+            bingqingDesc += "已确诊、";
+        }
+
+        if (singleRoom == 1) {
+            bingqingDesc += "单间隔离、";
+        }
+
+        bingqingDesc = bingqingDesc + "体温：" + temperatureStr + "、";
+
+        if (cough == 1) {
+            bingqingDesc += "偶尔短暂咳嗽、";
+        } else if (cough == 2) {
+            bingqingDesc += "咳嗽轻度影响生活、";
+        } else if (cough == 3) {
+            bingqingDesc += "咳嗽严重影响生活、";
+        }
+        if (muscle == 1) {
+            bingqingDesc += "肌肉按压有酸痛、";
+        } else if (muscle == 2) {
+            bingqingDesc += "偶尔肌肉按压酸痛、";
+        } else if (muscle == 3) {
+            bingqingDesc += "肌肉按压持续酸痛、";
+        }
+        if (dyspnea == 1) {
+            bingqingDesc += "呼吸急走或上坡气短、";
+        } else if (dyspnea == 2) {
+            bingqingDesc += "呼吸气短而走路变慢、";
+        } else if (dyspnea == 3) {
+            bingqingDesc += "呼吸走路数分钟后气短、";
+        } else if (dyspnea == 4) {
+            bingqingDesc += "呼吸气短无法离开房间、";
+        }
+        if (fatigue == 1) {
+            bingqingDesc += "可体力劳动但觉得累、";
+        } else if (fatigue == 2) {
+            bingqingDesc += "轻体力劳动后长时间不能恢复、";
+        } else if (fatigue == 3) {
+            bingqingDesc += "不能正常生活、";
+        }
+        if (diarrhea == 1) {
+            bingqingDesc += "轻度腹泻少于于3次、";
+        } else if (diarrhea == 2) {
+            bingqingDesc += "中度腹泻4-6次、";
+        } else if (diarrhea == 3) {
+            bingqingDesc += "重度腹泻超过6次、";
+        }
+
+        if (!Strings.isNullOrEmpty(statusDesp)) {
+            bingqingDesc += statusDesp;
+            bingqingDesc += "、";
+        }
+        if (!Strings.isNullOrEmpty(others)) {
+            bingqingDesc += others;
+        }
+        return bingqingDesc;
+    }
 }

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoPrivate.java

@@ -14,6 +14,7 @@ public class ExcelRiBaoPrivate {
     private String ridgepole;
     private String unit;
     private String doorplate;
+    private BigDecimal temperature;
     private int grender;
     private int familyStatus;
     private int medical;
@@ -23,6 +24,7 @@ public class ExcelRiBaoPrivate {
     private int fatigue;
     private int diarrhea;
     private int singleRoom;
+    private int scoreRezult;
     private String statusDesp = "";
     private String others = "";
 
@@ -98,7 +100,11 @@ public class ExcelRiBaoPrivate {
     private String age;
 
     @ExcelProperty(value = "体温", index = 13)
-    private BigDecimal temperature;
+    private String temperatureStr;
+    public String getTemperatureStr() {
+        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        return temperatureStr;
+    }
 
     @ExcelProperty(value = "确诊", index = 14)
     private String medicalStr;
@@ -159,7 +165,7 @@ public class ExcelRiBaoPrivate {
             bingqingDesc += "单间隔离、";
         }
 
-        bingqingDesc = bingqingDesc + "体温：" + temperature + "、";
+        bingqingDesc = bingqingDesc + "体温：" + temperatureStr + "、";
 
         if (cough == 1) {
             bingqingDesc += "偶尔短暂咳嗽、";
@@ -208,4 +214,25 @@ public class ExcelRiBaoPrivate {
         }
         return bingqingDesc;
     }
+
+
+    @ExcelProperty(value = "健康评估", index = 18)
+    private String scoreRezultStr;
+    public String getScoreRezultStr() {
+        if (scoreRezult == 0) {
+            scoreRezultStr = "未评估";
+        } else if (scoreRezult == 1) {
+            scoreRezultStr = "正常";
+        } else if (scoreRezult == 2) {
+            scoreRezultStr = "注意观察";
+        } else if (scoreRezult == 3) {
+            scoreRezultStr = "联系医生";
+        } else if (scoreRezult == 4) {
+            scoreRezultStr = "尽快就诊";
+        } else {
+            scoreRezultStr = "";
+        }
+        return scoreRezultStr;
+    }
+
 }

whepi-web/src/main/java/com/bofeng/entity/JmTuangouMember.java

@@ -7,32 +7,64 @@ import lombok.Data;
 public class JmTuangouMember {
 
     /**
+     * 团购标题
+     */
+    @ExcelProperty(value = "团购标题", index = 0)
+    private String tgTitle;
+
+    /**
+     * 团购供应商
+     */
+    @ExcelProperty(value = "团购供应商", index = 1)
+    private String tgSupplier;
+
+    /**
+     * 团购物资（套餐）
+     */
+    @ExcelProperty(value = "团购物资（套餐）", index = 2)
+    private String tgGoods;
+
+    /**
+     * 价格
+     */
+    @ExcelProperty(value = "价格", index = 3)
+    private String tgPrice;
+
+    /**
+     * 最小起订量
+     */
+    @ExcelProperty(value = "最小起订量", index = 4)
+    private Integer tgMinNum;
+    /**
+     * 小区名称
+     */
+    @ExcelProperty(value = "小区名称", index = 5)
+    private String uptownName;
+    /**
      * 栋
      */
-    @ExcelProperty(value = "楼栋", index = 0)
+    @ExcelProperty(value = "楼栋", index = 6)
     private String ridgepole;
     /**
      * 单元
      */
-    @ExcelProperty(value = "单元", index = 1)
+    @ExcelProperty(value = "单元", index = 7)
     private String unit;
     /**
      * 门牌号
      */
-    @ExcelProperty(value = "门牌号", index = 2)
+    @ExcelProperty(value = "门牌号", index = 8)
     private String houseNumber;
     /**
      * 参团数量
      */
-    @ExcelProperty(value = "参团数量", index = 3)
+    @ExcelProperty(value = "参团数量", index = 9)
     private Integer buyCount;
     /**
      * 联系方式
      */
-    @ExcelProperty(value = "联系方式", index = 4)
+    @ExcelProperty(value = "联系方式", index = 10)
     private String phone;
 
     private Integer uptownId;
-
-    private String uptownName;
 }

whepi-web/src/main/java/com/bofeng/entity/MsSuspected.java

@@ -93,7 +93,7 @@ public class MsSuspected {
     private Integer score;
 
     @TableField("score_rezult")
-    private Integer scoreRezult;
+    private Integer score_rezult;
 
     @TableField(exist = false)
     private String diarrheaStr = "";

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

@@ -226,7 +226,9 @@ public class YeWeiHuiController {
     public void exportRiBao(@Pd(name = "uptownId") Long uptownId,
                             @Pd(name = "date") String date,
                             HttpServletResponse resp) {
-
+        if (uptownId == 1238790987234L) {
+            return;
+        }
         Uptown uptown = uptownMapper.selectById(uptownId);
         if (uptown!=null && uptown.getUptownId()>0) {
             Long upId = uptown.getUptownId();

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

@@ -3,18 +3,23 @@
 <mapper namespace="com.bofeng.dao.JmTuangouMemberDao">
 
     <select id="querMemberListByJmId" resultType="com.bofeng.entity.JmTuangouMember">
-        select a.user_id,a.buy_count,a.phone, y.houseNumber, y.ridgepole, y.unit, y.uptown_id, y.uptown_name from jm_buy a
-        LEFT JOIN
-          (
-              select a.user_id, b.house_id, b.doorplate as houseNumber, c.uptown_id, c.ridgepole, c.unit, u.uptown_name
-              FROM sys_user_role a
-                       INNER JOIN sys_uptown_house b on a.property_id=b.house_id
-                       INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
-                       INNER JOIN sys_uptown u on u.uptown_id = c.uptown_id
-              where a.user_id in (select user_id from jm_buy where jm_id=#{JmId})
-          ) y
-          on a.user_id=y.user_id
-        where a.jm_id=#{JmId}
+        select a.user_id,a.buy_count,a.phone, y.houseNumber, y.ridgepole, y.unit, y.uptown_id, y.uptown_name, z.tg_title, z.tg_supplier, z.tg_goods, z.tg_price, z.tg_min_num from jm_buy a
+           LEFT JOIN
+       (
+           select a.user_id, b.house_id, b.doorplate as houseNumber, c.uptown_id, c.ridgepole, c.unit, u.uptown_name
+           FROM sys_user_role a
+                    INNER JOIN sys_uptown_house b on a.property_id=b.house_id
+                    INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
+                    INNER JOIN sys_uptown u on u.uptown_id = c.uptown_id
+           where a.user_id in (select user_id from jm_buy where jm_id=#{JmId})
+       ) y
+       on a.user_id=y.user_id
+           LEFT JOIN
+       (
+           SELECT * FROM jm_tuangou
+       ) z
+       on a.jm_id=z.jm_id
+        where a.jm_id=#{JmId} and a.buy_status=1
     </select>
 
 </mapper>