feats"

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.1.8</version>
+	<version>1.2.1</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

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

@@ -19,6 +19,7 @@ import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.property.service.ITaUserVerifyService;
 import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
@@ -103,6 +104,7 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private IExtendContentService iExtendContentService;
 
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -422,6 +424,12 @@ public class TaBuildingDynamicController extends BaseController {
             return ResponseBean.error("报名失败，超过活动报名的最大人数！", ResponseBean.ERROR_UNAVAILABLE);
         }
 
+        // 已报名家庭不允许重复报名
+        Integer hasExists = taActivityDynamicEnlistMapper.countEnlistBy(orgId, taActivityDynamicEnlist.getHouseInfo());
+        if (hasExists > 0) {
+             return ResponseBean.error("您的家庭已有人报名当前活动！", ResponseBean.ERROR_UNAVAILABLE);
+         }
+
         TaPerson person = taPersons.get(0);
 
         // 反向更新TaSharePersonFrom 的 status

src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java

@@ -57,6 +57,11 @@ public class TaActivityDynamicEnlist implements Serializable {
 
     private String sharePersonType;
 
+    /**
+     * 房产信息
+     */
+    private String houseInfo;
+
     /**
      * 报名人数
      */

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

@@ -49,4 +49,6 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
     List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("dynamicId") String dynamicId, @Param("isCheckin") String isCheckin, @Param("name") String name, @Param("phone") String phone,@Param("orgId") Integer orgId);
 
     Map<String, Integer> getLastActEnlistNum(Integer orgId);
+
+    Integer countEnlistBy(@Param("orgId") Integer orgId, @Param("houseInfo") String houseInfo);
 }

src/main/java/com/huiju/estateagents/property/controller/AnnouncementTelController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.AnnouncementTel;
 import com.huiju.estateagents.property.service.IAnnouncementTelService;
@@ -176,10 +177,10 @@ public class AnnouncementTelController extends BaseController {
 
 	 @ApiOperation(value = "获取物业号码", notes = "获取物业号码")
 	@RequestMapping(value = "/wx/tels",method = RequestMethod.GET)
-	public ResponseBean getWxTelList(@RequestParam(value = "type") String type ,@RequestParam(value = "communityId") String communityId ,HttpServletRequest request){
+	public ResponseBean getWxTelList(@RequestParam(value = "type") String type ,@RequestParam(value = "communityId", required = false) String communityId ,HttpServletRequest request){
 		LambdaQueryWrapper<AnnouncementTel> queryWrapper = new LambdaQueryWrapper<>();
 		 queryWrapper.eq(AnnouncementTel::getType,type);
-		 queryWrapper.eq(AnnouncementTel::getCommunityId,communityId);
+		 queryWrapper.eq(!StringUtils.isEmpty(communityId), AnnouncementTel::getCommunityId,communityId);
 		return ResponseBean.success(announcementTelService.list(queryWrapper));
 	}
 }

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
@@ -361,10 +362,12 @@ public class TpTicketController extends BaseController {
     @RequestMapping(value = "/wx/life/ticket/list", method = RequestMethod.GET)
     public ResponseBean getWorkerList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                      @RequestParam(value = "communityId", required = false) Integer communityId,
+                                      @RequestParam(value = "communityId", required = false) String communityId,
                                       HttpServletRequest request){
+        Integer community = StringUtils.isEmpty(communityId) ? null : Integer.parseInt(communityId);
+
         TaUser taUser = getPropUserByPersonId(getPersonId(request));
-        ResponseBean  responseBean = tpTicketService.getWorkerList(pageNum,pageSize,taUser.getUserId(),taUser.getOrgId(),communityId);
+        ResponseBean  responseBean = tpTicketService.getWorkerList(pageNum,pageSize,taUser.getUserId(),taUser.getOrgId(), community);
         return responseBean;
     }
 }

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -1302,7 +1302,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         LambdaQueryWrapper<TpTicket> tpTicketLambdaQueryWrapper = new LambdaQueryWrapper<>();
         tpTicketLambdaQueryWrapper.eq(TpTicket::getOrgId,orgId);
         tpTicketLambdaQueryWrapper.eq(TpTicket::getTpUserId,userId);
-        tpTicketLambdaQueryWrapper.eq(TpTicket::getCommunityId,communityId);
+        tpTicketLambdaQueryWrapper.eq(null != communityId, TpTicket::getCommunityId,communityId);
         tpTicketLambdaQueryWrapper.orderByDesc(TpTicket::getCreateDate);
         IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectPage(page, tpTicketLambdaQueryWrapper);
         List<TpTicket> tpTicketList = tpTicketIPage.getRecords();

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

@@ -70,8 +70,9 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
+        taNewsQueryWrapper.orderByDesc("create_date");
         taNewsQueryWrapper.orderByAsc("news_status");
-        taNewsQueryWrapper.orderByDesc("weight","create_date");
+//        taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
         injectType(taNewsIPage.getRecords());

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

@@ -108,7 +108,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson person = taPersonMapper.selectById(taShare.getPersonId());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 
@@ -138,7 +139,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         }
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 
@@ -183,7 +185,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson person = taPersonMapper.selectById(taPersonSign.getPersonId());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 
@@ -219,7 +222,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson person = taPersonMapper.selectById(taActivityDynamicEnlist.getPersonId());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 
@@ -231,7 +235,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
     @Override
     public void signUpPoints(TaPerson taPerson, Integer orgId) {
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(taPerson.getPersonType())) {
             return;
         }
 
@@ -287,7 +292,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(taPerson.getPersonType())) {
             return;
         }
 
@@ -316,7 +322,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         }
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(taPerson.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(taPerson.getPersonType())) {
             return;
         }
 
@@ -426,7 +433,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson person = taPersonMapper.selectById(taDocumentVerify.getPersonId());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 
@@ -461,7 +469,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson person = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 
@@ -525,7 +534,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson person = taPersonMapper.selectById(userVerify.getPersonId());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 
@@ -560,7 +570,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson person = taPersonMapper.selectById(source.getPersonId());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 
@@ -595,7 +606,8 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         TaPerson person = taPersonMapper.selectById(source.getCreateUser());
 
         // 2021年2月1日 只有业主有积分
-        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())) {
+        if (!CommConstant.PERSON_PROPRIETOR.equals(person.getPersonType())
+                && !CommConstant.PERSON_LIFE_CONSULTANT.equals(person.getPersonType())) {
             return;
         }
 

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -86,4 +86,10 @@
             t.end_date DESC
         LIMIT 1
     </select>
+    <select id="countEnlistBy" resultType="java.lang.Integer">
+        SELECT COUNT(1)
+        FROM ta_activity_dynamic_enlist t
+        WHERE t.org_id = #{orgId}
+            AND t.house_info = #{houseInfo}
+    </select>
 </mapper>