admin 2月15号

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

@@ -7,6 +7,29 @@ define(function (require) {
       console.log(data);
     }
 
+    //查询小区
+    function queryGrid2() {
+      var _datas = [];
+      $.yvan.ajax({
+        async: false,
+        method: 'post',
+        url: api('/getAllUptown'),
+        data: {userId: 0},
+        success: function (data) {
+          if (data.data != null && data.data != undefined) {
+            for (var i = 0; i < data.data.length; i++) {
+              _datas.push({
+                "id": data.data[i].uptownId,
+                "text": data.data[i].uptownName
+              })
+            }
+          }
+        }
+      });
+      return _datas;
+    }
+
+
     return {
       xtype: 'dialog',
       dialogId: 'dialogTugou',
@@ -39,16 +62,12 @@ define(function (require) {
           },
           items: [
             [
-              {name: 'uptownId', xtype: 'hidden'},
               {
                 xtype: 'yvselect',
-                name: 'uptownName',
+                name: 'uptownIds',
                 multiple: true,
                 label: '小区',
-                data: [{id: '1', text: '在团'}, {id: '2', text: '发货'}, {id: '3', text: '完成'}, {
-                  id: '4',
-                  text: '取消'
-                }],
+                data: queryGrid2(),
                 width: 900,
                 height: 35,
                 validType: 'isBlank',
@@ -114,6 +133,7 @@ define(function (require) {
               [{
                 name: 'remarks',
                 label: '备注',
+                multiline: true,
                 width: 900,
                 height: '100px',
                 maxlength: 500,
@@ -124,13 +144,13 @@ define(function (require) {
       buttons: [
         {
           text: "保存", iconCls: "fa fa-save", onClick: function () {
-            if ($form.formGet().uptownName.trim() == '' ) {
+            if ($form.formGet().uptownIds.trim() == '') {
               $.yvan.msg('请先选择小区');
               return;
             }
-            alert($form.formGet().uptownName)
+            console.log($form.formGet())
             $.yvan.postForm($form, {
-              url: (context.isEdit ? api('/record/CustInfo/update') : api('/record/CustInfo/insert')),
+              url: (context.isEdit ? api('/record/CustInfo/update') : api('/yeweihui/tgPublish')),
               success: function (data) {
                 if (data.data == 1) {
                   $.yvan.msg('保存成功');

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

@@ -15,11 +15,11 @@ define(function (require) {
 
       //　检索条件查询
       function queryGrid1() {
-        var queryUrl = '';// 自行替换此参数
+        var queryUrl = '/yeweihui/tglist';// 自行替换此参数
         var queryForm = $form.formGet();
         queryForm.roleCode = App.currentRoleCode;
         $grid1.reload({
-          mtype: 'GET',
+          mtype: 'POST',
           url: api(queryUrl),
           queryParams: queryForm
         }, true);

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

@@ -2,6 +2,7 @@ package com.bofeng.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.JmTuangou;
+import com.yvan.PageDb;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -20,7 +21,7 @@ public interface JmTuangouDao extends BaseMapper<JmTuangou> {
 
   List<JmTuangou> queryTuangouListByUserIdAndTitle(@Param("userId") Long userId, @Param("title") String title);
 
-  List<JmTuangou> whepiTuangoulist(@Param("userId") Long userId, @Param("uptownId") Long uptownId, @Param("queryProperties") String queryProperties, @Param("status") Long status);
+  List<JmTuangou> whepiTuangoulist(@Param("userId") Long userId, @Param("uptownId") Long uptownId, @Param("queryProperties") String queryProperties, @Param("status") Long status,PageDb pageDb);
 
   JmTuangou selectJmTuangouByJmId(@Param("JmId") Long JmId);
 
@@ -33,4 +34,6 @@ public interface JmTuangouDao extends BaseMapper<JmTuangou> {
   List<JmTuangou> selectAll();
 
   int updateAll(@Param("tg") List<JmTuangou> tg);
+
+  JmTuangou selectByUserId();
 }

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

@@ -60,6 +60,12 @@ public class JmTuangou implements Serializable {
     @TableField(exist = false)
     private Integer currentNum;
 
+    @TableField(exist = false)
+    private String uptownIds;
+
+    @TableField(exist = false)
+    private String uptownName;
+
     /**
      * 团购截止时间
      */

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

@@ -20,61 +20,60 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class JmTuangouService {
 
-    @Autowired
-    private BuyService buyService;
+  @Autowired
+  private BuyService buyService;
 
-    @Autowired
-    private JmTuangouDao jmTuangouDao;
+  @Autowired
+  private JmTuangouDao jmTuangouDao;
 
-    @Autowired
-    private YeweihuiUserRoleMapper yeweihuiUserRoleMapper;
+  @Autowired
+  private YeweihuiUserRoleMapper yeweihuiUserRoleMapper;
 
-    @Autowired
-    private YeweihuiSysOwnerMapper yeweihuiSysOwnerMapper;
+  @Autowired
+  private YeweihuiSysOwnerMapper yeweihuiSysOwnerMapper;
 
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Integer tuangouPublish(JmTuangou jmTuangou) {
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public Integer tuangouPublish(JmTuangou jmTuangou) {
 
-        jmTuangou.setJmId(IdWorker.getId());
+    jmTuangou.setJmId(IdWorker.getId());
 
-        Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(jmTuangou.getUserId());
-        Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
-        jmTuangou.setUptownId(uptownId);
+    Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(jmTuangou.getUserId());
+    Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
+    jmTuangou.setUptownId(uptownId);
 
-        jmTuangou.setTgStatus(1);
+    jmTuangou.setTgStatus(1);
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
-        Date tgEndTime = new Date();
-        Date tgDeliverTime = new Date();
-        try {
-            tgEndTime = sdf.parse(jmTuangou.getEndTime());
-            tgDeliverTime = sdf.parse(jmTuangou.getDeliverTime());
-        }
-        catch (ParseException e) {
-            e.printStackTrace();
-        }
+    Date tgEndTime = new Date();
+    Date tgDeliverTime = new Date();
+    try {
+      tgEndTime = sdf.parse(jmTuangou.getEndTime());
+      tgDeliverTime = sdf.parse(jmTuangou.getDeliverTime());
+    } catch (ParseException e) {
+      e.printStackTrace();
+    }
 
-        jmTuangou.setTgEndTime(tgEndTime);
-        jmTuangou.setTgDeliverTime(tgDeliverTime);
+    jmTuangou.setTgEndTime(tgEndTime);
+    jmTuangou.setTgDeliverTime(tgDeliverTime);
 
-        return jmTuangouDao.insert(jmTuangou);
-    }
+    return jmTuangouDao.insert(jmTuangou);
+  }
 
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Integer whepiTuangouPublish(String uptownIds, JmTuangou jmTuangou) {
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public Integer whepiTuangouPublish(String uptownIds, JmTuangou jmTuangou) {
 
-        Integer success = 0;
-        List<String> uptownIdArray = Arrays.asList(uptownIds.split(","));
-        for (String uptownId : uptownIdArray) {
+    Integer success = 0;
+    List<String> uptownIdArray = Arrays.asList(uptownIds.split(","));
+    for (String uptownId : uptownIdArray) {
 
-            jmTuangou.setJmId(IdWorker.getId());
+      jmTuangou.setJmId(IdWorker.getId());
 
-            jmTuangou.setUptownId(Long.parseLong(uptownId));
+      jmTuangou.setUptownId(Long.parseLong(uptownId));
 
-            jmTuangou.setTgStatus(1);
+      jmTuangou.setTgStatus(1);
 
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
             Date tgEndTime = new Date();
             Date tgDeliverTime = new Date();
@@ -86,62 +85,67 @@ public class JmTuangouService {
                 e.printStackTrace();
             }
 
-            jmTuangou.setTgEndTime(tgEndTime);
-            jmTuangou.setTgDeliverTime(tgDeliverTime);
-            success = jmTuangouDao.insert(jmTuangou);
-        }
-        return success;
+            jmTuangou.setTgEndTime(jmTuangou.gettgEndTime);
+            jmTuangou.setTgDeliverTime(tgDeliverTime);*/
+      jmTuangou.setUserId(jmTuangouDao.selectByUserId().getUserId());
+      success = jmTuangouDao.insert(jmTuangou);
     }
+    return success;
+  }
 
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public List<JmTuangou> queryTuangouListByTitle(Long userId, String title) {
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public List<JmTuangou> queryTuangouListByTitle(Long userId, String title) {
 
-        buyService.updateStatus();
+    buyService.updateStatus();
 
-        Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(userId);
-        Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
+    Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(userId);
+    Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
 
-        if (title.equals("")) {
-            return jmTuangouDao.queryTuangouListByUptownId(uptownId);
-        }
-        return jmTuangouDao.queryTuangouListByUptownIdAndTitle(uptownId, title);
+    if (title.equals("")) {
+      return jmTuangouDao.queryTuangouListByUptownId(uptownId);
     }
+    return jmTuangouDao.queryTuangouListByUptownIdAndTitle(uptownId, title);
+  }
 
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public List<JmTuangou> queryTuangouMyListByTitle(Long userId, String title) {
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public List<JmTuangou> queryTuangouMyListByTitle(Long userId, String title) {
 
-        buyService.updateStatus();
+    buyService.updateStatus();
 
-        if (title.equals("")) {
-            return jmTuangouDao.queryTuangouListByUserId(userId);
-        }
-        return jmTuangouDao.queryTuangouListByUserIdAndTitle(userId, title);
+    if (title.equals("")) {
+      return jmTuangouDao.queryTuangouListByUserId(userId);
     }
+    return jmTuangouDao.queryTuangouListByUserIdAndTitle(userId, title);
+  }
 
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public JmTuangou queryByJmId(Long jmId) {
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public JmTuangou queryByJmId(Long jmId) {
 
-        buyService.updateStatus();
+    buyService.updateStatus();
 
-        return jmTuangouDao.selectJmTuangouByJmId(jmId);
-    }
+    return jmTuangouDao.selectJmTuangouByJmId(jmId);
+  }
 
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public List<JmTuangou> whepiTuangoulist(Long userId, Long uptownId, String queryProperties, Long status) {
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public List<JmTuangou> whepiTuangoulist(Long userId, Long uptownId, String queryProperties, Long status, PageDb pageDb) {
 
-        buyService.updateStatus();
+    buyService.updateStatus();
 
-        return jmTuangouDao.whepiTuangoulist(userId, uptownId, queryProperties, status);
+    return jmTuangouDao.whepiTuangoulist(userId, uptownId, queryProperties, status, pageDb);
+  }
+
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public Integer updateRemarkByJmId(Long jmId, Long status, String remark) {
+    if (status == 0) {
+      return jmTuangouDao.updateRemarkByJmId(jmId, remark);
     }
+    if (remark.equals("")) {
 
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Integer updateRemarkByJmId(Long jmId, Long status, String remark) {
-        if (status == 0) {
-            return jmTuangouDao.updateRemarkByJmId(jmId, remark);
-        }
-        if (remark.equals("")) {
-            return jmTuangouDao.updateStatusByJmId(jmId, status);
-        }
-        return jmTuangouDao.updateStatusRemarkByJmId(jmId, status, remark);
     }
+    return jmTuangouDao.updateStatusRemarkByJmId(jmId, status, remark);
+  }
+
+  public JmTuangou selectByUserId() {
+    return jmTuangouDao.selectByUserId();
+  }
 }

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

@@ -11,6 +11,7 @@ import com.google.common.collect.Maps;
 import com.yvan.Model;
 import com.yvan.ModelOps;
 import com.yvan.PageDb;
+import com.yvan.mvc.JsonBody;
 import com.yvan.mvc.Pd;
 import com.yvan.platform.Conv;
 import com.yvan.platform.JsonWapper;
@@ -30,392 +31,371 @@ import java.util.Map;
 @RestController
 public class YeWeiHuiController {
 
-    @Autowired
-    private QzTaskService qzTaskService;
-    @Autowired
-    private RbService rbService;
+  @Autowired
+  private QzTaskService qzTaskService;
+  @Autowired
+  private RbService rbService;
 
-    @Autowired
-    private QzTaskReplyService qzTaskReplyService;
+  @Autowired
+  private QzTaskReplyService qzTaskReplyService;
 
-    @Autowired
-    private HomeService homeService;
+  @Autowired
+  private HomeService homeService;
 
-    @Autowired
-    private JmTuangouService jmTuangouService;
+  @Autowired
+  private JmTuangouService jmTuangouService;
 
-    @Autowired
-    private UptownMapper uptownMapper;
+  @Autowired
+  private UptownMapper uptownMapper;
 
-    @Autowired
-    private RbMapper rbMapper;
+  @Autowired
+  private RbMapper rbMapper;
 
-    @Autowired
-    private JmTuangouMemberService jmTuangouMemberService;
+  @Autowired
+  private JmTuangouMemberService jmTuangouMemberService;
 
-    @GetMapping("/yeweihui/home.html")
-    public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId, @RequestParam(value = "show", required = false, defaultValue = "-") String show) {
+  @GetMapping("/yeweihui/home.html")
+  public ModelAndView yeweihui(ModelMap model, @RequestParam(value = "userId") Long userId, @RequestParam(value = "show", required = false, defaultValue = "-") String show) {
 
 //        List<QzTask> taskList = qzTaskService.selectAll(1225321682867105793L);
 //        List<sysUptownUnit> rbList = rbService.selectAll(1225321682867105793L);
-        List<QzTask> taskList = qzTaskService.selectAll(userId);
-        List<sysUptownUnit> rbList = rbService.selectAll(userId);
-        model.put("taskList", YvanUtil.toJsonPretty(taskList));
-        model.put("rbList", YvanUtil.toJsonPretty(rbList));
-        model.put("user_id", "\""+userId+"\"");
-        model.put("show", "\""+show+"\"");
-
-        return new ModelAndView("/yeweihui/home.ftl", model);
-    }
+    List<QzTask> taskList = qzTaskService.selectAll(userId);
+    List<sysUptownUnit> rbList = rbService.selectAll(userId);
+    model.put("taskList", YvanUtil.toJsonPretty(taskList));
+    model.put("rbList", YvanUtil.toJsonPretty(rbList));
+    model.put("user_id", "\"" + userId + "\"");
+    model.put("show", "\"" + show + "\"");
+
+    return new ModelAndView("/yeweihui/home.ftl", model);
+  }
 
-    @GetMapping("/yeweihui/qiuzhuDetail.html")
-    public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId,@Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
+  @GetMapping("/yeweihui/qiuzhuDetail.html")
+  public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
 
-        QzTask task = qzTaskService.queryByTaskId(taskId);
+    QzTask task = qzTaskService.queryByTaskId(taskId);
 //        A业委会，B居委会，C物业，D志愿者
-        StringBuffer target = new StringBuffer();
-        if (task.getTaskTarget().equals("A")) {
-            target.append("业委会");
-        }
-        else if (task.getTaskTarget().equals("B")) {
-            if (target.length() > 0) {
-                target.append("、居委会");
-            }
-            else {
-                target.append("居委会");
-            }
-        }
-        else if (task.getTaskTarget().equals("C")) {
-            if (target.length() > 0) {
-                target.append("、物业");
-            }
-            else {
-                target.append("物业");
-            }
-        }
-        else if (task.getTaskTarget().equals("D")) {
-            if (target.length() > 0) {
-                target.append("、志愿者");
-            }
-            else {
-                target.append("志愿者");
-            }
-        }
-
-        task.setTaskTarget(target.toString());
-
-        model.put("taskJson", new JsonWapper(task));
-        model.put("task", task);
-        model.put("userId", "\""+userId+"\"");
-
-        return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
+    StringBuffer target = new StringBuffer();
+    if (task.getTaskTarget().equals("A")) {
+      target.append("业委会");
+    } else if (task.getTaskTarget().equals("B")) {
+      if (target.length() > 0) {
+        target.append("、居委会");
+      } else {
+        target.append("居委会");
+      }
+    } else if (task.getTaskTarget().equals("C")) {
+      if (target.length() > 0) {
+        target.append("、物业");
+      } else {
+        target.append("物业");
+      }
+    } else if (task.getTaskTarget().equals("D")) {
+      if (target.length() > 0) {
+        target.append("、志愿者");
+      } else {
+        target.append("志愿者");
+      }
     }
 
-    @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
-    public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
+    task.setTaskTarget(target.toString());
 
-        List<QzTask> taskList = qzTaskService.queryQzTaskByStatus(status);
+    model.put("taskJson", new JsonWapper(task));
+    model.put("task", task);
+    model.put("userId", "\"" + userId + "\"");
 
-        return Model.newSuccess(taskList);
-    }
+    return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
+  }
 
-    @PostMapping("/yeweihui/qiuzhu/reply/add.json")
-    public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
+  @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
+  public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
 
-        Integer success = qzTaskReplyService.insertQzTaskReply(qzTaskReply);
+    List<QzTask> taskList = qzTaskService.queryQzTaskByStatus(status);
 
-        if (success > 0) {
-            return ModelOps.newSuccess();
-        }
-        else {
-            return ModelOps.newFail("操作失败");
-        }
-    }
+    return Model.newSuccess(taskList);
+  }
 
-    @PostMapping("/yeweihui/qiuzhu/reply/querybytaskid.json")
-    public Model replyQiuzhuQueryByTaskId(@Pd(name = "taskId") Long taskId) {
+  @PostMapping("/yeweihui/qiuzhu/reply/add.json")
+  public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
 
-        List<QzTaskReply> reply = qzTaskReplyService.queryQzTaskReplyByTaskId(taskId);
+    Integer success = qzTaskReplyService.insertQzTaskReply(qzTaskReply);
 
-        return Model.newSuccess(reply);
+    if (success > 0) {
+      return ModelOps.newSuccess();
+    } else {
+      return ModelOps.newFail("操作失败");
     }
+  }
+
+  @PostMapping("/yeweihui/qiuzhu/reply/querybytaskid.json")
+  public Model replyQiuzhuQueryByTaskId(@Pd(name = "taskId") Long taskId) {
 
-    @PostMapping("/yeweihui/qiuzhu/list.json")
-    public Model queryByHouseNumber(String houseNumber, @Pd(name = "status") Integer status) {
+    List<QzTaskReply> reply = qzTaskReplyService.queryQzTaskReplyByTaskId(taskId);
 
-        if (houseNumber.length() <= 0) {
-            return Model.newSuccess(qzTaskService.queryQzTaskByStatus(status));
-        }
+    return Model.newSuccess(reply);
+  }
 
-        List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);
+  @PostMapping("/yeweihui/qiuzhu/list.json")
+  public Model queryByHouseNumber(String houseNumber, @Pd(name = "status") Integer status) {
 
-        return Model.newSuccess(list);
+    if (houseNumber.length() <= 0) {
+      return Model.newSuccess(qzTaskService.queryQzTaskByStatus(status));
     }
 
-    @GetMapping("/yeweihui/ribao.html")
-    public ModelAndView yeweihuiRibao(ModelMap model) {
+    List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);
+
+    return Model.newSuccess(list);
+  }
+
+  @GetMapping("/yeweihui/ribao.html")
+  public ModelAndView yeweihuiRibao(ModelMap model) {
 
 //        List<QzTask> taskList = qzTaskService.selectAll();
 //
 //        model.put("taskList", YvanUtil.toJsonPretty(taskList));
 
-        return new ModelAndView("/yeweihui/ribao.ftl", model);
-    }
+    return new ModelAndView("/yeweihui/ribao.ftl", model);
+  }
 
-    @GetMapping("/yeweihui/ribaoDy")
-    public Model<List<SysUptownHouse>> yeweihuiRibaoDy(Long str) {
+  @GetMapping("/yeweihui/ribaoDy")
+  public Model<List<SysUptownHouse>> yeweihuiRibaoDy(Long str) {
 //        String[] split = str.split("&");
-        List<SysUptownHouse> rbList = rbService.selectXq(str);
-
-        return Model.newSuccess(rbList);
-    }
-
-    @GetMapping("/yeweihui/ribaoXq.html")
-    public ModelAndView yeweihuiRibaoYcXq(ModelMap model) {
-        Map<String, Object> queryParam = Maps.newLinkedHashMap();
-        queryParam.put("userId", "12345677");
-        queryParam.put("statistics", "M");
-        return new ModelAndView("/yeweihui/ribaoXq.ftl", model);
-    }
-
-    @GetMapping("/yeweihui/ribaoDyYcXq")
-    public Model<List<MsSuspected>> yeweihuiRibaoYcXq(Long houseId) {
-        List<MsSuspected> rbList = rbService.selectYcXq(houseId);
-        return Model.newSuccess(rbList);
-    }
-
-    @GetMapping("/yeweihui/ribaohuiz.html")
-    public ModelAndView yeweihuiRibaohuiz(ModelMap model) {
-        return new ModelAndView("/yeweihui/ribaohuiz.ftl", model);
-    }
-
-    @GetMapping("/whepi/yeweihui/ribaohuiz")
-    public Model<Map<String, Object>> yeweihuiRibaohuiz(Long userCreate,String reportDate) {
+    List<SysUptownHouse> rbList = rbService.selectXq(str);
+
+    return Model.newSuccess(rbList);
+  }
+
+  @GetMapping("/yeweihui/ribaoXq.html")
+  public ModelAndView yeweihuiRibaoYcXq(ModelMap model) {
+    Map<String, Object> queryParam = Maps.newLinkedHashMap();
+    queryParam.put("userId", "12345677");
+    queryParam.put("statistics", "M");
+    return new ModelAndView("/yeweihui/ribaoXq.ftl", model);
+  }
+
+  @GetMapping("/yeweihui/ribaoDyYcXq")
+  public Model<List<MsSuspected>> yeweihuiRibaoYcXq(Long houseId) {
+    List<MsSuspected> rbList = rbService.selectYcXq(houseId);
+    return Model.newSuccess(rbList);
+  }
+
+  @GetMapping("/yeweihui/ribaohuiz.html")
+  public ModelAndView yeweihuiRibaohuiz(ModelMap model) {
+    return new ModelAndView("/yeweihui/ribaohuiz.ftl", model);
+  }
+
+  @GetMapping("/whepi/yeweihui/ribaohuiz")
+  public Model<Map<String, Object>> yeweihuiRibaohuiz(Long userCreate, String reportDate) {
 //        Long userCreate = 1225321682867105793L;
 
-        List<Uptown> uptowns = rbMapper.selectUptown(userCreate);
-
-        if (uptowns!=null && uptowns.size()>0) {
-            Long upId = uptowns.get(0).getUptownId();
-            Map<String, Integer> map1 = rbMapper.selecthuiz(upId,reportDate);
-            Map<String, Integer> map2 = rbMapper.selectyicahng(upId,reportDate);
-            Map<String, Integer> map3 = rbMapper.selecthuiz1(upId);
-
-            Map<String, Object> reMap = Maps.newHashMap();
-            reMap.put("uptownName", uptowns.get(0).getUptownName());
-            List<Integer> nums = Lists.newArrayList();
-            nums.add(Conv.NI(map3.get("houseCount")));
-            nums.add(Conv.NI(map1.get("reportCount")));
-            nums.add(Conv.NI(map2.get("yichangCount")));
-            nums.add(Conv.NI(map1.get("safetyNum")));
-            nums.add(Conv.NI(map1.get("suspectedNum")));
-            reMap.put("nums", nums);
-            return Model.newSuccess(reMap);
-        }
-        return Model.newFail("没有数据");
-
+    List<Uptown> uptowns = rbMapper.selectUptown(userCreate);
+
+    if (uptowns != null && uptowns.size() > 0) {
+      Long upId = uptowns.get(0).getUptownId();
+      Map<String, Integer> map1 = rbMapper.selecthuiz(upId, reportDate);
+      Map<String, Integer> map2 = rbMapper.selectyicahng(upId, reportDate);
+      Map<String, Integer> map3 = rbMapper.selecthuiz1(upId);
+
+      Map<String, Object> reMap = Maps.newHashMap();
+      reMap.put("uptownName", uptowns.get(0).getUptownName());
+      List<Integer> nums = Lists.newArrayList();
+      nums.add(Conv.NI(map3.get("houseCount")));
+      nums.add(Conv.NI(map1.get("reportCount")));
+      nums.add(Conv.NI(map2.get("yichangCount")));
+      nums.add(Conv.NI(map1.get("safetyNum")));
+      nums.add(Conv.NI(map1.get("suspectedNum")));
+      reMap.put("nums", nums);
+      return Model.newSuccess(reMap);
     }
-
-    @ApiOperation("导出正常家庭上报明细")
-    @GetMapping("/whepi/yeweihui/exportRiBao")
-    @SneakyThrows
-    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();
-            String fileName = uptown.getUptownName();
-            fileName += "上报信息-";
-            fileName += date;
-            List<ExcelRiBao> list = rbMapper.selectExcelRiBao(upId,date);
-            ExcelUtils.writeSheet(ExcelRiBao.class, list).export(resp, fileName);
-        }
+    return Model.newFail("没有数据");
+
+  }
+
+  @ApiOperation("导出正常家庭上报明细")
+  @GetMapping("/whepi/yeweihui/exportRiBao")
+  @SneakyThrows
+  public void exportRiBao(@Pd(name = "uptownId") Long uptownId,
+                          @Pd(name = "date") String date,
+                          HttpServletResponse resp) {
+    if (uptownId == 1238790987234L) {
+      return;
     }
-
-    @ApiOperation("导出凌云家庭上报明细")
-    @GetMapping("/whepi/lun/exportRiBao")
-    @SneakyThrows
-    public void lunExportRiBao(@Pd(name = "date") String date,
-                            HttpServletResponse resp) {
-
-        Uptown uptown = uptownMapper.selectById("1238790987234");
-        Long upId = uptown.getUptownId();
-        String fileName = uptown.getUptownName();
-        fileName += "上报信息-";
-        fileName += date;
-        List<ExcelRiBaoLY> list = rbMapper.selectExcelRiBaoLY(upId, date);
-        ExcelUtils.writeSheet(ExcelRiBaoLY.class, list).export(resp, fileName);
-
+    Uptown uptown = uptownMapper.selectById(uptownId);
+    if (uptown != null && uptown.getUptownId() > 0) {
+      Long upId = uptown.getUptownId();
+      String fileName = uptown.getUptownName();
+      fileName += "上报信息-";
+      fileName += date;
+      List<ExcelRiBao> list = rbMapper.selectExcelRiBao(upId, date);
+      ExcelUtils.writeSheet(ExcelRiBao.class, list).export(resp, fileName);
     }
-
-    @ApiOperation("导出小区家庭上报明细")
-    @GetMapping("/whepi/yeweihui/EXR")
-    @SneakyThrows
-    public void exportRiBaoByXiaoQu(@Pd(name = "uptownId") Long uptownId,
-                            @Pd(name = "date") String date,
-                            HttpServletResponse resp) {
-        Uptown uptown = uptownMapper.selectById(uptownId);
-        if (uptown!=null && uptown.getUptownId()>0) {
-            Long upId = uptown.getUptownId();
-            String fileName = uptown.getUptownName();
-            fileName += "上报信息-";
-            fileName += date;
-            List<ExcelRiBaoPrivate> list = rbMapper.selectExcelRiBaoPrivate(upId,date);
-            ExcelUtils.writeSheet(ExcelRiBaoPrivate.class, list).export(resp, fileName);
-        }
+  }
+
+  @ApiOperation("导出凌云家庭上报明细")
+  @GetMapping("/whepi/lun/exportRiBao")
+  @SneakyThrows
+  public void lunExportRiBao(@Pd(name = "date") String date,
+                             HttpServletResponse resp) {
+
+    Uptown uptown = uptownMapper.selectById("1238790987234");
+    Long upId = uptown.getUptownId();
+    String fileName = uptown.getUptownName();
+    fileName += "上报信息-";
+    fileName += date;
+    List<ExcelRiBaoLY> list = rbMapper.selectExcelRiBaoLY(upId, date);
+    ExcelUtils.writeSheet(ExcelRiBaoLY.class, list).export(resp, fileName);
+
+  }
+
+  @ApiOperation("导出小区家庭上报明细")
+  @GetMapping("/whepi/yeweihui/EXR")
+  @SneakyThrows
+  public void exportRiBaoByXiaoQu(@Pd(name = "uptownId") Long uptownId,
+                                  @Pd(name = "date") String date,
+                                  HttpServletResponse resp) {
+    Uptown uptown = uptownMapper.selectById(uptownId);
+    if (uptown != null && uptown.getUptownId() > 0) {
+      Long upId = uptown.getUptownId();
+      String fileName = uptown.getUptownName();
+      fileName += "上报信息-";
+      fileName += date;
+      List<ExcelRiBaoPrivate> list = rbMapper.selectExcelRiBaoPrivate(upId, date);
+      ExcelUtils.writeSheet(ExcelRiBaoPrivate.class, list).export(resp, fileName);
     }
+  }
 
-    @GetMapping("/yeweihui/tgPublish.html")
-    public ModelAndView tgPublish(@Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
-        model.put("userId", "\""+userId+"\"");
+  @GetMapping("/yeweihui/tgPublish.html")
+  public ModelAndView tgPublish(@Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
+    model.put("userId", "\"" + userId + "\"");
 
-        return new ModelAndView("/yeweihui/tgPublish.ftl", model);
-    }
-
-    @GetMapping("/yeweihui/groupBuyingCx.html")
-    public ModelAndView groupBuyingCx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, @Pd(name = "operation") String operation, ModelMap model) throws JsonProcessingException {
+    return new ModelAndView("/yeweihui/tgPublish.ftl", model);
+  }
 
-        JmTuangou item = jmTuangouService.queryByJmId(jmId);
+  @GetMapping("/yeweihui/groupBuyingCx.html")
+  public ModelAndView groupBuyingCx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, @Pd(name = "operation") String operation, ModelMap model) throws JsonProcessingException {
 
-        model.put("tgItemJson", new JsonWapper(item));
-        model.put("tgItem", item);
+    JmTuangou item = jmTuangouService.queryByJmId(jmId);
 
-        model.put("userId", "\""+userId+"\"");
+    model.put("tgItemJson", new JsonWapper(item));
+    model.put("tgItem", item);
 
-        model.put("operation", "\""+operation+"\"");
-
-        return new ModelAndView("/groupBuying/groupBuyingCx.ftl", model);
-    }
+    model.put("userId", "\"" + userId + "\"");
 
-    @GetMapping("/yeweihui/groupBuyingXx.html")
-    public ModelAndView groupBuyingXx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
+    model.put("operation", "\"" + operation + "\"");
 
-        JmTuangou item = jmTuangouService.queryByJmId(jmId);
+    return new ModelAndView("/groupBuying/groupBuyingCx.ftl", model);
+  }
 
-        if (item.getUserId().equals(userId)) {
-            model.put("isMine", "mine");
-        }
-        else {
-            model.put("isMine", "notMine");
-        }
+  @GetMapping("/yeweihui/groupBuyingXx.html")
+  public ModelAndView groupBuyingXx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
 
-        model.put("userId", "\""+userId+"\"");
-        model.put("tgItemJson", new JsonWapper(item));
-        model.put("tgItem", item);
+    JmTuangou item = jmTuangouService.queryByJmId(jmId);
 
-        return new ModelAndView("/groupBuying/groupBuyingXx.ftl", model);
+    if (item.getUserId().equals(userId)) {
+      model.put("isMine", "mine");
+    } else {
+      model.put("isMine", "notMine");
     }
 
-    @GetMapping("/yeweihui/tuangou/member/list.html")
-    public ModelAndView tuangouMemberList(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
+    model.put("userId", "\"" + userId + "\"");
+    model.put("tgItemJson", new JsonWapper(item));
+    model.put("tgItem", item);
 
-        JmTuangou item = jmTuangouService.queryByJmId(jmId);
+    return new ModelAndView("/groupBuying/groupBuyingXx.ftl", model);
+  }
 
-        List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
+  @GetMapping("/yeweihui/tuangou/member/list.html")
+  public ModelAndView tuangouMemberList(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
 
-        model.put("tgItemJson", new JsonWapper(item));
-        model.put("tgItem", item);
+    JmTuangou item = jmTuangouService.queryByJmId(jmId);
 
-        model.put("members", YvanUtil.toJsonPretty(members));
+    List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
 
-        model.put("userId", "\""+userId+"\"");
+    model.put("tgItemJson", new JsonWapper(item));
+    model.put("tgItem", item);
 
-        return new ModelAndView("/yeweihui/tuangouMemberList.ftl", model);
-    }
+    model.put("members", YvanUtil.toJsonPretty(members));
 
-    @ApiOperation("导出团购家庭信息")
-    @GetMapping("/yeweihui/tuangou/member/list/export")
-    @SneakyThrows
-    public void tgMembersExport(@Pd(name = "jmId") Long jmId,
-                               HttpServletResponse resp) {
+    model.put("userId", "\"" + userId + "\"");
 
-        List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
+    return new ModelAndView("/yeweihui/tuangouMemberList.ftl", model);
+  }
 
-        String fileName = "团购家庭信息";
-        ExcelUtils.writeSheet(JmTuangouMember.class, members).export(resp, fileName);
+  @ApiOperation("导出团购家庭信息")
+  @GetMapping("/yeweihui/tuangou/member/list/export")
+  @SneakyThrows
+  public void tgMembersExport(@Pd(name = "jmId") Long jmId,
+                              HttpServletResponse resp) {
 
-    }
+    List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
 
-    @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) {
+    String fileName = "团购家庭信息";
+    ExcelUtils.writeSheet(JmTuangouMember.class, members).export(resp, fileName);
 
-        Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark);
+  }
 
-        if (success == 1) {
-            return Model.newSuccess("操作成功");
-        }
-        else {
-            return Model.newFail("操作失败");
-        }
-    }
+  @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) {
 
-    @PostMapping("/yeweihui/tgPublish.json")
-    public Model tuangouPublish(JmTuangou jmTuangou) {
+    Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark);
 
-        Integer success = jmTuangouService.tuangouPublish(jmTuangou);
-        if (success == 1) {
-            return Model.newSuccess("操作成功");
-        }
-        else {
-            return Model.newFail("操作失败");
-        }
+    if (success == 1) {
+      return Model.newSuccess("操作成功");
+    } else {
+      return Model.newFail("操作失败");
     }
+  }
 
-    @PostMapping("/whepi/yeweihui/tglist")
-    public Model whepiTuangoulist(@Pd(name = "userId") Long userId, @Pd(name = "uptownId", required = false) Long uptownId, @Pd(name = "queryProperties", required = false) String queryProperties, @Pd(name = "status", required = false) Long status) {
-
-        List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(userId, uptownId, queryProperties, status);
+  @PostMapping("/yeweihui/tgPublish.json")
+  public Model tuangouPublish(JmTuangou jmTuangou) {
 
-        return Model.newSuccess(myList);
+    Integer success = jmTuangouService.tuangouPublish(jmTuangou);
+    if (success == 1) {
+      return Model.newSuccess("操作成功");
+    } else {
+      return Model.newFail("操作失败");
     }
+  }
 
-    @PostMapping("/whepi/yeweihui/tgPublish")
-    public Model whepiTuangouPublish(@Pd(name = "uptownIds") String uptownIds, JmTuangou jmTuangou) {
+  @PostMapping("/whepi/yeweihui/tglist")
+  public Model whepiTuangoulist(@Pd(name = "userId", required = false) Long userId, @Pd(name = "uptownId", required = false) Long uptownId, @Pd(name = "queryProperties", required = false) String queryProperties, @Pd(name = "status", required = false) Long status,
+                       PageDb pageDb) {
+    //系统管理员只有一个人 获取当前userId
+    JmTuangou jmTuangou = jmTuangouService.selectByUserId();
 
-        Integer success = jmTuangouService.whepiTuangouPublish(uptownIds, jmTuangou);
-        if (success == 1) {
-            return Model.newSuccess("操作成功");
-        }
-        else {
-            return Model.newFail("操作失败");
-        }
-    }
+    List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(jmTuangou.getUserId(), uptownId, queryProperties, status,pageDb);
 
-    @PostMapping("/whepi/yeweihui/tgStatus")
-    public Model whepiYeweihuiTgStatus(@Pd(name = "jmId") Long jmId, @Pd(name = "status", required = false, defaultValue = "0") Long status, @Pd(name = "remark", required = false) String remark) {
+    return Model.newSuccess(pageDb,myList);
+  }
 
-        Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark);
+  @PostMapping("/whepi/yeweihui/tgPublish")
+  public Model whepiTuangouPublish(@JsonBody JmTuangou jmTuangou) {
 
-        if (success == 1) {
-            return Model.newSuccess("操作成功");
-        }
-        else {
-            return Model.newFail("操作失败");
-        }
+    Integer success = jmTuangouService.whepiTuangouPublish(jmTuangou.getUptownIds(), jmTuangou);
+    if (success == 1) {
+      return Model.newSuccess("操作成功");
+    } else {
+      return Model.newFail("操作失败");
     }
+  }
 
-    @PostMapping("/yeweihui/tuangou/list/query.json")
-    public Model queryTuangouListByTitle(@Pd(name = "userId") Long userId, @Pd(name = "title", required = false) String title) {
+  @PostMapping("/yeweihui/tuangou/list/query.json")
+  public Model queryTuangouListByTitle(@Pd(name = "userId") Long userId, @Pd(name = "title", required = false) String title) {
 
-        List<JmTuangou> list = jmTuangouService.queryTuangouListByTitle(userId, title);
+    List<JmTuangou> list = jmTuangouService.queryTuangouListByTitle(userId, title);
 
-        return Model.newSuccess(list);
-    }
+    return Model.newSuccess(list);
+  }
 
-    @PostMapping("/yeweihui/tuangou/mylist/query.json")
-    public Model queryTuangouMyListByTitle(@Pd(name = "userId") Long userId, @Pd(name = "title", required = false) String title) {
+  @PostMapping("/yeweihui/tuangou/mylist/query.json")
+  public Model queryTuangouMyListByTitle(@Pd(name = "userId") Long userId, @Pd(name = "title", required = false) String title) {
 
-        List<JmTuangou> myList = jmTuangouService.queryTuangouMyListByTitle(userId, title);
+    List<JmTuangou> myList = jmTuangouService.queryTuangouMyListByTitle(userId, title);
 
-        return Model.newSuccess(myList);
-    }
+    return Model.newSuccess(myList);
+  }
 
-    @PostMapping("/whepi/getAllUptown")
-    public Model<List<Uptown>> getAllUptown(HttpParameterParser parser, PageDb pageDb) {
-        return Model.newSuccess(pageDb, uptownMapper.getUptowns(pageDb, parser.getMap()));
-    }
+  @PostMapping("/whepi/getAllUptown")
+  public Model<List<Uptown>> getAllUptown(HttpParameterParser parser, PageDb pageDb) {
+    return Model.newSuccess(pageDb, uptownMapper.getUptowns(pageDb, parser.getMap()));
+  }
 }

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

@@ -31,8 +31,9 @@
     </select>
 
     <select id="whepiTuangoulist" resultType="com.bofeng.entity.JmTuangou">
-        select a.*, IFNULL((select SUM(b.buy_count) FROM jm_buy b where b.jm_id=a.jm_id and buy_status=1),0) as currentNum
+        select a.*,b.uptown_name, IFNULL((select SUM(b.buy_count) FROM jm_buy b where b.jm_id=a.jm_id and buy_status=1),0) as currentNum
         from jm_tuangou a
+        inner join sys_uptown b on a.uptown_id=b.uptown_id
         <where>
             a.user_id=#{userId}
             <if test="uptownId!=null and uptownId!=''">
@@ -76,4 +77,8 @@
             update jm_tuangou set tg_status=#{item.tgStatus} where jm_id=#{item.jmId}
         </foreach>
     </update>
+
+    <select id="selectByUserId" resultType="com.bofeng.entity.JmTuangou">
+        select * from sys_user limit 1
+    </select>
 </mapper>