Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

# Conflicts:
#	src/main/java/com/yunzhi/marketing/xlk/entity/SearchHouse.java

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -397,16 +397,16 @@ public class TaBuildingDynamicController extends BaseController {
         }
         TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(taActivityDynamicEnlist.getDynamicId());
         // TODO 看代码里面是 is_enlist = 1 才是允许报名
-        if (buildingDynamic.getIsEnlist().intValue() != 1) {
+        if (buildingDynamic.getIsEnlist() != 1) {
             return ResponseBean.error("活动不允许报名", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         // 携带的报名人数(是已经包括自己了)，不能超过活动总人数
 
         // 检验 个人最大报名人数
-        if (taActivityDynamicEnlist.getAttendNum() > buildingDynamic.getMaxEnlistByPerson().intValue()) {
-            return ResponseBean.error("报名失败，超过活动报名的个人最大报名人数！", ResponseBean.ERROR_UNAVAILABLE);
-        }
+//        if (taActivityDynamicEnlist.getAttendNum() > buildingDynamic.getMaxEnlistByPerson().intValue()) {
+//            return ResponseBean.error("报名失败，超过活动报名的个人最大报名人数！", ResponseBean.ERROR_UNAVAILABLE);
+//        }
 
         // 当前活动已报名的总人数
         Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);

src/main/java/com/yunzhi/marketing/job/JudglActivityTimeJob.java

@@ -54,7 +54,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-//    @Scheduled(cron = "* 0/5 * * * ?")
+    @Scheduled(cron = "* 0/1 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 
@@ -65,29 +65,29 @@ public class JudglActivityTimeJob extends BaseController {
         //进行中活动更新为已结束
         iTaBuildingDynamicService.updateProcessingActivity();
 
-        //判断拼团活动是否开始
-        iTaShareActivityService.updateActivityToUnStart();
-        //未开始拼团活动更新为已开始
-        iTaShareActivityService.updateUnStartGroupActivity();
-        //进行中拼团活动更新为已结束
-        iTaShareActivityService.updateProcessingGroupActivity();
-
-        //更新拼团者和参团者数据为已结束
-        iTaShareRecordService.updateActivityProcessToEnd();
-        iTaShareChildRecordService.updateActivityProcessToEnd();
-
-        //判断助力活动是否开始
-        iHelpActivityService.updateActivityToUnStart();
-        //未开始助力活动更新为已开始
-        iHelpActivityService.updateUnStartHelpActivity();
-        //进行中助力活动更新为已结束
-        iHelpActivityService.updateProcessingHelpActivity();
-
-        //更新助力者和发起者数据为已结束
-        iHelpInitiateRecordService.updateHelpActivityProcessToEnd();
-
-        //更新H5活动状态为已结束
-        iTaDrainageService.updateDrainageToEnd();
+//        //判断拼团活动是否开始
+//        iTaShareActivityService.updateActivityToUnStart();
+//        //未开始拼团活动更新为已开始
+//        iTaShareActivityService.updateUnStartGroupActivity();
+//        //进行中拼团活动更新为已结束
+//        iTaShareActivityService.updateProcessingGroupActivity();
+//
+//        //更新拼团者和参团者数据为已结束
+//        iTaShareRecordService.updateActivityProcessToEnd();
+//        iTaShareChildRecordService.updateActivityProcessToEnd();
+//
+//        //判断助力活动是否开始
+//        iHelpActivityService.updateActivityToUnStart();
+//        //未开始助力活动更新为已开始
+//        iHelpActivityService.updateUnStartHelpActivity();
+//        //进行中助力活动更新为已结束
+//        iHelpActivityService.updateProcessingHelpActivity();
+//
+//        //更新助力者和发起者数据为已结束
+//        iHelpInitiateRecordService.updateHelpActivityProcessToEnd();
+//
+//        //更新H5活动状态为已结束
+//        iTaDrainageService.updateDrainageToEnd();
     }
 
 }

src/main/java/com/yunzhi/marketing/xlk/controller/SearchHouseController.java

@@ -70,12 +70,18 @@ public class SearchHouseController extends BaseController {
     public ResponseBean searchHouseList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                         @RequestParam(value ="type") Integer type,
+                                        @RequestParam(value ="name", required = false) String name,
+                                        @RequestParam(value ="phone", required = false) String phone,
+                                        @RequestParam(value ="status", required = false) String status,
                                         @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            SearchHouse searchHouse = new SearchHouse();
+            SearchHouseVO searchHouse = new SearchHouseVO();
             searchHouse.setOrgId(getOrgId(request));
             searchHouse.setType(type);
+            searchHouse.setNickname(name);
+            searchHouse.setPhone(phone);
+            searchHouse.setStatus(status);
             //使用分页插件
             IPage<SearchHouseVO> pg = new Page<>(pageNum, pageSize);
             responseBean = iSearchHouseService.selectSearchHouseList(pg,searchHouse);

src/main/java/com/yunzhi/marketing/xlk/entity/SearchHouse.java

@@ -98,8 +98,4 @@ public class SearchHouse implements Serializable {
      */
     private String remark;
 
-    /**
-     * 问卷json字符串
-     */
-    private String questionnaire;
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/SearchHouseMapper.java

@@ -18,7 +18,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface SearchHouseMapper extends BaseMapper<SearchHouse> {
 
-    IPage<SearchHouseVO> selectSearchHouseList(IPage<SearchHouseVO> pg,@Param("params") SearchHouse searchHouse);
+    IPage<SearchHouseVO> selectSearchHouseList(IPage<SearchHouseVO> pg,@Param("params") SearchHouseVO searchHouse);
 
     SearchHouseVO selectSearchHouseDetail(String id);
 }

src/main/java/com/yunzhi/marketing/xlk/service/ISearchHouseService.java

@@ -23,7 +23,7 @@ public interface ISearchHouseService extends IService<SearchHouse> {
      * @param searchHouse
      * @return
      */
-    ResponseBean selectSearchHouseList(IPage<SearchHouseVO> pg, SearchHouse searchHouse);
+    ResponseBean selectSearchHouseList(IPage<SearchHouseVO> pg, SearchHouseVO searchHouse);
 
     SearchHouseVO selectSearchHouseDetail(String id);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/SearchHouseServiceImpl.java

@@ -34,7 +34,7 @@ public class SearchHouseServiceImpl extends ServiceImpl<SearchHouseMapper, Searc
      * @return
      */
     @Override
-    public ResponseBean selectSearchHouseList(IPage<SearchHouseVO> pg, SearchHouse searchHouse) {
+    public ResponseBean selectSearchHouseList(IPage<SearchHouseVO> pg, SearchHouseVO searchHouse) {
         IPage<SearchHouseVO> result = searchHouseMapper.selectSearchHouseList(pg,searchHouse);
         return ResponseBean.success(result);
     }

src/main/resources/mapper/xlk/SearchHouseMapper.xml

@@ -14,6 +14,15 @@
             LEFT JOIN ta_person p ON t.person_id = p.person_id
             WHERE t.ORG_ID = #{params.orgId}
                 and t.type = #{params.type}
+        <if test="params.nickname != null and params.nickname != ''">
+            and p.nickname like concat('%', #{params.nickname}, '%')
+        </if>
+        <if test="params.phone != null and params.phone != ''">
+            and p.phone like concat('%', #{phone}, '%')
+        </if>
+        <if test="params.status != null and params.status != ''">
+            and t.status = #{params.status}
+        </if>
     </select>
     <select id="selectSearchHouseDetail" resultType="com.yunzhi.marketing.xlk.vo.SearchHouseVO">
         SELECT