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

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

@@ -67,7 +67,7 @@ public class TaRaiseHouseController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/taRaiseHouse", method = RequestMethod.POST)
-    public ResponseBean taRaiseHouseAdd(@RequestBody TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
+    public ResponseBean taRaiseHouseAdd(TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taRaiseHouse.setOrgId(getOrgId(request));

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
 import jodd.util.StringUtil;
@@ -102,13 +103,7 @@ public class TaRaiseRecordController extends BaseController {
 
         ResponseBean responseBean = new ResponseBean();
         try {
-            // 校验参数
-            if (null == recordRequestBO.getRaiseId()) {
-                responseBean.addError("参数错误");
-                return responseBean;
-            }
-
-            recordRequestBO.setOrgId(84);
+            recordRequestBO.setOrgId(getOrgId(request));
             responseBean = iTaRaiseRecordService.listRaiseRecordByCondition(recordRequestBO, pageNumber, pageSize);
             logger.info("TaRaiseRecordController.listRaiseRecordByCondition 返回：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
@@ -433,6 +428,26 @@ public class TaRaiseRecordController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 条件查询认筹单
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/getUserInfo", method = RequestMethod.GET)
+    public ResponseBean getUserInfo(@RequestParam("raiseRecordId")Integer raiseRecordId,
+                                    @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRaiseRecordService.getUserInfo(raiseRecordId, getOrgId(request)));
+        } catch (Exception e) {
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 微信端下认筹单
      *

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

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

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

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

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

@@ -119,6 +119,11 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         return taRaiseRecord;
     }
 
+    @Override
+    public TaRaiseRecord getUserInfo(Integer raiseRecordId, Integer orgId) {
+        return taRaiseRecordMapper.getUserInfo(raiseRecordId, orgId);
+    }
+
     /**
      * 插入认筹单
      * @param taRaiseRecord

src/main/resources/mapper/TaRaiseRecordMapper.xml

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