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

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -440,11 +440,11 @@ public class CommConstant {
      * 助力通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_HELP = "help.result";
+    public static final String MINIAPP_TPL_HELP = "help-result";
     
     /**
      * 拼团通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_GROUP = "group.result";
+    public static final String MINIAPP_TPL_GROUP = "group-result";
 }

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

@@ -379,7 +379,7 @@ public class HelpActivityController extends BaseController {
     }
 
     /**
-     * 助力活动发起人
+     * 助力活动查询当前助力者记录
      *
      * @param request
      * @param response
@@ -520,7 +520,7 @@ public class HelpActivityController extends BaseController {
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
-                                               @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                               @RequestParam(value = "buildingId",required = false) String buildingId,
                                                @RequestParam(value = "type",required = false)Integer type) {
             ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
                 return lsit;

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

@@ -132,7 +132,7 @@ public class TaBuildingDynamicController extends BaseController {
 
     /**
      * 活动列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @param request
      * @return
@@ -200,8 +200,23 @@ public class TaBuildingDynamicController extends BaseController {
                 QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
                 buildingDynamicQueryWrapper.in("dynamic_id",ids);
                 IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);
+    
+                //查询是否报名了普通活动
+                QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id",getOrgId(request));
+                queryWrapper.eq("person_id",person.getPersonId());
+                List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+                
                 for(int j=0;j<buildingDynamicIPage.getRecords().size();j++){
                     iBuildingDynamicService.setExtendInfo(buildingDynamicIPage.getRecords().get(j),person);
+                    
+                    //是否已参与状态
+                    TaBuildingDynamic taBuildingDynamic = buildingDynamicIPage.getRecords().get(j);
+                    taActivityDynamicEnlists.forEach(dynamic -> {
+                        if (taBuildingDynamic.getDynamicId().equals(dynamic.getDynamicId())){
+                            taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                        }
+                    });
                 }
                 responseBean.addSuccess(buildingDynamicIPage);
             }else {

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

@@ -95,6 +95,7 @@ public class TaPointsExchangeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (null != taPointsExchange.getStatus() && !taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taPointsExchange.setVerifyDate(LocalDateTime.now());
                 taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
             }
             if (iTaPointsExchangeService.updateById(taPointsExchange)){

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

@@ -130,6 +130,15 @@ public class TdBuildingTypeController extends BaseController {
     public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            Integer count = iTdBuildingTypeService.count(queryWrapper);
+            if (count != null && count > 0) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
             tdBuildingType.setOrgId(getOrgId(request));
             if (iTdBuildingTypeService.save(tdBuildingType)){
                 responseBean.addSuccess(tdBuildingType);
@@ -186,6 +195,16 @@ public class TdBuildingTypeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
 
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            TdBuildingType buildingType = iTdBuildingTypeService.getOne(queryWrapper);
+            if (buildingType != null && buildingType.getBuildingTypeId().intValue() != id.intValue()) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
+
             // 如果是删除，状态为 -1
             if ( null != tdBuildingType.getStatus() && -1 == tdBuildingType.getStatus().intValue()) {
                 List<TaBuilding> taBuildings = taBuildingMapper.selectBuildingByBuildingTypeId(tdBuildingType.getBuildingTypeId());

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

@@ -13,8 +13,10 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
@@ -60,6 +62,8 @@ public class TaDrainageRecordController extends BaseController {
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private ITaDrainageService taDrainageService;
     /**
      * 分页查询列表
      * @param pageNum
@@ -267,6 +271,10 @@ public class TaDrainageRecordController extends BaseController {
             taDrainageRecord.setUserName(jsonParse.getString("userName"));
             taDrainageRecord.setCreateDate(LocalDateTime.now());
             taDrainageRecord.setDrainageId(taThirdPartyMiniappConfig.getTargetId());
+            taDrainageRecord.setOrgId(taThirdPartyMiniappConfig.getOrgId());
+            //获取buildingID
+            TaDrainage taDrainage = taDrainageService.getById(taThirdPartyMiniappConfig.getTargetId());
+            taDrainageRecord.setBuildingId(taDrainage.getBuildingId());
             if (iTaDrainageRecordService.save(taDrainageRecord)){
                 return ResponseBean.success(taDrainageRecord);
             }

src/main/java/com/huiju/estateagents/excel/HelpRecordExport.java

@@ -21,9 +21,9 @@ public class HelpRecordExport {
     /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
+    @ColumnWidth(36)
     @ExcelProperty(value = "助力时间", index = 2)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @DateTimeFormat("yyyy年MM月dd日 HH时mm分ss秒")
     private Date createDate;
 
 

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

@@ -131,7 +131,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId);
 
     /**
      * 列表  已开始 和 未开始

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

@@ -211,7 +211,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
         // 根据楼盘id查助力
         if ("1".equals(type)){

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

@@ -135,6 +135,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
         buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        if (null == tabuildingDynamic){
+            return ResponseBean.error("当前活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         // 当前阅读量加1
         Integer saveNum = tabuildingDynamic.getPvNum() == null ? 1:tabuildingDynamic.getPvNum()+1;
         tabuildingDynamic.setPvNum(saveNum);

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -49,7 +49,7 @@
     where b.help_activity_id =  #{helpActivityId}
     and b.`status` =  0
     <if test="tel != null and tel != ''">
-        AND b.phone = #{tel}
+        and  b.phone like concat('%',#{tel},'%')
     </if>
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}
@@ -69,7 +69,7 @@
         and b.status = 2
     </if>
     <if test="tel != null and tel != ''">
-        AND b.phone = #{tel}
+        and  b.phone like concat('%',#{tel},'%')
     </if>
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -37,6 +37,7 @@
 
         SELECT
         tade.*,
+        (CASE tade.is_checkin WHEN 1 THEN '已签到' ELSE '未签到'END) as isCheckin,
         tp.NAME AS sharePersonName,
         tp.company AS orgName
         FROM

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -56,7 +56,7 @@
             and  date_format(t.verify_date,'%Y-%m-%d') >= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
         </if>
         <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
-            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
+            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endVerifyDate},'%Y-%m-%d')
         </if>
         order by t.create_date desc
     </select>