Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/tugou/dialogTugou.js

@@ -36,7 +36,7 @@ define(function (require) {
     return {
       xtype: 'dialog',
       dialogId: 'dialogTugou',
-      title: context.isEdit ? '取消团购信息' : '新增团购信息',
+      title: context.isEdit ? '取消团购信息' : '新增需求发布',
       width: '100%',
       height: '100%',
       onOpen: function () {
@@ -93,6 +93,7 @@ define(function (require) {
               }, {id: '5', text: '其他服务'}],
               width: 450,
               height: 35,
+              required: true,
               onChange: function (data) {
 
               },
@@ -105,9 +106,9 @@ define(function (require) {
             },
               {
                 name: 'tgSupplier',
-                label: '指挥者',
+                label: '指挥部',
                 xtype: 'hidden',
-                value:'指挥者',
+                value:'指挥部',
               }
             ],
             [{
@@ -159,10 +160,10 @@ define(function (require) {
               $.yvan.msg('请先选择小区');
               return;
             }
-           /* if ($form.formGet().tgMinNum > $form.formGet().tgMaxNum) {
+            if ($form.formGet().tgMinNum > $form.formGet().tgMaxNum) {
               $.yvan.msg('最大上限必须大于等于最小起订量');
               return;
-            }*/
+            }
             if ($form.formGet().tgEndTime > $form.formGet().tgDeliverTime) {
               $.yvan.msg('团购截止时间必须小于预计送货时间');
               return;
@@ -178,7 +179,8 @@ define(function (require) {
               url: (context.isEdit ? api('/yeweihui/tgStatus') : api('/yeweihui/tgPublish')),
               success: function (data) {
                 isLoading = false;
-                if (data.data == 1) {
+                console.log("返回数据", data);
+                if (data.success == true) {
                   $.yvan.msg('保存成功');
                   $dlg.window('close');
                   if ($.type(context.confirm) === 'function') {

admin-ui/app/whepi/tugou/import.js

@@ -13,15 +13,15 @@ define(function (require) {
     }
 
 
-
     function queryGrid() {
       $grid1.jqGrid("clearGridData");
       var queryForm = $form.formGet();
-      $grid1.reload({
-        mtype: 'POST',
-        url: api('/zhihuibu/tgDetail'),
-        queryParams: queryForm
-      }, true);
+      queryForm.jmId = context.jmId,
+        $grid1.reload({
+          mtype: 'POST',
+          url: api('/zhihuibu/tgDetail'),
+          queryParams: queryForm
+        }, true);
     }
 
     var queryToolbar = {
@@ -70,10 +70,11 @@ define(function (require) {
       items: [
         {
           text: '导出excel', iconCls: 'fa fa-external-link-square', onClick: function () {
+            var queryForm = $form.formGet();
             $.yvan.download({
-              method: 'get',
-              url: api('/sys/importExcel/errorPeopleInfo'),
-              fileName: '人员基本信息错误数据-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
+              method: 'GET',
+              url: api('/tuangou/member/list/exportList?jmId=' + context.jmId + "&queryProperties=" + queryForm.queryProperties),
+              fileName: '资源需求物资-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
             });
           }
         },
@@ -108,18 +109,14 @@ define(function (require) {
           autoSizeColumns: true,
           xtype: 'grid',
           toolbar: gridToolbar2,
-          idField: 'peopleId',
           columns: [[
-            {field: 'peopleId', hidden: true},
-            {field: 'excelNum', title: '序号', align: "right", maxWidth: 100, },
-            {field: 'peopleCode', title: '小区名称', minWidth: 100, maxWidth: 200},
-            {field: 'name', title: '楼栋', minWidth: 100, maxWidth: 200},
-            {field: 'nativePlace', title: '单元', minWidth: 100, maxWidth: 200},
-            {field: 'birthday', title: '门牌号', minWidth: 100, maxWidth: 200},
-            {field: 'joIdAffiliated', title: '数量', minWidth: 100, maxWidth: 200},
-            {field: 'joIdCode', title: '联系方式', minWidth: 100, maxWidth: 200},
-            {field: 'phone', title: '需求备注', minWidth: 100, maxWidth: 200},
-
+            {field: 'uptownName', title: '小区名称', align: 'left'},
+            {field: 'ridgepole', title: '楼栋', align: 'left'},
+            {field: 'unit', title: '单元', align: 'left'},
+            {field: 'houseNumber', title: '门牌号', align: 'left'},
+            {field: 'buyCount', title: '数量', align: 'left'},
+            {field: 'phone', title: '联系方式', align: 'center'},
+            {field: 'myRemark', title: '需求备注', minWidth: 100, maxWidth: 200},
           ]],
         }
       }

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

@@ -170,14 +170,14 @@ define(function (require) {
                 $.yvan.msg('在团状态才能完成');
                 return;
               }
-              $.yvan.confirm('是否' + "<span style='color: green; font-weight:bold;'>发布</span>" + '[' + (row.joName) + ']任务？', {
+              $.yvan.confirm('是否' + "<span style='color: green; font-weight:bold;'>完成</span>" + '[' + (row.tgTitle) + ']吗？', {
                 yes: function (index) {
                   $.yvan.ajax({
                     method: 'post',
                     url: api('/yeweihui/updateStatus'),
                     data: {
                       jmId: row.jmId,
-                      tgStatus: 2,
+                      tgStatus: 3,
                     },
                     success: function (data) {
                       $.yvan.msg('完成');
@@ -252,7 +252,7 @@ define(function (require) {
                         }
                       }
                     },
-                    {field: 'tgSupplier', title: '组织者', maxWidth: 200,},
+                    // {field: 'tgSupplier', title: '组织者', maxWidth: 200,},
                     {
                       field: 'tgGoods',
                       title: '套餐描述', maxWidth: 200,

whepi-ui/templates/groupBuying/groupBuyingXx.ftl

@@ -57,6 +57,9 @@
                     <span class="weui-loadmore__tips">参团状态</span>
                     <div class="weui-cells__title">在团</div>
                 </div>
+                <#if tgItem.roleType==1>
+                    <p id="gb_ck4" class="weui-btn weui-btn_primary">查看参团信息</p>
+                </#if>
             </div>
         </#if>
         <#if isMine=='mine' && tgItem.tgStatus==2>
@@ -80,6 +83,9 @@
                     <span class="weui-loadmore__tips">参团状态</span>
                     <div class="weui-cells__title">发货</div>
                 </div>
+                <#if tgItem.roleType==1>
+                    <p id="gb_ck5" class="weui-btn weui-btn_primary">查看参团信息</p>
+                </#if>
             </div>
         </#if>
         <#if isMine=='mine' && tgItem.tgStatus==3>
@@ -102,6 +108,9 @@
                     <span class="weui-loadmore__tips">参团状态</span>
                     <div class="weui-cells__title">完成</div>
                 </div>
+                <#if tgItem.roleType==1>
+                    <p id="gb_ck6" class="weui-btn weui-btn_primary">查看参团信息</p>
+                </#if>
             </div>
         </#if>
         <#if tgItem.tgStatus==4>
@@ -153,6 +162,18 @@
         window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
     });
 
+    $('#gb_ck4').on('click', function () {
+        window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
+    });
+
+    $('#gb_ck5').on('click', function () {
+        window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
+    });
+
+    $('#gb_ck6').on('click', function () {
+        window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
+    });
+
     function goback() {
         window.location.href = "/yeweihui/home.html?show=tuangou&userId=" + userId;
     }

whepi-ui/templates/home/buyClient.ftl

@@ -45,7 +45,7 @@
         ">备     注:
     </div>
     <textarea id="Myremarks" class="weui-textarea" placeholder="输入内容（200字内）" rows="3"
-              style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
+              style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;" maxlength="200"></textarea>
 </div>
     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh; margin-bottom: 5vh;">
     <#if type==1>

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

@@ -35,6 +35,8 @@ public interface JmTuangouDao extends BaseMapper<JmTuangou> {
 
   int updateAll(@Param("tg") List<JmTuangou> tg);
 
+  Integer insertJmTuangouList(@Param("tgList") List<JmTuangou> tgList);
+
   JmTuangou selectByUserId();
 
   JmTuangou getSelectOne(@Param("jmId") Long jmId);

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

@@ -2,11 +2,13 @@ package com.bofeng.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.JmTuangouMember;
+import com.yvan.PageDb;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @Repository
@@ -14,4 +16,8 @@ public interface JmTuangouMemberDao extends BaseMapper<JmTuangouMember> {
 
     List<JmTuangouMember> querMemberListByJmId(@Param("JmId") Long JmId);
 
+    List<JmTuangouMember> querMemberListByJmIdXX(Map<String, Object> queryParam);
+
+    List<JmTuangouMember> querMemberListByJmIdexport(@Param("JmId") Long JmId,@Param("queryProperties")String queryProperties,PageDb pageDb);
+
 }

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

@@ -51,16 +51,16 @@ public class JmTuangou implements Serializable {
     /**
      * 价格
      */
-    private String tgPrice;
+    private String tgPrice = "";
 
     /**
      * 最低起送
      */
-    private Integer tgMinNum;
+    private Integer tgMinNum = 0;
     /**
      * 最大订量
      */
-    private Integer tgMaxNum;
+    private Integer tgMaxNum = 0;
 
     @TableField(exist = false)
     private Integer currentNum;
@@ -99,7 +99,7 @@ public class JmTuangou implements Serializable {
     /**
      * 增补修订
      */
-    private String remark;
+    private String remark = "";
 
     /**
      * 团购状态：1在团，2发货，3完成，4取消

whepi-web/src/main/java/com/bofeng/service/JmTuangouMemberService.java

@@ -2,11 +2,13 @@ package com.bofeng.service;
 
 import com.bofeng.dao.JmTuangouMemberDao;
 import com.bofeng.entity.JmTuangouMember;
+import com.yvan.PageDb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional(readOnly = true)
@@ -18,4 +20,11 @@ public class JmTuangouMemberService {
     public List<JmTuangouMember> querMemberListByJmId (Long jmId) {
         return jmTuangouMemberDao.querMemberListByJmId(jmId);
     }
+
+    public List<JmTuangouMember> querMemberListByJmIdXX (Map<String, Object> queryParam) {
+        return jmTuangouMemberDao.querMemberListByJmIdXX(queryParam);
+    }
+    public List<JmTuangouMember> querMemberListByJmIdexport (Long jmId, String queryProperties,PageDb pageDb) {
+        return jmTuangouMemberDao.querMemberListByJmIdexport(jmId,queryProperties,pageDb);
+    }
 }

whepi-web/src/main/java/com/bofeng/service/JmTuangouService.java

@@ -9,17 +9,16 @@ import com.bofeng.dao.YeweihuiUserRoleMapper;
 import com.bofeng.entity.JmTuangou;
 import com.bofeng.entity.UserOpen;
 import com.yvan.PageDb;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 @Transactional(readOnly = true)
@@ -86,12 +85,12 @@ public class JmTuangouService {
   }
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-  public Integer whepiTuangouPublish(String uptownIds, JmTuangou jmTuangou) {
+  public Integer whepiTuangouPublish(String uptownIds, JmTuangou jmTuangou) throws InvocationTargetException, IllegalAccessException {
     Calendar cal = Calendar.getInstance();
     int moth = cal.get(Calendar.MONTH) + 1;
     int date = cal.get(Calendar.DAY_OF_MONTH);
-    Integer success = 0;
     List<String> uptownIdArray = Arrays.asList(uptownIds.split(","));
+    ArrayList tgList = new ArrayList();
     for (String uptownId : uptownIdArray) {
 
       jmTuangou.setJmId(IdWorker.getId());
@@ -100,6 +99,7 @@ public class JmTuangouService {
 
       jmTuangou.setTgStatus(1);
       jmTuangou.setRoleType(1);
+      jmTuangou.setUserCreate(JwtHelper.getUserId());
       jmTuangou.setUserUpdate(JwtHelper.getUserId());
 
       if (jmTuangou.getTgType() == 1) {
@@ -118,13 +118,31 @@ public class JmTuangouService {
 
       }
       jmTuangou.setUserId(JwtHelper.getUserId());
-      success = jmTuangouDao.insert(jmTuangou);
-      if (success == 1) {
-        List<UserOpen> userList = userOpenMapper.getUsersByUptownId(Long.parseLong(uptownId));
-        for (UserOpen user : userList) {
-          epiTemplateMessageService.tuangouSendRemindMessage(user.getUserId(), user.getOpenId(), jmTuangou.getTgEndTime());
-        }
+
+      if (jmTuangou.getTgMinNum() == null) {
+        jmTuangou.setTgMinNum(0);
+      }
+      if (jmTuangou.getTgMaxNum() == null) {
+        jmTuangou.setTgMaxNum(0);
       }
+      JmTuangou jmTuangou1 = new JmTuangou();
+      BeanUtils.copyProperties(jmTuangou1, jmTuangou);
+      tgList.add(jmTuangou1);
+    }
+    Integer success = jmTuangouDao.insertJmTuangouList(tgList);
+    if (success > 0) {
+      Thread thread=new Thread(new Runnable() {
+        @Override
+        public void run() {
+          for (String uptownId : uptownIdArray) {
+            List<UserOpen> userList = userOpenMapper.getUsersByUptownId(Long.parseLong(uptownId));
+            for (UserOpen user : userList) {
+              epiTemplateMessageService.tuangouSendRemindMessage(user.getUserId(), user.getOpenId(), jmTuangou.getTgEndTime());
+            }
+          }
+        }
+      });
+      thread.start();
     }
     return success;
   }

whepi-web/src/main/java/com/bofeng/service/RiBaoService.java

@@ -139,6 +139,7 @@ public class RiBaoService {
                 msReport.setMsStatus(1);
             }
 
+            msReport.setReportStatus(0);
             msReportMapper.updateById(msReport);
         }
     }
@@ -152,6 +153,19 @@ public class RiBaoService {
         return msReport;
     }
 
+    public MsReport getRibaoWithDate(Long userCreate, String reportDate) {
+        List<MsReport> msReportList = msReportMapper.selectByReportDate(reportDate, userCreate);
+        if (CollectionUtils.isEmpty(msReportList)) {
+            return new MsReport();
+        }
+
+        MsReport msReport = msReportList.get(0);
+        String houseStr = this.getHouseStr(msReport.getHouseId());
+        msReport.setHouseIdStr(houseStr);
+
+        return msReport;
+    }
+
     //获取今天数据
     public String getHouseStr(Long houseId) {
         UptownHouse house = uptownHouseMapper.selectById(houseId);

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -156,7 +156,7 @@ public class WxController {
         btn31.setType(WxConsts.MenuButtonType.VIEW);
         btn31.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
-                                "/home/testOk.html",
+                                "/home/homeHelp.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
         val btn32 = new WxMenuButton();

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

@@ -49,6 +49,20 @@ public class RiBaoController {
 //    private String user_update;
 //    private String time_update;
 
+    //查询日历日报
+    @GetMapping("/riBao/getRibaoWithDate")
+    public Model<MsReport> getRibaoWithDate(@Pd(name = "userCreate") Long userCreate, @Pd(name = "reportDate") String reportDate) {
+        MsReport msReport = riBaoService.getRibaoWithDate(userCreate, reportDate);
+        return Model.newSuccess(msReport);
+    }
+
+    // 查询日历日报关联的家人列表
+    @GetMapping("/riBao/queryRibaoDetailListWithDate")
+    public Model<List<MsSuspected>> queryRibaoDetailListWithDate(@Pd(name = "reportId") Long reportId) {
+        List<MsSuspected> listSuspected = riBaoService.queryRibaoDetailList(reportId);
+        return Model.newSuccess(listSuspected);
+    }
+
 
     //查询日报
     @GetMapping("/riBao/getRibao")

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

@@ -65,10 +65,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() + "\"");
@@ -116,7 +116,7 @@ public class UserOpenController {
     })
     @GetMapping("/tuangou/home.html")
     public ModelAndView tuangouHome(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
-                             @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
+                                    @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
@@ -244,10 +244,10 @@ public class UserOpenController {
 
     @GetMapping("/home/testOk.html")
     public ModelAndView testOk(ModelMap model, HttpServletResponse response) {
-        response.setHeader("Access-Control-Allow-Credentials","true");
-        response.setHeader("Access-Control-Allow-Origin","*");
-        response.setHeader("Access-Control-Allow-Methods","GET,POST,OPTIONS,DELETE");
-        response.setHeader("Access-Control-Max-Age","3600");
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "GET,POST,OPTIONS,DELETE");
+        response.setHeader("Access-Control-Max-Age", "3600");
         response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
 
         return new ModelAndView("/ok.html", model);

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

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Map;
 
@@ -343,6 +344,12 @@ public class YeWeiHuiController {
     ExcelUtils.writeSheet(JmTuangouMember.class, members).export(resp, fileName);
 
   }
+  @GetMapping("/whepi/tuangou/member/list/exportList")
+  @SneakyThrows
+  public void tgMembersExport(HttpParameterParser parser,HttpServletResponse resp) {
+    List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmIdXX(parser.getMap());
+    ExcelUtils.writeSheet(JmTuangouMember.class, members).export(resp,"团购家庭信息");
+  }
 
   @PostMapping("/yeweihui/groupBuyingCx/remark/add.json")
   public Model groupBuyingCxRemarkAdd(@Pd(name = "jmId") Long jmId, @Pd(name = "status", required = false, defaultValue = "0") Long status, @Pd(name = "remark", required = false) String remark) {
@@ -380,7 +387,7 @@ public class YeWeiHuiController {
   }
 
   @PostMapping("/whepi/yeweihui/tgPublish")
-  public ModelOps whepiTuangouPublish(@JsonBody JmTuangou jmTuangou) {
+  public ModelOps whepiTuangouPublish(@JsonBody JmTuangou jmTuangou) throws InvocationTargetException, IllegalAccessException {
 
     int success = jmTuangouService.whepiTuangouPublish(jmTuangou.getUptownIds(), jmTuangou);
     return ModelOps.newSuccess(success);
@@ -431,9 +438,9 @@ public class YeWeiHuiController {
   }
 
   @PostMapping("/whepi/zhihuibu/tgDetail")
-  public Model groupBuyingXx(@Pd(name = "jmId") Long jmId) {
-    List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
-    return Model.newSuccess(members);
+  public Model<List<JmTuangouMember>> groupBuyingXx(@Pd(name = "jmId") Long jmId,@Pd(name = "queryProperties",required = false)String queryProperties,PageDb pageDb) {
+    List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmIdexport(jmId,queryProperties,pageDb);
+    return Model.newSuccess(pageDb,members);
   }
 
 

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: guojing
+  profiles.active: lll
 
   application:
     name: bofeng-web

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

@@ -79,6 +79,13 @@
         </foreach>
     </update>
 
+    <insert id="insertJmTuangouList">
+        insert into jm_tuangou (jm_id, user_id, uptown_id, tg_title, tg_type, tg_supplier, tg_goods, tg_price, tg_min_num, tg_end_time, tg_deliver_time, tg_phone_number, role_type, remark, tg_status, tg_max_num, user_create, time_create, user_update, time_update) VALUES
+        <foreach collection="tgList" item="tg" separator=",">
+            (#{tg.jmId}, #{tg.userId}, #{tg.uptownId}, #{tg.tgTitle}, #{tg.tgType}, #{tg.tgSupplier}, #{tg.tgGoods}, #{tg.tgPrice}, #{tg.tgMinNum}, #{tg.tgEndTime}, #{tg.tgDeliverTime}, #{tg.tgPhoneNumber}, #{tg.roleType}, #{tg.remark}, #{tg.tgStatus}, #{tg.tgMaxNum}, #{tg.userCreate}, now(), #{tg.userCreate}, now())
+        </foreach>
+    </insert>
+
     <select id="selectByUserId" resultType="com.bofeng.entity.JmTuangou">
         select * from sys_user limit 1
     </select>

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

@@ -22,4 +22,58 @@
         where a.jm_id=#{JmId} and a.buy_status=1
     </select>
 
+    <select id="querMemberListByJmIdXX" resultType="com.bofeng.entity.JmTuangouMember">
+        select a.user_id,a.buy_count, a.buy_money, a.phone, a.my_remark, 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, z.tg_max_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})
+        <if test="queryProperties!=null and queryProperties!=''">
+            and u.uptown_name like concat('%',#{queryProperties},'%')
+        </if>
+        ) 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
+        <if test="queryProperties!=null and queryProperties!=''">
+            and y.uptown_name like concat('%',#{queryProperties},'%')
+        </if>
+    </select>
+
+    <select id="querMemberListByJmIdexport" resultType="com.bofeng.entity.JmTuangouMember">
+        select a.user_id,a.buy_count, a.buy_money, a.phone, a.my_remark, 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, z.tg_max_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
+        <if test="queryProperties!=null and queryProperties!=''">
+            and y.uptown_name like concat('%',#{queryProperties},'%')
+        </if>
+    </select>
+
 </mapper>