weichaochao 5 lat temu
rodzic
commit
9dbdb17608

+ 22
- 7
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java Wyświetl plik

@@ -10,6 +10,7 @@ import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
10 10
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
11 11
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
12 12
 import com.huiju.estateagents.common.CommConstant;
13
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
13 14
 import com.huiju.estateagents.entity.*;
14 15
 import com.huiju.estateagents.service.ITaHousingResourcesService;
15 16
 import com.huiju.estateagents.service.ITaOrderService;
@@ -101,13 +102,7 @@ public class TaRaiseRecordController extends BaseController {
101 102
 
102 103
         ResponseBean responseBean = new ResponseBean();
103 104
         try {
104
-            // 校验参数
105
-            if (null == recordRequestBO.getRaiseId()) {
106
-                responseBean.addError("参数错误");
107
-                return responseBean;
108
-            }
109
-
110
-            recordRequestBO.setOrgId(84);
105
+            recordRequestBO.setOrgId(getOrgId(request));
111 106
             responseBean = iTaRaiseRecordService.listRaiseRecordByCondition(recordRequestBO, pageNumber, pageSize);
112 107
             logger.info("TaRaiseRecordController.listRaiseRecordByCondition 返回:{}", JSONObject.toJSONString(responseBean));
113 108
         } catch (Exception e) {
@@ -432,6 +427,26 @@ public class TaRaiseRecordController extends BaseController {
432 427
         return responseBean;
433 428
     }
434 429
 
430
+    /**
431
+     * 条件查询认筹单
432
+     *
433
+     * @param request
434
+     * @return
435
+     */
436
+    @RequestMapping(value = "/admin/getUserInfo", method = RequestMethod.GET)
437
+    public ResponseBean getUserInfo(@RequestParam("raiseRecordId")Integer raiseRecordId,
438
+                                    @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
439
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
440
+                                    HttpServletRequest request) {
441
+        ResponseBean responseBean = new ResponseBean();
442
+        try {
443
+            responseBean.addSuccess(iTaRaiseRecordService.getUserInfo(raiseRecordId, getOrgId(request)));
444
+        } catch (Exception e) {
445
+            responseBean.addError(e.getMessage());
446
+        }
447
+        return responseBean;
448
+    }
449
+
435 450
     /**
436 451
      * 微信端下认筹单
437 452
      *

+ 2
- 0
src/main/java/com/huiju/estateagents/mapper/TaRaiseRecordMapper.java Wyświetl plik

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.huiju.estateagents.base.ResponseBean;
5 6
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
6 7
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
7 8
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
@@ -66,4 +67,5 @@ public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
66 67
                             @Param("orgId") Integer orgId,
67 68
                             @Param("payType") String payType);
68 69
 
70
+    TaRaiseRecord getUserInfo(@Param("raiseRecordId") Integer raiseRecordId, @Param("orgId") Integer orgId);
69 71
 }

+ 9
- 0
src/main/java/com/huiju/estateagents/service/ITaRaiseRecordService.java Wyświetl plik

@@ -1,5 +1,6 @@
1 1
 package com.huiju.estateagents.service;
2 2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3 4
 import com.baomidou.mybatisplus.extension.service.IService;
4 5
 import com.huiju.estateagents.base.ResponseBean;
5 6
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
@@ -60,4 +61,12 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
60 61
      * @return
61 62
      */
62 63
     TaRaiseRecord saveRaiseInfo(TaRaiseRecord taRaiseRecord, Integer orgId, String personId) throws Exception;
64
+
65
+    /**
66
+     * 获取用户信息
67
+     * @param orgId
68
+     * @param raiseRecordId
69
+     * @return
70
+     */
71
+    TaRaiseRecord getUserInfo(Integer orgId, Integer raiseRecordId);
63 72
 }

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

@@ -119,6 +119,11 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
119 119
         return taRaiseRecord;
120 120
     }
121 121
 
122
+    @Override
123
+    public TaRaiseRecord getUserInfo(Integer raiseRecordId, Integer orgId) {
124
+        return taRaiseRecordMapper.getUserInfo(raiseRecordId, orgId);
125
+    }
126
+
122 127
     /**
123 128
      * 插入认筹单
124 129
      * @param taRaiseRecord

+ 7
- 0
src/main/resources/mapper/TaRaiseRecordMapper.xml Wyświetl plik

@@ -177,4 +177,11 @@
177 177
         ORDER BY
178 178
           t.create_date DESC
179 179
     </select>
180
+
181
+    <select id="getUserInfo" resultType="com.huiju.estateagents.entity.TaRaiseRecord">
182
+        select a.nickname as nickname, a.`name` as name, a.phone as personTel, t.tel, t.idcard from ta_raise_record t
183
+        left join ta_person a on t.person_id = a.person_id
184
+        where
185
+        t.raise_record_id = #{raiseRecordId} and t.org_id = #{orgId}
186
+    </select>
180 187
 </mapper>