Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.sample.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,8 +15,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -105,18 +106,11 @@ public class TaContactController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/channel/taContact/batchDelete", method = RequestMethod.PUT)
-    public ResponseBean batchDelete(@RequestBody List<TaContact> taContactList) {
+    public ResponseBean batchDelete(@RequestBody List<TaContact> taContactList, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            List<TaContact> updateList = new ArrayList<>();
-            TaContact newContact;
-            for (TaContact taContact : taContactList) {
-                newContact = new TaContact();
-                newContact.setContactId(taContact.getContactId());
-                newContact.setStatus(CommConstant.STATUS_DELETE);
-                updateList.add(newContact);
-            }
-            responseBean.addSuccess(iTaContactService.updateBatchById(updateList));
+            responseBean = iTaContactService.batchDelete(taContactList,getUserId(request));
+            logger.info("TaContactController.batchDelete 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taContactDelete -=- {}", e.toString());

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -266,7 +266,9 @@ public class TaH5SampleController extends BaseController {
             List<String> tags = taH5Sample.getTags();
             taH5Sample.setTag(String.join(",", tags));
             taH5Sample.setAddUser(getUserId(request));
+            taH5Sample.setUpdateUser(getUserId(request));
             taH5Sample.setCreateDate(LocalDateTime.now());
+            taH5Sample.setUpdateDate(LocalDateTime.now());
             if (iTaH5SampleService.save(taH5Sample)) {
                 List<TaContact> taContactList = taH5Sample.getTaContactList();
                 taContactList.forEach(e -> {

src/main/java/com/huiju/estateagents/sample/mapper/TaContactMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.sample.entity.TaContact;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -15,6 +16,7 @@ import org.apache.ibatis.annotations.Param;
  * @since 2020-03-18
  */
 @Mapper
+@Component
 public interface TaContactMapper extends BaseMapper<TaContact> {
     IPage<TaContact> taContactInfoBySampleId(IPage<TaContact> pg, @Param("id") String id);
 }

src/main/java/com/huiju/estateagents/sample/mapper/TaH5SampleMapper.java

@@ -2,10 +2,14 @@ package com.huiju.estateagents.sample.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.sample.entity.TaContact;
 import com.huiju.estateagents.sample.entity.TaH5Sample;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * <p>
  * 样例表  Mapper 接口
@@ -19,4 +23,6 @@ import org.springframework.stereotype.Component;
 public interface TaH5SampleMapper extends BaseMapper<TaH5Sample> {
 
     IPage<TaH5Sample> listH5SampleByCondition(IPage<TaH5Sample> pg, String sampleName);
+
+    Boolean batchUpdateStatus(@Param("list") List<TaContact> taContactList, @Param("userId") Integer userId);
 }

src/main/java/com/huiju/estateagents/sample/service/ITaContactService.java

@@ -2,8 +2,11 @@ package com.huiju.estateagents.sample.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.sample.entity.TaContact;
 
+import java.util.List;
+
 /**
  * <p>
  * 联系人表  服务类
@@ -14,4 +17,13 @@ import com.huiju.estateagents.sample.entity.TaContact;
  */
 public interface ITaContactService extends IService<TaContact> {
     IPage<TaContact> taContactInfoBySampleId(String id, Integer pageNum, Integer pageSize);
+
+    /**
+     * 批量删除
+     *
+     * @param taContactList
+     * @param userId
+     * @return
+     */
+    ResponseBean batchDelete(List<TaContact> taContactList, Integer userId);
 }

src/main/java/com/huiju/estateagents/sample/service/impl/TaContactServiceImpl.java

@@ -4,12 +4,18 @@ package com.huiju.estateagents.sample.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.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.sample.entity.TaContact;
 import com.huiju.estateagents.sample.mapper.TaContactMapper;
+import com.huiju.estateagents.sample.mapper.TaH5SampleMapper;
 import com.huiju.estateagents.sample.service.ITaContactService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 联系人表  服务实现类
@@ -22,11 +28,34 @@ import org.springframework.stereotype.Service;
 public class TaContactServiceImpl extends ServiceImpl<TaContactMapper, TaContact> implements ITaContactService {
 
     @Autowired
-    TaContactMapper taContactMapper;
+    private TaContactMapper taContactMapper;
+
+    @Autowired
+    private TaH5SampleMapper taH5SampleMapper;
 
     @Override
     public IPage<TaContact> taContactInfoBySampleId(String id, Integer pageNum, Integer pageSize) {
         IPage<TaContact> pg = new Page<>(pageNum, pageSize);
-        return  taContactMapper.taContactInfoBySampleId(pg, id);
+        return taContactMapper.taContactInfoBySampleId(pg, id);
+    }
+
+    @Override
+    public ResponseBean batchDelete(List<TaContact> taContactList, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaContact> updateList = new ArrayList<>();
+        TaContact newContact;
+        for (TaContact taContact : taContactList) {
+            newContact = new TaContact();
+            newContact.setContactId(taContact.getContactId());
+            newContact.setStatus(CommConstant.STATUS_DELETE);
+            updateList.add(newContact);
+        }
+
+        // 更新样例表状态
+        taH5SampleMapper.batchUpdateStatus(updateList, userId);
+
+        responseBean.addSuccess(updateBatchById(updateList));
+        return responseBean;
     }
 }

src/main/resources/mapper/sample/TaH5SampleMapper.xml

@@ -12,13 +12,25 @@
             LEFT JOIN ta_user t2 ON t.add_user = t2.user_id
             LEFT JOIN ta_user t3 ON t.update_user = t3.user_id
         WHERE
-            t.`status` != - 1
+            t.`status` = 1
             <if test = "sampleName != null and sampleName != ''">
                 AND t.sample_name LIKE concat('%',#{sampleName},'%')
             </if>
         ORDER BY
-            t.order_no,
-            t.create_date
+            t.order_no desc,
+            t.create_date desc
     </select>
 
+    <update id="batchUpdateStatus">
+        UPDATE ta_h5_sample t
+            SET t.`status` = - 1,
+                t.update_user = #{userId},
+                t.update_date = NOW( )
+        WHERE
+            t.sample_id IN ( SELECT t2.sample_id FROM ta_sample_contact t2 WHERE t2.contact_id IN
+        <foreach collection="list" item="record" open="(" close=")" separator=",">
+            #{record.contactId}
+        </foreach>)
+    </update>
+
 </mapper>