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

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

@@ -12,13 +12,7 @@ import com.huiju.estateagents.sample.service.ITaContactService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -122,7 +116,6 @@ public class TaContactController extends BaseController {
                 newContact.setStatus(CommConstant.STATUS_DELETE);
                 updateList.add(newContact);
             }
-
             responseBean.addSuccess(iTaContactService.updateBatchById(updateList));
         } catch (Exception e) {
             e.printStackTrace();
@@ -209,4 +202,23 @@ public class TaContactController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据样例id查询联系人信息
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taContact/{id}",method= RequestMethod.GET)
+    public ResponseBean taContactInfoBySampleId(@PathVariable String id,
+                                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaContactService.taContactInfoBySampleId(id, pageNum, pageSize));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContactDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -11,6 +11,9 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
 import com.huiju.estateagents.sample.service.ITaH5DemandService;
+import com.huiju.estateagents.service.ITaOrgService;
+import org.apache.poi.ss.formula.functions.T;
+import org.omg.CORBA.INTERNAL;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,6 +28,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,6 +52,8 @@ public class TaH5DemandController extends BaseController {
     @Autowired
     public ITaH5DemandService iTaH5DemandService;
 
+    @Autowired
+    private ITaOrgService iTaOrgService;
 
     /**
      * 分页查询列表
@@ -57,6 +64,13 @@ public class TaH5DemandController extends BaseController {
     @RequestMapping(value="/admin/taH5Demand",method= RequestMethod.GET)
     public ResponseBean taH5DemandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="sampleName", required = false) String sampleName,
+                                       @RequestParam(value ="orderer", required = false) String orderer,
+                                       @RequestParam(value ="phone", required = false) String phone,
+                                       @RequestParam(value ="sampleId", required = false) Integer sampleId,
+                                       @RequestParam(value ="startCreateDate", required = false) String startCreateDate,
+                                       @RequestParam(value ="endCreateDate", required = false) String endCreateDate,
+                                       @RequestParam(value ="demandStatus", required = false) String demandStatus,
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -64,6 +78,14 @@ public class TaH5DemandController extends BaseController {
 		    IPage<TaH5Demand> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq(sampleId != null,"sample_id", sampleId);
+            queryWrapper.ne("demand_status", CommConstant.STATUS_DELETE);
+            queryWrapper.like(!StringUtils.isEmpty(sampleName),"sample_name", sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(orderer),"orderer", orderer);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone", phone);
+            queryWrapper.eq(!StringUtils.isEmpty(demandStatus),"demand_status", demandStatus);
+            queryWrapper.gt(!StringUtils.isEmpty(startCreateDate),"create_date", startCreateDate);
+            queryWrapper.lt(!StringUtils.isEmpty(endCreateDate),"create_date", endCreateDate);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaH5Demand> result = iTaH5DemandService.page(pg, queryWrapper);
@@ -82,9 +104,14 @@ public class TaH5DemandController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taH5Demand",method= RequestMethod.POST)
-    public ResponseBean taH5DemandAdd(@RequestBody TaH5Demand taH5Demand){
+    public ResponseBean taH5DemandAdd(@RequestBody TaH5Demand taH5Demand, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taH5Demand.setOrgId(getOrgId(request));
+            taH5Demand.setOrgName(iTaOrgService.getById(getOrgId(request)).getName());
+            taH5Demand.setDemandStatus(CommConstant.STATUS_NORMAL);
+            taH5Demand.setCreateDate(LocalDateTime.now());
+            taH5Demand.setUpdateDate(LocalDateTime.now());
             if (iTaH5DemandService.save(taH5Demand)){
                 responseBean.addSuccess(taH5Demand);
             }else {
@@ -120,17 +147,47 @@ public class TaH5DemandController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 根据id批量删除对象
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/batchDelTaH5Demands", method= RequestMethod.PUT)
+    public ResponseBean taH5DemandBatchDelete(@RequestBody TaH5Demand taH5Demand){
+        ResponseBean responseBean = new ResponseBean();
+        List<Integer> demandIds = new ArrayList<>();
+        try {
+            for (TaH5Demand info : taH5Demand.getTaH5Demands()){
+                demandIds.add(info.getDemandId());
+            }
+            TaH5Demand h5Demand = new TaH5Demand();
+            h5Demand.setDemandStatus(CommConstant.STATUS_DELETE);
+            QueryWrapper<TaH5Demand> taH5DemandQueryWrapper = new QueryWrapper<>();
+            taH5DemandQueryWrapper.in("demand_id", demandIds);
+            iTaH5DemandService.update(h5Demand, taH5DemandQueryWrapper);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 修改对象
      * @param id  实体ID
      * @param taH5Demand 实体对象
      * @return
      */
-    @RequestMapping(value="/taH5Demand/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taH5Demand/{id}",method= RequestMethod.PUT)
     public ResponseBean taH5DemandUpdate(@PathVariable Integer id,
                                         @RequestBody TaH5Demand taH5Demand){
         ResponseBean responseBean = new ResponseBean();
         try {
+            if (StringUtils.isEmpty(taH5Demand.getDemandContent())){
+                responseBean.addError("请填写需求内容");
+                return responseBean;
+            }
+            taH5Demand.setDemandId(id);
             if (iTaH5DemandService.updateById(taH5Demand)){
                 responseBean.addSuccess(taH5Demand);
             }else {

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

@@ -159,7 +159,7 @@ public class TaH5SampleController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taH5Sample/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taH5Sample/{id}",method= RequestMethod.GET)
     public ResponseBean taH5SampleGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -1,25 +1,17 @@
 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;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.sample.entity.TaH5Sample;
 import com.huiju.estateagents.sample.entity.TaNotice;
+import com.huiju.estateagents.sample.service.ITaH5SampleService;
 import com.huiju.estateagents.sample.service.ITaNoticeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -40,6 +32,9 @@ public class TaNoticeController extends BaseController {
     @Autowired
     public ITaNoticeService iTaNoticeService;
 
+    @Autowired
+    public ITaH5SampleService iTaH5SampleService;
+
     /**
      * 条件查询通知列表
      *
@@ -49,7 +44,7 @@ public class TaNoticeController extends BaseController {
      * @param targetType
      * @param targetName
      * @param status
-     * @param type       类型
+     * @param type       类型 目前默认 sample
      * @return
      */
     @RequestMapping(value = "/channel/listNoticeByCondition", method = RequestMethod.GET)
@@ -147,7 +142,18 @@ public class TaNoticeController extends BaseController {
     public ResponseBean taNoticeGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaNoticeService.getById(id));
+            TaNotice taNotice = iTaNoticeService.getById(id);
+            if (taNotice == null) {
+                responseBean.addError("fail");
+                return responseBean;
+            }
+            if (taNotice.getTargetId() != null) {
+                TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getNoticeId());
+                if(taH5Sample != null){
+                    taNotice.setTargetName(taH5Sample.getSampleName());
+                }
+            }
+            responseBean.addSuccess(taNotice);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taNoticeDelete -=- {}", e.toString());
@@ -161,13 +167,13 @@ public class TaNoticeController extends BaseController {
      *
      * @param pageNum
      * @param pageSize
-     * @param type       类型 目前默认 sample
+     * @param type     类型 目前默认 sample
      * @return
      */
     @RequestMapping(value = "/admin/listNoticeByCondition", method = RequestMethod.GET)
     public ResponseBean listNoticeByConditionForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                              String type) {
+                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      String type) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaNoticeService.listNoticeByConditionForAdmin(pageNum, pageSize, type);

src/main/java/com/huiju/estateagents/sample/entity/TaH5Demand.java

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.sample.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -84,5 +87,9 @@ public class TaH5Demand implements Serializable {
      */
     private String remark;
 
-
+    /**
+     * 集合对象
+     */
+    @TableField(exist = false)
+    private List<TaH5Demand> taH5Demands;
 }

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

@@ -1,8 +1,10 @@
 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 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 TaContactMapper extends BaseMapper<TaContact> {
-
+    IPage<TaContact> taContactInfoBySampleId(IPage<TaContact> pg, @Param("id") String id);
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.sample.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.sample.entity.TaContact;
 
@@ -12,5 +13,5 @@ import com.huiju.estateagents.sample.entity.TaContact;
  * @since 2020-03-18
  */
 public interface ITaContactService extends IService<TaContact> {
-
+    IPage<TaContact> taContactInfoBySampleId(String id, Integer pageNum, Integer pageSize);
 }

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

@@ -1,10 +1,13 @@
 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.sample.entity.TaContact;
 import com.huiju.estateagents.sample.mapper.TaContactMapper;
 import com.huiju.estateagents.sample.service.ITaContactService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,4 +21,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaContactServiceImpl extends ServiceImpl<TaContactMapper, TaContact> implements ITaContactService {
 
+    @Autowired
+    TaContactMapper taContactMapper;
+
+    @Override
+    public IPage<TaContact> taContactInfoBySampleId(String id, Integer pageNum, Integer pageSize) {
+        IPage<TaContact> pg = new Page<>(pageNum, pageSize);
+        return  taContactMapper.taContactInfoBySampleId(pg, id);
+    }
 }

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

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.sample.mapper.TaContactMapper">
 
+    <select id="taContactInfoBySampleId" resultType="com.huiju.estateagents.sample.entity.TaContact">
+        select * From ta_contact t where t.contact_id in (select a.contact_id from ta_sample_contact a where a.sample_id = #{id})
+    </select>
 </mapper>

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

@@ -34,10 +34,11 @@
         FROM
             ta_notice t
             LEFT JOIN ta_h5_sample t2 ON t.target_id = t2.sample_id
-        where
-            t.`status` == 1
-            AND t.invalid_time >= NOW( )
+        WHERE
+            t.`status` = 1
+            AND t.invalid_time >= NOW( )
         ORDER BY
-            t.order_no DESC,t.create_date DESC
+            t.order_no DESC,
+            t.create_date DESC
     </select>
 </mapper>