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

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/TaH5DemandController.java

@@ -359,6 +359,7 @@ public class TaH5DemandController extends BaseController {
     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));

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

@@ -225,7 +225,7 @@ public class TaH5SampleController extends BaseController {
             QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(!StringUtils.isEmpty(sampleName), "sample_name", sampleName);
             queryWrapper.like(!StringUtils.isEmpty(tag), "tag", tag);
-            queryWrapper.eq(null != status, "demand_status", status);
+            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);

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

@@ -1,5 +1,6 @@
 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;
@@ -52,6 +53,7 @@ public class TaH5Sample implements Serializable {
     /**
      * 样例体验二维码/小程序码
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String sampleTryCode;
 
     /**

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/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/TaNoticeMapper.xml

@@ -12,7 +12,7 @@
         where
             t.`status` != -1
             <if test="title != null and title != ''">
-                t.title like CONCAT('%',#{title}, '%')
+                AND t.title like CONCAT('%',#{title}, '%')
             </if>
             <if test="targetName != null and targetName != ''">
                 AND t2.sample_name like CONCAT('%',#{targetName}, '%')