Merge branch 'dev'

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.14</version>
+	<version>v3.5.16</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -132,15 +132,15 @@
 
 
 	<profiles>
-		<profile>
-			<id>dev</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<properties>
-				<profiles.active>dev</profiles.active>
-			</properties>
-		</profile>
+<!--		<profile>-->
+<!--			<id>dev</id>-->
+<!--			<activation>-->
+<!--				<activeByDefault>true</activeByDefault>-->
+<!--			</activation>-->
+<!--			<properties>-->
+<!--				<profiles.active>dev</profiles.active>-->
+<!--			</properties>-->
+<!--		</profile>-->
 		<profile>
 			<id>green</id>
 			<properties>

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -96,6 +96,36 @@ public class BaseController {
         return null;
     }
 
+    /**
+     * 获取服务管理后台用户ID
+     *
+     * @param request
+     * @return
+     */
+    public Integer getSysUserId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userId")) {
+            return Integer.valueOf(map.get("userId").toString());
+        }
+        return null;
+    }
+
+    /**
+     * 获取服务管理后台用户ID
+     *
+     * @param request
+     * @return
+     */
+    public String getSysUserName(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userName")) {
+            return map.get("userName") + "";
+        }
+        return null;
+    }
+
     public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
         TaUser taUser = taUserService.getById(getUserId(request));
         if (taUser == null) {

src/main/java/com/huiju/estateagents/center/sysUser/entity/SysUser.java

@@ -26,7 +26,9 @@ public class SysUser implements Serializable {
     /**
      * 账户登录
      */
-    @TableId(value = "user_name")
+    @TableId(value = "user_id")
+    private Integer userId;
+
     private String userName;
 
     /**

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -111,7 +111,11 @@ public class SysUserChannelController extends BaseController {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        String token = JWTUtils.newToken(sysUser.getUserName());
+        Map map = new HashMap();
+        map.put("userName", sysUser.getUserName());
+        map.put("userId",sysUser.getUserId());
+
+        String token = JWTUtils.newTokenByMap(map);
 
         //保存token
         sysTokenService.saveToken(token);
@@ -138,7 +142,7 @@ public class SysUserChannelController extends BaseController {
      */
     @RequestMapping(value="/channel/current",method=RequestMethod.GET)
     public ResponseBean currentChannelUser(HttpServletRequest request){
-        String userName = JWTUtils.getSubject(request);
+        String userName = getSysUserName(request);
         QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
         sysUserQueryWrapper.eq("user_name",userName);
         sysUserQueryWrapper.eq("type",CommConstant.LOGIN_TYPE_CHANNEL);

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -449,6 +449,12 @@ public class CommConstant {
      */
     public static final String MESSAGE_CONTENT_OF_NOTICE = "notice";
 
+    /**
+     * 需求通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTENT_OF_DEMAND = "demand";
+
     /**
      * 助力通知
      * 必须存在表   td_miniapp_template_type 中
@@ -716,4 +722,20 @@ public class CommConstant {
      * 线下缴费
      */
     public static final String PAY_TYPE_ONLINE = "onLine";
+
+    /**
+     * 作废状态
+     */
+    public static final Integer DEMAND_STATUS_INVALID = 4;
+
+
+    /**
+     * 已提交
+     */
+    public static final Integer DEMAND_STATUS_SUBMIT = 1;
+
+    /**
+     * 样例类型H5
+     */
+    public static final String NOTICE_TYPE_H5 = "H5";
 }

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

@@ -568,6 +568,7 @@ public class TaPersonController extends BaseController {
         }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
+            person.setPhone(phone);
             if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
                 TaUser user = taUserService.getById(person.getUserId());
                 user.setPhone(phone);

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

@@ -272,14 +272,23 @@ public class TaPersonVisitRecordController extends BaseController {
     @RequestMapping(value = "/wx/activityVisitRecord", method = RequestMethod.GET)
     public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        @RequestParam(value = "personId") String personId,
+                                                        @RequestParam(value = "personId", required = false) String personId,
+                                                        @RequestParam(value = "userId", required = false) Integer userId,
                                                         @RequestParam(value = "targetId") String targetId,
                                                         @RequestParam(value = "eventType") String eventType,
                                                         HttpServletRequest request) {
         try {
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            if (userId == null){
+                taPersonQueryWrapper.eq("person_id", personId);
+            }
+            if (personId == null){
+                taPersonQueryWrapper.eq("user_id", userId);
+            }
+            TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, personId, getOrgId(request), targetId, eventType);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, taPerson.getPersonId(), getOrgId(request), targetId, eventType);
             return ResponseBean.success(result);
         } catch (Exception e) {
             e.printStackTrace();
@@ -300,18 +309,24 @@ public class TaPersonVisitRecordController extends BaseController {
     @RequestMapping(value = "/wx/shareRecords", method = RequestMethod.GET)
     public ResponseBean wxShareRecordsByUserId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               @RequestParam(value = "personId") String personId,
+                                               @RequestParam(value = "personId", required = false) String personId,
+                                               @RequestParam(value = "userId", required = false) Integer userId,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        if (personId == null) {
+        if (personId == null && userId == null) {
             return responseBean;
         }
         //使用分页插件
         IPage<TaConsultantInfo> pg = new Page<>(pageNumber, pageSize);
         QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-        taPersonQueryWrapper.eq("person_id", personId);
+        if (userId == null){
+            taPersonQueryWrapper.eq("person_id", personId);
+        }
+        if (personId == null){
+            taPersonQueryWrapper.eq("user_id", userId);
+        }
         TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
-        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, personId);
+        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e -> {

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

@@ -226,7 +226,7 @@ public class TaRaiseRecordController extends BaseController {
 
                 // 修改房源锁定状态为未锁定
                 record.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-                iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+                iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED, record.getPersonId());
 
                 // 发送订阅消息
                 iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
@@ -277,7 +277,7 @@ public class TaRaiseRecordController extends BaseController {
 
                 // 修改房源锁定状态为未锁定
                 record.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-                iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+                iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED, record.getPersonId());
 
                 // 发送订阅消息
                 iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);

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

@@ -97,7 +97,8 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @return
      */
     Boolean updateHouseLockingStatus(@Param("raiseRecordId") Integer raiseRecordId,
-                                     @Param("houseLockingStatus") String houseLockingStatus);
+                                     @Param("houseLockingStatus") String houseLockingStatus,
+                                     @Param("personId") String personId);
 
     /**
      * 根据房源ID获取房源详情

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

@@ -0,0 +1,218 @@
+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.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.sample.entity.TaContact;
+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.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 联系人表  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaContactController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaContactController.class);
+
+    @Autowired
+    public ITaContactService iTaContactService;
+
+
+    /**
+     * 条件查询联系人列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param contactName
+     * @param telephone
+     * @param phone
+     * @param job
+     * @return
+     */
+    @RequestMapping(value = "/channel/listContactByCondition", method = RequestMethod.GET)
+    public ResponseBean listContactByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               String contactName, String telephone, String phone, String job) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaContact> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name", contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone", telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone", phone);
+            queryWrapper.like(!StringUtils.isEmpty(job),"job", job);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("order_no", "create_date");
+
+            IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContactList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taContact 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/channel/taContact", method = RequestMethod.POST)
+    public ResponseBean taContactAdd(@RequestBody TaContact taContact) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taContact.setCreateDate(LocalDateTime.now());
+            taContact.setStatus(CommConstant.STATUS_NORMAL);
+            if (iTaContactService.save(taContact)) {
+                responseBean.addSuccess(taContact);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContactAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     *
+     */
+    @ResponseBody
+    @RequestMapping(value = "/channel/taContact/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDelete(@RequestBody List<TaContact> taContactList, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaContactService.batchDelete(taContactList,getSysUserId(request));
+            logger.info("TaContactController.batchDelete 返回结果：", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContactDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id        实体ID
+     * @param taContact 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/channel/taContact/{id}", method = RequestMethod.PUT)
+    public ResponseBean taContactUpdate(@PathVariable Integer id,
+                                        @RequestBody TaContact taContact) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaContactService.updateById(taContact)) {
+                responseBean.addSuccess(taContact);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContactUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/taContact/{id}", method = RequestMethod.GET)
+    public ResponseBean taContactGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaContactService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContactDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 联系人列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taContact",method= RequestMethod.GET)
+    public ResponseBean getContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="contactName",required = false) String contactName,
+                                       @RequestParam(value ="telephone",required = false) String telephone,
+                                       @RequestParam(value ="phone",required = false) String phone,
+                                       @RequestParam(value ="job",required = false) String job){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaContact> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name",contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone",telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            queryWrapper.like(!StringUtils.isEmpty(job),"job",job);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("order_no","create_date");
+
+            IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContactList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        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

@@ -0,0 +1,407 @@
+package com.huiju.estateagents.sample.controller;
+
+import com.alibaba.fastjson.JSONArray;
+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.common.CommConstant;
+import com.huiju.estateagents.common.SMSUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.sample.entity.TaH5Demand;
+import com.huiju.estateagents.sample.entity.TaH5Sample;
+import com.huiju.estateagents.sample.entity.TaSampleContact;
+import com.huiju.estateagents.sample.service.ITaContactService;
+import com.huiju.estateagents.sample.service.ITaH5DemandService;
+import com.huiju.estateagents.sample.service.ITaH5SampleService;
+import com.huiju.estateagents.sample.service.ITaSampleContactService;
+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;
+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 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;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+    * 需求单表  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaH5DemandController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaH5DemandController.class);
+
+    @Autowired
+    public ITaH5DemandService iTaH5DemandService;
+
+    @Autowired
+    public ITaH5SampleService iTaH5SampleService;
+
+    @Autowired
+    private ITaSampleContactService iTaSampleContactService;
+
+    @Autowired
+    private ITaContactService taContactService;
+
+    @Autowired
+    private ITaOrgService iTaOrgService;
+
+    @Autowired
+    SysSmsSettingMapper sysSmsSettingMapper;
+
+    @Autowired
+    SMSUtils smsUtils;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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 {
+            //使用分页插件
+		    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);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taH5Demand 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taH5Demand",method= RequestMethod.POST)
+    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 {
+                responseBean.addError("fail");
+            }
+            TaH5Sample taH5Sample = iTaH5SampleService.getById(taH5Demand.getSampleId());
+            QueryWrapper<TaSampleContact> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("sample_id",taH5Sample.getSampleId());
+            List<TaSampleContact> sampleContactList = iTaSampleContactService.list(queryWrapper);
+            if (sampleContactList.size() > 0) {
+                List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>().in("contact_id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList())));
+                taH5Sample.setTaContactList(taContactList);
+                String[] smsParams = {taH5Sample.getSampleName(), taH5Demand.getOrderer() + "-" + taH5Demand.getPhone()};
+                for (TaContact taContact : taContactList){
+                    sendSmsMessage(taContact.getPhone(), CommConstant.MESSAGE_CONTENT_OF_DEMAND, smsParams);
+                }
+
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taH5Demand/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taH5DemandDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaH5DemandService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        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 {
+            int successNum = 0;
+            int failNum = 0;
+            for (TaH5Demand info : taH5Demand.getTaH5Demands()){
+                TaH5Demand h5Demand = iTaH5DemandService.getById(info.getDemandId());
+                if (CommConstant.DEMAND_STATUS_INVALID.equals(h5Demand.getDemandStatus()) || CommConstant.DEMAND_STATUS_SUBMIT.equals(h5Demand.getDemandStatus())){
+                    h5Demand.setDemandStatus(CommConstant.STATUS_DELETE);
+                    iTaH5DemandService.updateById(h5Demand);
+                    successNum++;
+                }else{
+                    failNum++;
+                }
+            }
+            Map<String,Object> map = new HashMap<>();
+            map.put("successNum",successNum);
+            map.put("failNum",failNum);
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taH5Demand 实体对象
+     * @return
+     */
+    @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);
+            taH5Demand.setUpdateDate(LocalDateTime.now());
+            if (iTaH5DemandService.updateById(taH5Demand)){
+                responseBean.addSuccess(taH5Demand);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taH5Demand/{id}",method= RequestMethod.GET)
+    public ResponseBean taH5DemandGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaH5DemandService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 获取h5需求清单
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand",method= RequestMethod.GET)
+    public ResponseBean getH5DemandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @RequestParam(value ="sampleName",required = false) String sampleName,
+                                        @RequestParam(value ="orgName",required = false) String orgName,
+                                        @RequestParam(value ="orderer",required = false) String orderer,
+                                        @RequestParam(value ="phone",required = false) String phone,
+                                        @RequestParam(value ="demandStatus",required = false) Integer demandStatus,
+                                        @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                        @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaH5Demand> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(sampleName),"sample_name",sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(orgName),"org_name",orgName);
+            queryWrapper.like(!StringUtils.isEmpty(orderer),"orderer",orderer);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            queryWrapper.eq(null != demandStatus,"demand_status",demandStatus);
+            queryWrapper.ge(!StringUtils.isEmpty(startCreateDate),"date_format(create_date,'%Y-%m-%d')",startCreateDate);
+            queryWrapper.le(!StringUtils.isEmpty(endCreateDate),"date_format(create_date,'%Y-%m-%d')",endCreateDate);
+            queryWrapper.gt("demand_status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaH5Demand> result = iTaH5DemandService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 批量删除需求单
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/batch",method= RequestMethod.PUT)
+    public ResponseBean batchUpdateH5DemandList(@RequestBody String ids,
+                                        HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            int successNum = 0;
+            int failNum = 0;
+            JSONArray jsonArray = JSONObject.parseObject(ids).getJSONArray("ids");
+            for (Object id : jsonArray) {
+                TaH5Demand h5Demand = iTaH5DemandService.getById((Integer) id);
+                if (CommConstant.DEMAND_STATUS_INVALID.equals(h5Demand.getDemandStatus())){
+                    h5Demand.setDemandStatus(CommConstant.STATUS_DELETE);
+                    iTaH5DemandService.updateById(h5Demand);
+                    successNum++;
+                }else{
+                    failNum++;
+                }
+            }
+            Map<String,Object> map = new HashMap<>();
+            map.put("successNum",successNum);
+            map.put("failNum",failNum);
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取需求单详情
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/{id}",method= RequestMethod.GET)
+    public ResponseBean getH5Demand(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaH5DemandService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getH5Demand -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 更新需求单详情
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/update/{id}",method= RequestMethod.PUT)
+    public ResponseBean updateH5Demand(@PathVariable Integer id,@RequestBody TaH5Demand taH5Demand, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taH5Demand.setCreateDate(null);
+            taH5Demand.setDemandId(id);
+            taH5Demand.setUpdateDate(LocalDateTime.now());
+            responseBean.addSuccess(iTaH5DemandService.updateById(taH5Demand));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getH5Demand -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    private String sendSmsMessage(String tel, String type, String[] params) {
+        if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
+            return "短信发送失败: 没有手机号或者短信模板";
+        }
+
+        QueryWrapper<SysSmsSetting> query = new QueryWrapper<>();
+        query.eq("sms_type", type);
+        query.eq("status", CommConstant.STATUS_NORMAL);
+        query.last("limit 1");
+
+        SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
+        if (null == smsSetting) {
+
+            // TODO 写消息发送日志
+
+            return "没有设置有效的【" + type + "】短信模板";
+        }
+
+        boolean success = smsUtils.sendMessage(smsSetting.getTplCode(), tel, params);
+
+        // TODO 写消息发送日志
+
+        return success ? null : "短信发送失败";
+    }
+}

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

@@ -0,0 +1,427 @@
+package com.huiju.estateagents.sample.controller;
+
+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.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.sample.entity.*;
+import com.huiju.estateagents.sample.service.*;
+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.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 样例表  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaH5SampleController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaH5SampleController.class);
+
+    @Autowired
+    public ITaH5SampleService iTaH5SampleService;
+
+    @Autowired
+    public ITaSampleContactService iTaSampleContactService;
+
+    @Autowired
+    public ITaContactService taContactService;
+
+    @Autowired
+    public ITaH5DemandService iTaH5DemandService;
+
+    @Autowired
+    public ITaNoticeService taNoticeService;
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/channel/listH5SampleByCondition", method = RequestMethod.GET)
+    public ResponseBean listH5SampleByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                String sampleName) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaH5SampleService.listH5SampleByCondition(pageNum, pageSize, sampleName);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("ListH5SampleByCondition -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/admin/taH5Sample", method = RequestMethod.GET)
+    public ResponseBean taH5SampleList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "sampleName", required = false) String sampleName,
+                                       @RequestParam(value = "tag", required = false) String tag) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(sampleName), "sample_name", sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(tag), "tag", tag);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("order_no", "create_date");
+
+            IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taH5Sample 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taH5Sample", method = RequestMethod.POST)
+    public ResponseBean taH5SampleAdd(@RequestBody TaH5Sample taH5Sample, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taH5Sample.setAddUser(getSysUserId(request));
+            if (iTaH5SampleService.save(taH5Sample)) {
+                responseBean.addSuccess(taH5Sample);
+            } else {
+                responseBean.addError("fail");
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taH5Sample/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taH5SampleDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaH5SampleService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id         实体ID
+     * @param taH5Sample 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taH5Sample/{id}", method = RequestMethod.PUT)
+    public ResponseBean taH5SampleUpdate(@PathVariable Integer id,
+                                         @RequestBody TaH5Sample taH5Sample,
+                                         HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taH5Sample.setUpdateUser(getSysUserId(request));
+            taH5Sample.setUpdateDate(LocalDateTime.now());
+            if (iTaH5SampleService.updateById(taH5Sample)) {
+                responseBean.addSuccess(taH5Sample);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/admin/taH5Sample/{id}", method = RequestMethod.GET)
+    public ResponseBean taH5SampleGet(@PathVariable Integer id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaH5Sample sample = iTaH5SampleService.getById(id);
+            if (sample.getStatus() != 1){
+                responseBean.addError("该H5样例已取消发布或已删除");
+                return responseBean;
+            }
+
+            TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
+            QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("sample_id", id);
+            queryWrapper.ne("demand_status", CommConstant.STATUS_DELETE);
+            queryWrapper.eq("org_id", getOrgId(request));
+            Integer demandNum = iTaH5DemandService.count(queryWrapper);
+            IPage<TaContact> taContactIPage = taContactService.taContactInfoBySampleId(String.valueOf(id), 1 , 10);
+            taH5Sample.setTaContactList(taContactIPage.getRecords());
+            taH5Sample.setDemandNum(demandNum);
+            responseBean.addSuccess(taH5Sample);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/channel/h5Sample/list", method = RequestMethod.GET)
+    public ResponseBean geth5SampleList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                        @RequestParam(value = "sampleName", required = false) String sampleName,
+                                        @RequestParam(value = "tag", required = false) String tag,
+                                        @RequestParam(value = "status", required = false) Integer status,
+                                        @RequestParam(value = "startCreateDate", required = false) String startCreateDate,
+                                        @RequestParam(value = "endCreateDate", required = false) String endCreateDate) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(sampleName), "sample_name", sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(tag), "tag", tag);
+            queryWrapper.eq(null != status, "status", status);
+            queryWrapper.ge(!StringUtils.isEmpty(startCreateDate), "date_format(create_date,'%Y-%m-%d')", startCreateDate);
+            queryWrapper.le(!StringUtils.isEmpty(endCreateDate), "date_format(create_date,'%Y-%m-%d')", endCreateDate);
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("order_no", "create_date");
+
+            IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
+            result.getRecords().forEach(e -> {
+                if (!StringUtils.isEmpty(e.getTag())) {
+                    e.setTags(Arrays.asList(e.getTag().split(",")));
+                }
+            });
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taH5Sample 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/channel/h5Sample/add", method = RequestMethod.POST)
+    public ResponseBean AddTaH5Sample(@RequestBody TaH5Sample taH5Sample,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<String> tags = taH5Sample.getTags();
+            taH5Sample.setTag(String.join(",", tags));
+            taH5Sample.setAddUser(getSysUserId(request));
+            taH5Sample.setUpdateUser(getSysUserId(request));
+            taH5Sample.setCreateDate(LocalDateTime.now());
+            taH5Sample.setUpdateDate(LocalDateTime.now());
+            if (iTaH5SampleService.save(taH5Sample)) {
+                List<TaContact> taContactList = taH5Sample.getTaContactList();
+                taContactList.forEach(e -> {
+                    TaSampleContact taSampleContact = new TaSampleContact();
+                    taSampleContact.setContactId(e.getContactId());
+                    taSampleContact.setSampleId(taH5Sample.getSampleId());
+                    iTaSampleContactService.save(taSampleContact);
+                });
+                responseBean.addSuccess(taH5Sample);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 获取详情
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/channel/get/h5Sample/{id}", method = RequestMethod.GET)
+    public ResponseBean getTaH5Sample(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
+            QueryWrapper<TaSampleContact> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("sample_id", taH5Sample.getSampleId());
+            List<TaSampleContact> sampleContactList = iTaSampleContactService.list(queryWrapper);
+            if (sampleContactList.size() > 0) {
+                List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>()
+                        .in("contact_id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList()))
+                        .eq("status",CommConstant.STATUS_NORMAL));
+                taH5Sample.setTaContactList(taContactList);
+            }
+            if (!StringUtils.isEmpty(taH5Sample.getTag())) {
+                taH5Sample.setTags(Arrays.asList(taH5Sample.getTag().split(",")));
+            }
+            responseBean.addSuccess(taH5Sample);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 更新对象
+     *
+     * @param taH5Sample 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/channel/update/h5Sample/{id}", method = RequestMethod.PUT)
+    public ResponseBean updateTaH5Sample(@PathVariable Integer id, @RequestBody TaH5Sample taH5Sample,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taH5Sample.setSampleId(id);
+            List<String> tags = taH5Sample.getTags();
+            if (tags.size() > 0) {
+                taH5Sample.setTag(String.join(",", tags));
+            } else {
+                taH5Sample.setTag("");
+            }
+            QueryWrapper<TaSampleContact> taSampleContactQueryWrapper = new QueryWrapper<>();
+            taSampleContactQueryWrapper.eq("sample_id", id);
+            iTaSampleContactService.remove(taSampleContactQueryWrapper);
+            taH5Sample.setUpdateUser(getSysUserId(request));
+            taH5Sample.setUpdateDate(LocalDateTime.now());
+            if (iTaH5SampleService.updateById(taH5Sample)) {
+                List<TaContact> taContactList = taH5Sample.getTaContactList();
+                taContactList.forEach(e -> {
+                    TaSampleContact taSampleContact = new TaSampleContact();
+                    taSampleContact.setContactId(e.getContactId());
+                    taSampleContact.setSampleId(taH5Sample.getSampleId());
+                    iTaSampleContactService.save(taSampleContact);
+                });
+                //更新需求单中的样例名
+                QueryWrapper<TaH5Demand> taH5DemandQueryWrapper = new QueryWrapper<>();
+                taH5DemandQueryWrapper.eq("sample_id",id);
+                List<TaH5Demand> demandList = iTaH5DemandService.list(taH5DemandQueryWrapper);
+                if (demandList.size() > 0){
+                    demandList.forEach(e -> {
+                        e.setSampleName(taH5Sample.getSampleName());
+                    });
+                    iTaH5DemandService.updateBatchById(demandList);
+                }
+                //更新通知中的样例名
+                QueryWrapper<TaNotice> taNoticeQueryWrapper = new QueryWrapper<>();
+                taNoticeQueryWrapper.eq("target_id",id);
+                taNoticeQueryWrapper.eq("target_type",CommConstant.NOTICE_TYPE_H5);
+                List<TaNotice> noticeList = taNoticeService.list(taNoticeQueryWrapper);
+                if (noticeList.size() > 0){
+                    noticeList.forEach(e -> {
+                        e.setTargetName(taH5Sample.getSampleName());
+                    });
+                    taNoticeService.updateBatchById(noticeList);
+                }
+
+                responseBean.addSuccess(taH5Sample);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 删除sample
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/put/h5Sample/{id}", method = RequestMethod.PUT)
+    public ResponseBean putTaH5Sample(@PathVariable Integer id,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //查看是否有关联的需求单
+            QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("sample_id", id);
+            queryWrapper.gt("demand_status", CommConstant.STATUS_DELETE);
+            List<TaH5Demand> list = iTaH5DemandService.list(queryWrapper);
+            if (list.size() > 0) {
+                return ResponseBean.error("存在关联的需求单，删除失败！", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
+            taH5Sample.setUpdateUser(getSysUserId(request));
+            taH5Sample.setUpdateDate(LocalDateTime.now());
+            taH5Sample.setStatus(CommConstant.STATUS_DELETE);
+            if (iTaH5SampleService.updateById(taH5Sample)) {
+                responseBean.addSuccess(taH5Sample);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,188 @@
+package com.huiju.estateagents.sample.controller;
+
+import com.alibaba.fastjson.JSONObject;
+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.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 开屏通知  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaNoticeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaNoticeController.class);
+
+    @Autowired
+    public ITaNoticeService iTaNoticeService;
+
+    @Autowired
+    public ITaH5SampleService iTaH5SampleService;
+
+    /**
+     * 条件查询通知列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param title
+     * @param targetType
+     * @param targetName
+     * @param status
+     * @param type       类型 目前默认 sample
+     * @return
+     */
+    @RequestMapping(value = "/channel/listNoticeByCondition", method = RequestMethod.GET)
+    public ResponseBean listNoticeByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                              String title, String targetType, String targetName, Integer status,
+                                              String type) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaNoticeService.listNoticeByCondition(pageNum, pageSize, title, targetType, targetName, status, type);
+            logger.info("TaNoticeController.listNoticeByCondition 返回结果：" + JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taNoticeList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taNotice 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/channel/taNotice", method = RequestMethod.POST)
+    public ResponseBean taNoticeAdd(@RequestBody TaNotice taNotice) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taNotice.setCreateDate(LocalDateTime.now());
+            if (iTaNoticeService.save(taNotice)) {
+                responseBean.addSuccess(taNotice);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taNoticeAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除开屏通知
+     *
+     * @param taNoticeList
+     */
+    @ResponseBody
+    @RequestMapping(value = "/channel/taNotice/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDelete(@RequestBody List<TaNotice> taNoticeList) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaNoticeService.batchDelete(taNoticeList);
+            logger.info("TaNoticeController.taNoticeDelete 返回结果：" + JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taNoticeDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id       实体ID
+     * @param taNotice 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/channel/taNotice/{id}", method = RequestMethod.PUT)
+    public ResponseBean taNoticeUpdate(@PathVariable Integer id,
+                                       @RequestBody TaNotice taNotice) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaNoticeService.updateById(taNotice)) {
+                responseBean.addSuccess(taNotice);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taNoticeUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/taNotice/{id}", method = RequestMethod.GET)
+    public ResponseBean taNoticeGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaNotice taNotice = iTaNoticeService.getById(id);
+            if (taNotice == null) {
+                responseBean.addError("fail");
+                return responseBean;
+            }
+            if (taNotice.getTargetId() != null) {
+                TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getTargetId());
+                if (taH5Sample != null) {
+                    taNotice.setTargetName(taH5Sample.getSampleName());
+                }
+            }
+            responseBean.addSuccess(taNotice);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taNoticeDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询通知列表-admin
+     *
+     * @param pageNum
+     * @param pageSize
+     * @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) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaNoticeService.listNoticeByConditionForAdmin(pageNum, pageSize, type);
+            logger.info("TaNoticeController.listNoticeByConditionForAdmin 返回结果：" + JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("listNoticeByConditionForAdmin -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.sample.controller;
+
+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.TaSampleContact;
+import com.huiju.estateagents.sample.service.ITaSampleContactService;
+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;
+
+/**
+ * <p>
+    * 样例与联系人关联表  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@RestController
+@RequestMapping("/")
+public class TaSampleContactController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaSampleContactController.class);
+
+    @Autowired
+    public ITaSampleContactService iTaSampleContactService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taSampleContact",method= RequestMethod.GET)
+    public ResponseBean taSampleContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaSampleContact> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaSampleContact> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaSampleContact> result = iTaSampleContactService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taSampleContactList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taSampleContact 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taSampleContact",method= RequestMethod.POST)
+    public ResponseBean taSampleContactAdd(@RequestBody TaSampleContact taSampleContact){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaSampleContactService.save(taSampleContact)){
+                responseBean.addSuccess(taSampleContact);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taSampleContactAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taSampleContact/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taSampleContactDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaSampleContactService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taSampleContactDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taSampleContact 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taSampleContact/{id}",method= RequestMethod.PUT)
+    public ResponseBean taSampleContactUpdate(@PathVariable Integer id,
+                                        @RequestBody TaSampleContact taSampleContact){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaSampleContactService.updateById(taSampleContact)){
+                responseBean.addSuccess(taSampleContact);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taSampleContactUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taSampleContact/{id}",method= RequestMethod.GET)
+    public ResponseBean taSampleContactGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaSampleContactService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taSampleContactDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.huiju.estateagents.sample.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 联系人表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaContact implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 联系人id
+     */
+    @TableId(value = "contact_id", type = IdType.AUTO)
+    private Integer contactId;
+
+    /**
+     * 姓名
+     */
+    private String contactName;
+
+    /**
+     * 性别 1男2女
+     */
+    private Integer sex;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 对外头衔
+     */
+    private String appellation;
+
+    /**
+     * 固定电话
+     */
+    private String telephone;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 微信号图片
+     */
+    private String wxCardImg;
+
+    /**
+     * 邮箱
+     */
+    private String mail;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 内部岗位
+     */
+    private String job;
+
+    /**
+     * 权重
+     */
+    @TableField(strategy = FieldStrategy.IGNORED)
+    private String orderNo;
+
+    /**
+     * 状态 -1删除0作废1有效
+     */
+    private Integer status;
+
+    /**
+     * 联系人类型 此版本全部固定sample
+     */
+    private String contactType;
+
+
+}

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

@@ -0,0 +1,95 @@
+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;
+
+/**
+ * <p>
+ * 需求单表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaH5Demand implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 需求id
+     */
+    @TableId(value = "demand_id", type = IdType.AUTO)
+    private Integer demandId;
+
+    /**
+     * 样例id
+     */
+    private Integer sampleId;
+
+    /**
+     * 样例名
+     */
+    private String sampleName;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 下单组织
+     */
+    private String orgName;
+
+    /**
+     * 下单人
+     */
+    private String orderer;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 需求描述
+     */
+    private String demandContent;
+
+    /**
+     * 需求单状态 1是已提交2是处理中3是已交付-1是作废
+     */
+    private Integer demandStatus;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 集合对象
+     */
+    @TableField(exist = false)
+    private List<TaH5Demand> taH5Demands;
+}

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

@@ -0,0 +1,139 @@
+package com.huiju.estateagents.sample.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+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.ArrayList;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 样例表
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaH5Sample implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 样例id
+     */
+    @TableId(value = "sample_id", type = IdType.AUTO)
+    private Integer sampleId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 样例名
+     */
+    private String sampleName;
+
+    /**
+     * 样例体验链接
+     */
+    private String sampleTryLink;
+
+    /**
+     * 样例体验二维码/小程序码
+     */
+    @TableField(strategy = FieldStrategy.IGNORED)
+    private String sampleTryCode;
+
+    /**
+     * 封面图
+     */
+    private String coverImg;
+
+    /**
+     * 发布状态 -1删除0作废1有效
+     */
+    private Integer status;
+
+    /**
+     * 权重
+     */
+    @TableField(strategy = FieldStrategy.IGNORED)
+    private Integer orderNo;
+
+    /**
+     * 标签 用逗号分隔
+     */
+    private String tag;
+
+    /**
+     * 样例类型 rich富文本link外部链接
+     */
+    private String sampleType;
+
+    /**
+     * 样例内容
+     */
+    private String sampleContent;
+
+    /**
+     * 样例链接
+     */
+    private String sampleContentLink;
+
+    /**
+     * 标签集合
+     */
+    @TableField(exist = false)
+    private List<String> tags = new ArrayList<>();
+
+    /**
+     * 标签集合
+     */
+    @TableField(exist = false)
+    private List<TaContact> taContactList = new ArrayList<>();
+
+    /**
+     * 修改人
+     */
+    private Integer updateUser;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 新增人
+     */
+    private Integer addUser;
+
+    /**
+     * 添加人姓名
+     */
+    @TableField(exist = false)
+    private String addUserName;
+
+    /**
+     * 修改人姓名
+     */
+    @TableField(exist = false)
+    private String updateUserName;
+
+    /**
+     * 样例中需求单个数
+     */
+    @TableField(exist = false)
+    private Integer demandNum;
+}

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

@@ -0,0 +1,85 @@
+package com.huiju.estateagents.sample.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 开屏通知
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 通知id
+     */
+    @TableId(value = "notice_id", type = IdType.AUTO)
+    private Integer noticeId;
+
+    /**
+     * 通知标题
+     */
+    private String title;
+
+    /**
+     * 通知图
+     */
+    private String noticeImg;
+
+    /**
+     * 关联业务类型 此版本固定sample
+     */
+    private String targetType;
+
+    /**
+     * 关联业务 此版本固定sample_id
+     */
+    private Integer targetId;
+
+    /**
+     * 关联业务名
+     */
+    @TableField(exist = false)
+    private String targetName;
+
+    /**
+     * 状态 -1删除0是未发布1是已发布
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 自动下架时间 每次查询的时候过滤，并更新status
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(strategy = FieldStrategy.IGNORED)
+    private LocalDateTime invalidTime;
+
+    /**
+     * 权重
+     */
+    @TableField(strategy = FieldStrategy.IGNORED)
+    private Integer orderNo;
+}

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

@@ -0,0 +1,42 @@
+package com.huiju.estateagents.sample.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 样例与联系人关联表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSampleContact implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 样例与联系人关联表
+     */
+    @TableId(value = "sample_contact_id", type = IdType.AUTO)
+    private Integer sampleContactId;
+
+    /**
+     * 样例id
+     */
+    private Integer sampleId;
+
+    /**
+     * 联系人id
+     */
+    private Integer contactId;
+
+
+}

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

@@ -0,0 +1,22 @@
+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;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 联系人表  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @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/TaH5DemandMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.sample.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.sample.entity.TaH5Demand;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 需求单表  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Mapper
+public interface TaH5DemandMapper extends BaseMapper<TaH5Demand> {
+
+}

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

@@ -0,0 +1,28 @@
+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 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Mapper
+@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/mapper/TaNoticeMapper.java

@@ -0,0 +1,49 @@
+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.TaNotice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 开屏通知  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Mapper
+@Component
+public interface TaNoticeMapper extends BaseMapper<TaNotice> {
+
+    /**
+     * 条件查询开屏通知
+     *
+     * @param pg
+     * @param title
+     * @param targetType
+     * @param targetName
+     * @param status
+     * @return
+     */
+    IPage<TaNotice> listNoticeByCondition(IPage<TaNotice> pg, @Param("title") String title,
+                                          @Param("targetType") String targetType,
+                                          @Param("targetName") String targetName,
+                                          @Param("status") Integer status,
+                                          @Param("type") String type);
+
+    IPage<TaNotice> listNoticeByConditionForAdmin(IPage<TaNotice> pg,
+                                                  @Param("type") String type);
+
+    /**
+     * 自动下架已过期的开屏通知
+     *
+     * @return
+     */
+    Integer updateStatusByInvalidTime();
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.sample.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.sample.entity.TaSampleContact;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 样例与联系人关联表  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Mapper
+public interface TaSampleContactMapper extends BaseMapper<TaSampleContact> {
+
+}

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

@@ -0,0 +1,29 @@
+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>
+ * 联系人表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+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/ITaH5DemandService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.sample.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.sample.entity.TaH5Demand;
+
+/**
+ * <p>
+ * 需求单表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+public interface ITaH5DemandService extends IService<TaH5Demand> {
+
+}

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

@@ -0,0 +1,27 @@
+package com.huiju.estateagents.sample.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.sample.entity.TaH5Sample;
+
+/**
+ * <p>
+ * 样例表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+public interface ITaH5SampleService extends IService<TaH5Sample> {
+
+    /**
+     * 条件查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param sampleName
+     * @return
+     */
+    ResponseBean listH5SampleByCondition(Integer pageNum, Integer pageSize, String sampleName);
+
+}

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

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.sample.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.sample.entity.TaNotice;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 开屏通知  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+public interface ITaNoticeService extends IService<TaNotice> {
+
+    /**
+     * 条件查询开屏通知列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param title
+     * @param targetType
+     * @param targetName
+     * @param status
+     * @param type
+     * @return
+     */
+    ResponseBean listNoticeByCondition(Integer pageNum, Integer pageSize, String title, String targetType, String targetName,
+                                       Integer status, String type);
+
+    ResponseBean listNoticeByConditionForAdmin(Integer pageNum, Integer pageSize, String type);
+
+    /**
+     * 批量删除
+     *
+     * @param taNoticeList
+     * @return
+     */
+    ResponseBean batchDelete(List<TaNotice> taNoticeList);
+
+    /**
+     * 自动下架已过期的开屏通知
+     *
+     * @return
+     */
+    Integer updateStatusByInvalidTime();
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.sample.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.sample.entity.TaSampleContact;
+
+/**
+ * <p>
+ * 样例与联系人关联表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+public interface ITaSampleContactService extends IService<TaSampleContact> {
+
+}

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

@@ -0,0 +1,61 @@
+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>
+ * 联系人表  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Service
+public class TaContactServiceImpl extends ServiceImpl<TaContactMapper, TaContact> implements ITaContactService {
+
+    @Autowired
+    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);
+    }
+
+    @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/java/com/huiju/estateagents/sample/service/impl/TaH5DemandServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.sample.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.sample.entity.TaH5Demand;
+import com.huiju.estateagents.sample.mapper.TaH5DemandMapper;
+import com.huiju.estateagents.sample.service.ITaH5DemandService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 需求单表  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Service
+public class TaH5DemandServiceImpl extends ServiceImpl<TaH5DemandMapper, TaH5Demand> implements ITaH5DemandService {
+
+}

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

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.sample.service.impl;
+
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.sample.entity.TaH5Sample;
+import com.huiju.estateagents.sample.mapper.TaH5SampleMapper;
+import com.huiju.estateagents.sample.service.ITaH5SampleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 样例表  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Service
+public class TaH5SampleServiceImpl extends ServiceImpl<TaH5SampleMapper, TaH5Sample> implements ITaH5SampleService {
+
+    @Autowired
+    private TaH5SampleMapper taH5SampleMapper;
+
+    @Override
+    public ResponseBean listH5SampleByCondition(Integer pageNum, Integer pageSize, String sampleName) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
+        pg = taH5SampleMapper.listH5SampleByCondition(pg, sampleName);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.huiju.estateagents.sample.service.impl;
+
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.sample.entity.TaNotice;
+import com.huiju.estateagents.sample.mapper.TaNoticeMapper;
+import com.huiju.estateagents.sample.service.ITaNoticeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 开屏通知  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Slf4j
+@Service
+public class TaNoticeServiceImpl extends ServiceImpl<TaNoticeMapper, TaNotice> implements ITaNoticeService {
+
+    @Autowired
+    private TaNoticeMapper taNoticeMapper;
+
+    @Override
+    public ResponseBean listNoticeByCondition(Integer pageNum, Integer pageSize, String title, String targetType, String targetName, Integer status, String type) {
+        log.info("TaNoticeServiceImpl.listNoticeByCondition 接收参数：pageNum:{},pageSize:{},title:{},targetType:{},targetName:{},status:{},type:{}",
+                pageNum, pageSize, title, targetType, targetName, status, type);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        //使用分页插件
+        IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
+        pg = taNoticeMapper.listNoticeByCondition(pg, title, targetType, targetName, status, type);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean listNoticeByConditionForAdmin(Integer pageNum, Integer pageSize, String type) {
+        log.info("TaNoticeServiceImpl.listNoticeByConditionForAdmin 接收参数：pageNum:{},pageSize:{},type:{}",
+                pageNum, pageSize, type);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        //使用分页插件
+        IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
+        pg = taNoticeMapper.listNoticeByConditionForAdmin(pg, type);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean batchDelete(List<TaNotice> taNoticeList) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaNotice> updateList = new ArrayList<>();
+        TaNotice newNotice;
+        for (TaNotice taNotice : taNoticeList) {
+            newNotice = new TaNotice();
+            newNotice.setNoticeId(taNotice.getNoticeId());
+            newNotice.setStatus(CommConstant.STATUS_DELETE);
+            updateList.add(newNotice);
+        }
+
+        responseBean.addSuccess(updateBatchById(updateList));
+        return responseBean;
+    }
+
+    @Override
+    public Integer updateStatusByInvalidTime() {
+        return taNoticeMapper.updateStatusByInvalidTime();
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.sample.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.sample.entity.TaSampleContact;
+import com.huiju.estateagents.sample.mapper.TaSampleContactMapper;
+import com.huiju.estateagents.sample.service.ITaSampleContactService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 样例与联系人关联表  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-18
+ */
+@Service
+public class TaSampleContactServiceImpl extends ServiceImpl<TaSampleContactMapper, TaSampleContact> implements ITaSampleContactService {
+
+}

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

@@ -101,5 +101,5 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
      * @param houseLockingStatus
      * @return
      */
-    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus);
+    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus,String personId);
 }

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

@@ -5,6 +5,8 @@ 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.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
@@ -97,6 +99,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     private TaRaiseRecordMapper taRaiseRecordMapper;
 
+    @Autowired
+    private TaUserServiceImpl taUserService;
+
     /**
      * 分页获取房源列表
      *
@@ -671,6 +676,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         taRaiseRecordQueryWrapper.eq("raise_record_id", raiseRecordId);
         TaRaiseRecord raiseRecord = taRaiseRecordMapper.selectOne(taRaiseRecordQueryWrapper);
 
+        TaUser taUser = taUserService.getUserInfoById(userId, orgId);
         // 更新为锁定状态
         if ("locked".equals(type)) {
             // 校验当前房源状态
@@ -692,6 +698,10 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
             taRaiseRecord.setRaiseRecordId(raiseRecordId);
             taRaiseRecord.setHouseLockingStatus("locked");
+            if(taUser != null){
+                taRaiseRecord.setUpdateUserName(taUser.getUserName());
+            }
+            taRaiseRecord.setUpdateDate(LocalDateTime.now());
             taRaiseRecordMapper.updateById(taRaiseRecord);
 
             // 更新关联表状态
@@ -723,6 +733,10 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
             taRaiseRecord.setRaiseRecordId(raiseRecordId);
             taRaiseRecord.setHouseLockingStatus("unlocked");
+            if(taUser != null){
+                taRaiseRecord.setUpdateUserName(taUser.getUserName());
+            }
+            taRaiseRecord.setUpdateDate(LocalDateTime.now());
             taRaiseRecordMapper.updateById(taRaiseRecord);
 
             // 更新关联表状态

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

@@ -316,8 +316,8 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     }
 
     @Override
-    public Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus) {
+    public Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus, String personId) {
         logger.info("TaRaiseRecordServiceImpl.updateHouseLockingStatus 接收参数:raiseRecordId:{},houseLockingStatus:{}", raiseRecordId, houseLockingStatus);
-        return taHousingResourcesMapper.updateHouseLockingStatus(raiseRecordId, houseLockingStatus);
+        return taHousingResourcesMapper.updateHouseLockingStatus(raiseRecordId, houseLockingStatus, personId);
     }
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -220,6 +220,7 @@
             t.update_date = now()
         WHERE
             t.house_id IN ( SELECT tr.house_id FROM ta_raise_house tr WHERE tr.raise_record_id = #{raiseRecordId})
+            AND t.house_locking_person = #{personId}
     </update>
 
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">

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

@@ -0,0 +1,14 @@
+<?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.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} )
+            AND t.`status` = 1
+    </select>
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.sample.mapper.TaH5DemandMapper">
+
+</mapper>

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

@@ -0,0 +1,36 @@
+<?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.sample.mapper.TaH5SampleMapper">
+
+    <select id="listH5SampleByCondition" resultType="com.huiju.estateagents.sample.entity.TaH5Sample">
+        SELECT
+            t.*,
+            t2.user_name addUserName,
+            t3.user_name updateUserName
+        FROM
+            ta_h5_sample t
+            LEFT JOIN sys_user t2 ON t.add_user = t2.user_id
+            LEFT JOIN sys_user t3 ON t.update_user = t3.user_id
+        WHERE
+            t.`status` = 1
+            <if test = "sampleName != null and sampleName != ''">
+                AND t.sample_name LIKE concat('%',#{sampleName},'%')
+            </if>
+        ORDER BY
+            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>

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

@@ -0,0 +1,51 @@
+<?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.sample.mapper.TaNoticeMapper">
+
+    <select id="listNoticeByCondition" resultType="com.huiju.estateagents.sample.entity.TaNotice">
+        SELECT
+            t.*,
+            t2.sample_name targetName
+        FROM
+            ta_notice t
+            LEFT JOIN ta_h5_sample t2 ON t.target_id = t2.sample_id
+        where
+            t.`status` != -1
+            <if test="title != null and title != ''">
+                AND t.title like CONCAT('%',#{title}, '%')
+            </if>
+            <if test="targetName != null and targetName != ''">
+                AND t2.sample_name like CONCAT('%',#{targetName}, '%')
+            </if>
+            <if test="targetType != null and targetType != ''">
+                AND t.target_type = #{targetType}
+            </if>
+            <if test="status != null">
+                AND t.`status` = #{status}
+            </if>
+        ORDER BY
+            t.order_no DESC,t.create_date DESC
+    </select>
+
+    <select id="listNoticeByConditionForAdmin" resultType="com.huiju.estateagents.sample.entity.TaNotice">
+        SELECT
+            t.*,
+            t2.sample_name targetName
+        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( )
+        ORDER BY
+            t.order_no DESC,
+            t.create_date DESC
+    </select>
+
+    <update id="updateStatusByInvalidTime">
+        UPDATE ta_notice t
+            SET t.`status` = 0
+        WHERE
+            t.invalid_time &lt; NOW( )
+    </update>
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.sample.mapper.TaSampleContactMapper">
+
+</mapper>