新需求

src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java

@@ -7,10 +7,15 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.service.ITaSalesBatchService;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import sun.misc.Request;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -21,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaSalesBatchController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaSalesBatchController.class);
@@ -36,17 +41,18 @@ public class TaSalesBatchController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taSalesBatch",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taSalesBatch",method= RequestMethod.GET)
     public ResponseBean taSalesBatchList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="salesBatchName", required = false) String salesBatchName,
+                                         @RequestParam(value ="buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaSalesBatch> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
 
-            IPage<TaSalesBatch> result = iTaSalesBatchService.page(pg, queryWrapper);
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -61,10 +67,13 @@ public class TaSalesBatchController extends BaseController {
      * @param taSalesBatch 实体对象
      * @return
      */
-    @RequestMapping(value="/taSalesBatch",method= RequestMethod.POST)
-    public ResponseBean taSalesBatchAdd(@RequestBody TaSalesBatch taSalesBatch){
+    @RequestMapping(value="/admin/taSalesBatch",method= RequestMethod.POST)
+    public ResponseBean taSalesBatchAdd(@RequestBody TaSalesBatch taSalesBatch, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taSalesBatch.setOrgId(getOrgId(request));
+            taSalesBatch.setCreateDate(LocalDateTime.now());
+            taSalesBatch.setUpdateTime(LocalDateTime.now());
             if (iTaSalesBatchService.save(taSalesBatch)){
                 responseBean.addSuccess(taSalesBatch);
             }else {
@@ -83,7 +92,7 @@ public class TaSalesBatchController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taSalesBatch/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/taSalesBatch/{id}", method= RequestMethod.DELETE)
     public ResponseBean taSalesBatchDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -106,11 +115,12 @@ public class TaSalesBatchController extends BaseController {
      * @param taSalesBatch 实体对象
      * @return
      */
-    @RequestMapping(value="/taSalesBatch/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taSalesBatch/{id}",method= RequestMethod.PUT)
     public ResponseBean taSalesBatchUpdate(@PathVariable Integer id,
                                            @RequestBody TaSalesBatch taSalesBatch){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taSalesBatch.setSalesBatchId(id);
             if (iTaSalesBatchService.updateById(taSalesBatch)){
                 responseBean.addSuccess(taSalesBatch);
             }else {
@@ -128,7 +138,7 @@ public class TaSalesBatchController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taSalesBatch/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taSalesBatch/{id}",method= RequestMethod.GET)
     public ResponseBean taSalesBatchGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/controller/TaShareController.java

@@ -4,11 +4,15 @@ package com.huiju.estateagents.controller;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.service.ITaShareService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
 
 /**
  * <p>
@@ -22,6 +26,8 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("/api")
 public class TaShareController extends BaseController {
 
+    private final Logger logger = LoggerFactory.getLogger(TaShareController.class);
+
     @Autowired
     ITaShareService taShareService;
 
@@ -53,4 +59,25 @@ public class TaShareController extends BaseController {
         taShareService.makeSure(openid, typeOf, id, orgId);
         return ResponseBean.success("");
     }
+
+    @RequestMapping(value = "/admin/taHouseShare", method = RequestMethod.GET)
+    public ResponseBean taHouseShareList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "shareType", required = false)String shareType,
+                                         @RequestParam(value = "personType", required = false)String personType,
+                                         @RequestParam(value = "phone", required = false)String phone,
+                                         Integer salesBatchId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (salesBatchId == null){
+                return ResponseBean.success("");
+            }
+            responseBean = taShareService.selectHouseShareList(pageNum, pageSize, getOrgId(request), personType, shareType, phone, salesBatchId);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/entity/TaSalesBatch.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -58,12 +59,12 @@ public class TaSalesBatch implements Serializable {
     /**
      * 预选开始时间
      */
-    private LocalDateTime preselectionStartTime;
+    private String preselectionStartTime;
 
     /**
      * 预选结束时间
      */
-    private LocalDateTime preselectionEndTime;
+    private String preselectionEndTime;
 
     /**
      * 发布状态
@@ -85,5 +86,10 @@ public class TaSalesBatch implements Serializable {
      */
     private String remark;
 
+    /**
+     * 项目名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
 
 }

src/main/java/com/huiju/estateagents/entity/TaShare.java

@@ -66,4 +66,34 @@ public class TaShare implements Serializable {
      */
     @TableField(exist = false)
     private TaPerson openUser;
+
+    /**
+     * 分享人姓名
+     */
+    @TableField(exist = false)
+    private String name;
+
+    /**
+     * 分享人手机号
+     */
+    @TableField(exist = false)
+    private String phone;
+
+    /**
+     * 分享人身份
+     */
+    @TableField(exist = false)
+    private String personType;
+
+    /**
+     * 分享方式
+     */
+    @TableField(exist = false)
+    private String shareType;
+
+    /**
+     * 销售批次名称
+     */
+    @TableField(exist = false)
+    private String salesBatchName;
 }

src/main/java/com/huiju/estateagents/mapper/TaSalesBatchMapper.java

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
-
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/mapper/TaShareMapper.java

@@ -1,8 +1,12 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaShare;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaShareMapper extends BaseMapper<TaShare> {
+    List<TaShare> selectHouseShareList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("saleBatchId")Integer saleBatchId);
 }

src/main/java/com/huiju/estateagents/service/ITaSalesBatchService.java

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaSalesBatch;
 
@@ -12,5 +14,5 @@ import com.huiju.estateagents.entity.TaSalesBatch;
  * @since 2020-02-10
  */
 public interface ITaSalesBatchService extends IService<TaSalesBatch> {
-
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaShareService.java

@@ -19,4 +19,6 @@ public interface ITaShareService extends IService<TaShare> {
     ResponseBean getListOf(String id, String typeOf, Integer pageNumber, Integer pageSize);
 
     void makeSure(String openid, String typeOf, String id, Integer orgId);
+
+    ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.ITaSalesBatchService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaSalesBatch> implements ITaSalesBatchService {
 
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
+    @Override
+    public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
+        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java

@@ -47,7 +47,10 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
 
     @Autowired
     private TaNewsMapper newsMapper;
-    
+
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
     @Resource
     private ApplicationContext applicationContext;
 
@@ -182,6 +185,19 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         }
     }
 
+    @Override
+    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+//        list.forEach(e -> {
+//            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+//        });
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
+
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -20,7 +20,7 @@
             t.create_date DESC;
     </select>
 
-    <select id="getRecordByPersonIdAndHouseId" resultType="">
+    <select id="getRecordByPersonIdAndHouseId" resultType="com.huiju.estateagents.entity.TaPreselectionRecord">
         SELECT
             t.*
         FROM

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaSalesBatchMapper">
 
+    <select id="selectByCondition" resultType="com.huiju.estateagents.entity.TaSalesBatch">
+        select t.*, a.building_name from ta_sales_batch t
+        left join ta_building a on t.building_id = a.building_id
+        where t.org_id = #{orgId}
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="salesBatchName != null and salesBatchName != ''">
+            and t.sales_batch_name = #{salesBatchName}
+        </if>
+        <if test="status != null">
+            and t.status = #{status}
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper/TaShareMapper.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaShareMapper">
+
+    <select id="selectHouseShareList" resultType="com.huiju.estateagents.entity.TaShare">
+      select a.avatarurl as photoOravatar, a.nickname, a.name, a.phone, a.person_type, t.create_date From ta_share t
+      left join ta_person a on t.person_id = a.person_id
+      where a.org_id = #{orgId}
+      <if test="personType != null and personType != ''">
+          and a.person_Type = #{personType}
+      </if>
+      <if test="shareType != null and shareType != ''">
+          and t.tagert_type = #{shareType}
+      </if>
+      <if test="phone != null and phone != ''">
+          and a.phone = #{phone}
+      </if>
+        order by t.create_date desc
+    </select>
 </mapper>