提价

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

             @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", paramType = "query", value = "活动结束时间"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "activityStatus", paramType = "query", value = "活动状态")
     })
-    @RequestMapping(value = "admin/helpActivity/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/helpActivity/list", method = RequestMethod.GET)
     public ResponseBean helpActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
         return helpActivityList;
     }
 
+    /**
+     * 活动助力列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "活动助力列表 已开始 和 未开始", notes = "活动助力列表 已开始 和 未开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "项目"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query", value = "标题"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "startDate", paramType = "query", value = "活动开始时间"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", paramType = "query", value = "活动结束时间")
+    })
+    @RequestMapping(value = "/admin/helpActivityEffective/list", method = RequestMethod.GET)
+    public ResponseBean helpActivityEffectiveList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "cityId", required = false) Integer cityId,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "title", required = false) String title,
+                                         @RequestParam(value = "startDate", required = false) String startDate,
+                                         @RequestParam(value = "endDate", required = false) String endDate,
+                                         HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, orgId);
+        return helpActivityList;
+    }
+
     @ApiOperation(value = "活动助力新增", notes = "活动助力新增")
     @ApiImplicitParams({
             @ApiImplicitParam(dataType = "HelpActivity", name = "parameter", paramType = "body", value = "当前对象")
     })
-    @RequestMapping(value = "admin/helpActivity/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/helpActivity/add", method = RequestMethod.POST)
     public ResponseBean helpActivityAdd(@RequestBody String parameter, HttpServletRequest request) {
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
         ResponseBean responseBean = new ResponseBean();

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

         return responseBean;
     }
 
+
+    /**
+     * 分页查询列表 已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivityEffective/list",method= RequestMethod.GET)
+    public ResponseBean taShareActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="buildingId",required = false) String buildingId,
+                                            @RequestParam(value ="activityName",required = false) String activityName,
+                                            @RequestParam(value ="cityId",required = false)Integer cityId,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, buildingId, activityName, null, null, cityId, getOrgId(request));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      * @param parameter 实体对象json格式

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

      * @return
      */
     List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
+
+    /**
+     * 列表 已开始 和 未开始
+     * @param pg
+     * @param cityId
+     * @param buildingId
+     * @param title
+     * @param startDate
+     * @param endDate
+     * @param orgId
+     * @return
+     */
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId);
 }

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

      * @return
      */
     ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId);
+
+    /**
+     * 列表  已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @param cityId
+     * @param buildingId
+     * @param title
+     * @param startDate
+     * @param endDate
+     * @param orgId
+     * @return
+     */
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId);
 }

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

      * @param endGroupActivityId
      */
     void updateEndActivity(List<Integer> endGroupActivityId);
+
+    /**
+     * 查询拼团  已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param activityName
+     * @param startTime
+     * @param endTime
+     * @param cityId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, String buildingId, String activityName, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
 }

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

         responseBean.addSuccess(HelpActivity);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, buildingId, title, startDate, endDate, orgId);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
 }

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

             taShareActivityMapper.updateEndGroupActivity(endGroupActivityId);
         }
     }
+
+    @Override
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, String buildingId, String activityName, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        Page<TaShareActivity> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(buildingId != null, "building_id", buildingId);
+        queryWrapper.like(activityName != null, "activity_name", activityName);
+        queryWrapper.in("activity_status", 0, 1);
+        queryWrapper.eq(startTime != null, "start_time", startTime);
+        queryWrapper.eq(endTime != null, "end_time", endTime);
+        queryWrapper.eq(orgId != null, "org_id", orgId);
+        queryWrapper.eq(cityId != null, "city_id", cityId);
+        queryWrapper.orderByAsc("activity_status");
+        queryWrapper.orderByAsc("start_time");
+        IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
+
+        List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();
+        for (TaShareActivity taShareActivity : taShareActivities){
+            Integer participateNum = taShareActivityMapper.calParticipateNum(taShareActivity.getGroupActivityId());
+            taShareActivity.setParticipateNum(participateNum);
+        }
+        taNewsIPage.setRecords(taShareActivities);
+        responseBean.addSuccess(taNewsIPage);
+        return responseBean;
+    }
 }

src/main/resources/mapper/HelpActivityMapper.xml

 					and org_id =#{orgId}
 			)
     </select>
+
+    <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">
+        SELECT
+        COUNT(hir.verification) as succeedCount,
+        ha.*
+        FROM
+        ta_help_activity ha
+        LEFT JOIN ta_help_initiate_record hir ON ha.help_activity_id = hir.help_activity_id
+        AND (hir.verification is NULL or hir.verification != '')
+        <where>
+            <if test="cityId != null and cityId != ''">
+                and ha.city_id = #{cityId}
+            </if>
+            <if test="buildingId != null and buildingId != ''">
+                and ha.building_id = #{buildingId}
+            </if>
+            <if test="title != null and title != ''">
+                and ha.title like CONCAT('%',#{title}, '%')
+            </if>
+            <if test="startDate != null and startDate != ''and startDate!='Invalid date'">
+                and date_format(ha.start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
+            </if>
+            <if test="endDate != null and endDate != ''and endDate!='Invalid date'">
+                and date_format(ha.end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
+            </if>
+            and ha.org_id=#{orgId}
+            and ha.activity_status in (0, 1)
+        </where>
+        GROUP BY ha.help_activity_id
+        order by ha.activity_status = 0 desc,
+        ha.activity_status = 1 desc,
+        ha.activity_status = 2 desc,
+        ha.start_date asc
+    </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

 	WHERE a.customer_id = #{customerId}
     </select>
 
-    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
-        SELECT
-        b.*
-        FROM
-        ta_person b
-        <where>
-            b.status > 0
-            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-            <if test="name != null and name !=''">
-                and b.nickname like CONCAT('%',#{name}, '%')
-            </if>
-            <if test="tel != null and tel!=''">
-                and b.phone like CONCAT('%',#{tel}, '%')
-            </if>
-            <if test="entryType != null and entryType !=''">
-                and b.entry_type = #{entryType}
-            </if>
-            <if test="sex != null and sex !=''">
-                and b.sex = #{sex}
-            </if>
-            <if test="orgId != null">
-                and b.org_id = #{orgId}
-            </if>
-            <if test="consultTel != null and consultTel !=''">
-                and b.tel like CONCAT('%',#{consultTel}, '%')
-            </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
-        </where>
-        order by b.create_date desc
+    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        select * from
+        ta_recommend_customer ta
+        WHERE (ta.realty_consultant is NULL OR ta.realty_consultant = '')
+        order by ta.create_date desc
     </select>
 
     <select id="getRecCustomerExport" resultType="com.huiju.estateagents.excel.ExcelRecommendCustomer">