Przeglądaj źródła

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

胡轶钦 5 lat temu
rodzic
commit
b772a1d8a0

+ 2
- 2
src/main/java/com/huiju/estateagents/common/CommConstant.java Wyświetl plik

@@ -440,11 +440,11 @@ public class CommConstant {
440 440
      * 助力通知
441 441
      * 必须存在表   td_miniapp_template_type 中
442 442
      */
443
-    public static final String MINIAPP_TPL_HELP = "help.result";
443
+    public static final String MINIAPP_TPL_HELP = "help-result";
444 444
     
445 445
     /**
446 446
      * 拼团通知
447 447
      * 必须存在表   td_miniapp_template_type 中
448 448
      */
449
-    public static final String MINIAPP_TPL_GROUP = "group.result";
449
+    public static final String MINIAPP_TPL_GROUP = "group-result";
450 450
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java Wyświetl plik

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

+ 16
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Wyświetl plik

@@ -132,7 +132,7 @@ public class TaBuildingDynamicController extends BaseController {
132 132
 
133 133
     /**
134 134
      * 活动列表
135
-     * @param pageNum
135
+     * @param pageNumber
136 136
      * @param pageSize
137 137
      * @param request
138 138
      * @return
@@ -200,8 +200,23 @@ public class TaBuildingDynamicController extends BaseController {
200 200
                 QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
201 201
                 buildingDynamicQueryWrapper.in("dynamic_id",ids);
202 202
                 IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);
203
+    
204
+                //查询是否报名了普通活动
205
+                QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
206
+                queryWrapper.eq("org_id",getOrgId(request));
207
+                queryWrapper.eq("person_id",person.getPersonId());
208
+                List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
209
+                
203 210
                 for(int j=0;j<buildingDynamicIPage.getRecords().size();j++){
204 211
                     iBuildingDynamicService.setExtendInfo(buildingDynamicIPage.getRecords().get(j),person);
212
+                    
213
+                    //是否已参与状态
214
+                    TaBuildingDynamic taBuildingDynamic = buildingDynamicIPage.getRecords().get(j);
215
+                    taActivityDynamicEnlists.forEach(dynamic -> {
216
+                        if (taBuildingDynamic.getDynamicId().equals(dynamic.getDynamicId())){
217
+                            taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
218
+                        }
219
+                    });
205 220
                 }
206 221
                 responseBean.addSuccess(buildingDynamicIPage);
207 222
             }else {

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java Wyświetl plik

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

+ 19
- 0
src/main/java/com/huiju/estateagents/controller/TdBuildingTypeController.java Wyświetl plik

@@ -130,6 +130,15 @@ public class TdBuildingTypeController extends BaseController {
130 130
     public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
131 131
         ResponseBean responseBean = new ResponseBean();
132 132
         try {
133
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
134
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
135
+            queryWrapper.eq("status", 1);
136
+            queryWrapper.eq("org_id", getOrgId(request));
137
+            Integer count = iTdBuildingTypeService.count(queryWrapper);
138
+            if (count != null && count > 0) {
139
+                responseBean.addError("已存在此类型");
140
+                return responseBean;
141
+            }
133 142
             tdBuildingType.setOrgId(getOrgId(request));
134 143
             if (iTdBuildingTypeService.save(tdBuildingType)){
135 144
                 responseBean.addSuccess(tdBuildingType);
@@ -186,6 +195,16 @@ public class TdBuildingTypeController extends BaseController {
186 195
         ResponseBean responseBean = new ResponseBean();
187 196
         try {
188 197
 
198
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
199
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
200
+            queryWrapper.eq("status", 1);
201
+            queryWrapper.eq("org_id", getOrgId(request));
202
+            TdBuildingType buildingType = iTdBuildingTypeService.getOne(queryWrapper);
203
+            if (buildingType != null && buildingType.getBuildingTypeId().intValue() != id.intValue()) {
204
+                responseBean.addError("已存在此类型");
205
+                return responseBean;
206
+            }
207
+
189 208
             // 如果是删除,状态为 -1
190 209
             if ( null != tdBuildingType.getStatus() && -1 == tdBuildingType.getStatus().intValue()) {
191 210
                 List<TaBuilding> taBuildings = taBuildingMapper.selectBuildingByBuildingTypeId(tdBuildingType.getBuildingTypeId());

+ 8
- 0
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java Wyświetl plik

@@ -13,8 +13,10 @@ import com.huiju.estateagents.base.BaseController;
13 13
 import com.huiju.estateagents.base.ResponseBean;
14 14
 import com.huiju.estateagents.common.CommConstant;
15 15
 import com.huiju.estateagents.common.StringUtils;
16
+import com.huiju.estateagents.drainage.entity.TaDrainage;
16 17
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
17 18
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
19
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
18 20
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
19 21
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
20 22
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
@@ -60,6 +62,8 @@ public class TaDrainageRecordController extends BaseController {
60 62
     @Autowired
61 63
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
62 64
 
65
+    @Autowired
66
+    private ITaDrainageService taDrainageService;
63 67
     /**
64 68
      * 分页查询列表
65 69
      * @param pageNum
@@ -267,6 +271,10 @@ public class TaDrainageRecordController extends BaseController {
267 271
             taDrainageRecord.setUserName(jsonParse.getString("userName"));
268 272
             taDrainageRecord.setCreateDate(LocalDateTime.now());
269 273
             taDrainageRecord.setDrainageId(taThirdPartyMiniappConfig.getTargetId());
274
+            taDrainageRecord.setOrgId(taThirdPartyMiniappConfig.getOrgId());
275
+            //获取buildingID
276
+            TaDrainage taDrainage = taDrainageService.getById(taThirdPartyMiniappConfig.getTargetId());
277
+            taDrainageRecord.setBuildingId(taDrainage.getBuildingId());
270 278
             if (iTaDrainageRecordService.save(taDrainageRecord)){
271 279
                 return ResponseBean.success(taDrainageRecord);
272 280
             }

+ 2
- 2
src/main/java/com/huiju/estateagents/excel/HelpRecordExport.java Wyświetl plik

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

+ 1
- 1
src/main/java/com/huiju/estateagents/service/IHelpActivityService.java Wyświetl plik

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

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java Wyświetl plik

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

+ 3
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Wyświetl plik

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

+ 2
- 2
src/main/resources/mapper/HelpInitiateRecordMapper.xml Wyświetl plik

@@ -49,7 +49,7 @@
49 49
     where b.help_activity_id =  #{helpActivityId}
50 50
     and b.`status` =  0
51 51
     <if test="tel != null and tel != ''">
52
-        AND b.phone = #{tel}
52
+        and  b.phone like concat('%',#{tel},'%')
53 53
     </if>
54 54
      order by b.create_date desc
55 55
      limit #{pageCode}, #{pageSize}
@@ -69,7 +69,7 @@
69 69
         and b.status = 2
70 70
     </if>
71 71
     <if test="tel != null and tel != ''">
72
-        AND b.phone = #{tel}
72
+        and  b.phone like concat('%',#{tel},'%')
73 73
     </if>
74 74
      order by b.create_date desc
75 75
      limit #{pageCode}, #{pageSize}

+ 1
- 0
src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml Wyświetl plik

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

+ 1
- 1
src/main/resources/mapper/TaPointsExchangeMapper.xml Wyświetl plik

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