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

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

@@ -227,9 +227,9 @@ public class TaChannelController extends BaseController {
     }
 
     /**
-     * 渠道邀请经纪人
+     * 渠道邀请经纪人列表
      */
-    @ApiOperation(value = "渠道邀请经纪人", notes = "渠道邀请经纪人")
+    @ApiOperation(value = "渠道邀请经纪人列表", notes = "渠道邀请经纪人列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "query",value = "姓名"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),

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

@@ -511,7 +511,7 @@ public class TaRecommendCustomerController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(null == taRecommendCustomer.getVerifyStatus()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
+            if(null == taRecommendCustomer.getVerifyStatus() || 0 == taRecommendCustomer.getVerifyStatus().intValue()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);

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

@@ -108,10 +108,11 @@ public class TaShareActivityController extends BaseController {
     public ResponseBean taShareActivityList(@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,
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, getOrgId(request));
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());

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

@@ -70,7 +70,7 @@ public class TdPointsRulesController extends BaseController {
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
             Integer orgId = getOrgId(request);
-            //queryWrapper.eq("org_id",orgId);
+            queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -74,8 +75,8 @@ public class TaDrainageRecordController extends BaseController {
     public ResponseBean taDrainageRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "drainageId") Integer drainageId,
-                                             @RequestParam(value = "startTime",required = false) String startTime,
-                                             @RequestParam(value = "endTime",required = false) String endTime,
+                                             @RequestParam(value = "startTime",required = false) LocalDate startTime,
+                                             @RequestParam(value = "endTime",required = false) LocalDate endTime,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -84,8 +85,8 @@ public class TaDrainageRecordController extends BaseController {
             QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("drainage_id",drainageId);
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
-            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
+            queryWrapper.gt(null != startTime,"create_date",startTime);
+            queryWrapper.lt(null != endTime,"create_date",endTime);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainageRecord> result = iTaDrainageRecordService.page(pg, queryWrapper);

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

@@ -29,4 +29,11 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
     void updateEndGroupActivity();
+
+    /**
+     * 计算成团数
+     * @param groupActivityId
+     * @return
+     */
+    Integer countGroupBuyPeople(@Param("groupActivityId") Integer groupActivityId);
 }

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

@@ -37,5 +37,5 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId);
 }

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.mapper.TaShareRecordMapper;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,8 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
 
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
+    @Autowired
+    private TaShareRecordMapper taShareRecordMapper;
 
     @Override
     public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
@@ -52,7 +55,9 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();
         for (TaShareActivity taShareActivity : taShareActivities){
             Integer participateNum = taShareActivityMapper.calParticipateNum(taShareActivity.getGroupActivityId());
+            Integer groupPeoplePeople = taShareRecordMapper.countGroupBuyPeople(taShareActivity.getGroupActivityId());
             taShareActivity.setParticipateNum(participateNum);
+            taShareActivity.setGroupBuyPeople(groupPeoplePeople);
         }
         taNewsIPage.setRecords(taShareActivities);
         responseBean.addSuccess(taNewsIPage);
@@ -70,7 +75,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     }
 
     @Override
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId) {
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -80,6 +85,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.in("activity_status", 0, 1);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
+        queryWrapper.eq(buildingId != null, "building_id", buildingId);
         queryWrapper.orderByAsc("activity_status");
         queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -178,4 +178,8 @@
             AND t.person_id = #{personId}
         order by status,create_time desc
     </select>
+
+    <select id="countGroupBuyPeople" resultType="java.lang.Integer">
+        select count(1) From ta_share_record t where t.group_activity_id = #{groupActivityId} GROUP BY t.group_activity_id
+    </select>
 </mapper>