admin 2月15号

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

@@ -159,10 +159,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;

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

@@ -17,6 +17,7 @@ define(function (require) {
     function queryGrid() {
       $grid1.jqGrid("clearGridData");
       var queryForm = $form.formGet();
+      queryForm.jmId=context.jmId,
       $grid1.reload({
         mtype: 'POST',
         url: api('/zhihuibu/tgDetail'),
@@ -71,9 +72,9 @@ define(function (require) {
         {
           text: '导出excel', iconCls: 'fa fa-external-link-square', onClick: function () {
             $.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'
             });
           }
         },
@@ -110,16 +111,13 @@ define(function (require) {
           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('完成');

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/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/wx/controller/YeWeiHuiController.java

@@ -343,6 +343,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) {
@@ -431,9 +437,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/mapper/JmTuangouMemberMapper.xml

@@ -22,4 +22,54 @@
         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
+    </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})
+        <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
+    </select>
+
 </mapper>