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

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

@@ -122,7 +122,7 @@ public class TaRaiseController extends BaseController {
             // 校验批次是否已经认筹过
             QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
             taRaiseQueryWrapper.eq("org_Id", orgId);
-            taRaiseQueryWrapper.eq("sales_batch_id", orgId);
+            taRaiseQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
             taRaiseQueryWrapper.eq("status", 1);
             TaRaise tr = iTaRaiseService.getOne(taRaiseQueryWrapper);
             if (tr != null) {

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

@@ -312,10 +312,10 @@ public class TaSalesBatchController extends BaseController {
 
     @RequestMapping(value = "/admin/salesBatchList", method = RequestMethod.GET)
     public ResponseBean salesBatchList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value = "salesBatchName", required = false) String salesBatchName,
-                                         @RequestParam(value = "buildingId", required = false) String buildingId,
-                                         @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request) {
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "salesBatchName", required = false) String salesBatchName,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -334,16 +334,15 @@ public class TaSalesBatchController extends BaseController {
 
     /**
      * 查询销售批次列表--小程序
-     *
      */
     @RequestMapping(value = "/wx/taSalesBatch/choice", method = RequestMethod.GET)
-    public ResponseBean taSalesBatchGetForMiniApp(@RequestParam(value = "buildingId", required = false) String buildingId,HttpServletRequest request) {
+    public ResponseBean taSalesBatchGetForMiniApp(@RequestParam(value = "buildingId", required = false) String buildingId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
-            taSalesBatchQueryWrapper.eq("org_id",getOrgId(request));
-            taSalesBatchQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
-            taSalesBatchQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            taSalesBatchQueryWrapper.eq("org_id", getOrgId(request));
+            taSalesBatchQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+            taSalesBatchQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             List<TaSalesBatch> list = iTaSalesBatchService.list(taSalesBatchQueryWrapper);
             responseBean.addSuccess(list);
         } catch (Exception e) {
@@ -354,4 +353,22 @@ public class TaSalesBatchController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 根据销售批次查询项目信息
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/taSalesBatch/getBuildingById/{id}", method = RequestMethod.GET)
+    public ResponseBean getBuildingById(@PathVariable("id") Integer id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaSalesBatchService.getBuildingById(id, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("taSalesBatchGetForMiniApp -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }

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

@@ -107,4 +107,10 @@ public class TaPreselection implements Serializable {
      */
     @TableField(exist = false)
     private Integer preNum;
+
+    /**
+     * 销售批次状态
+     */
+    @TableField(exist = false)
+    private Integer salesBatchStatus;
 }

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

@@ -156,4 +156,10 @@ public class TaRaise implements Serializable {
      */
     @TableField(exist = false)
     private TaRaiseRecord record;
+
+    /**
+     * 销售批次状态
+     */
+    @TableField(exist = false)
+    private Integer salesBatchStatus;
 }

src/main/java/com/huiju/estateagents/mapper/TaSalesBatchMapper.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.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaHousingResources;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaSalesBatch;
@@ -42,4 +43,13 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
      */
     Map<String, Object> getTotalHousesAndHeat(@Param("salesBatchId") Integer salesBatchId);
 
+    /**
+     * 根据销售批次获取项目信息
+     *
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    TaBuilding getBuildingById(@Param("salesBatchId") Integer salesBatchId,
+                               @Param("orgId") Integer orgId);
 }

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

@@ -36,4 +36,12 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
      * @return
      */
     ResponseBean getSalesBatchById(Integer salesBatchId);
+
+    /**
+     *
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getBuildingById(Integer salesBatchId,Integer orgId);
 }

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

@@ -195,4 +195,11 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         responseBean.addSuccess(result);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getBuildingById(Integer salesBatchId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addSuccess(taSalesBatchMapper.getBuildingById(salesBatchId, orgId));
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaPreselectionMapper.xml

@@ -8,6 +8,7 @@
             t2.sales_number,t2.sales_batch_name,t2.remark,
             t2.sales_number,
             t2.remark,
+            t2.status salesBatchStatus,
             t3.building_name,
             ( SELECT sum( th.real_heat ) FROM ta_housing_resources th WHERE th.sales_batch_id = t2.sales_batch_id AND th.`status` = 1 ) real_heat
         FROM
@@ -17,6 +18,7 @@
         WHERE
             t.org_id = #{orgId}
             AND t.STATUS != - 1
+            AND t2.STATUS != -1
         <if test="buildingId != null and buildingId != ''">
             and t2.building_id = #{buildingId}
         </if>
@@ -24,7 +26,7 @@
             and t2.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
         </if>
         <if test="status != null">
-            and t.status = #{status}
+            and t2.status = #{status}
         </if>
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND t2.building_id in

src/main/resources/mapper/TaRaiseMapper.xml

@@ -8,6 +8,7 @@
             t2.sales_batch_name,
             t2.sales_number,
             t2.remark,
+            t2.status salesBatchStatus,
             t3.building_name,
             ( SELECT sum( th.raise_real_heat ) FROM ta_housing_resources th WHERE th.sales_batch_id = t2.sales_batch_id AND th.`status` = 1 ) raise_real_heat
         FROM
@@ -17,6 +18,7 @@
         WHERE
             t.org_id = #{orgId}
             AND t.`status` != - 1
+            AND t2.status != -1
         <if test="buildingId != null and buildingId != ''">
             and t3.building_id = #{buildingId}
         </if>
@@ -24,7 +26,7 @@
             and t2.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
         </if>
         <if test="status != null">
-            and t.status = #{status}
+            and t2.status = #{status}
         </if>
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND t2.building_id in

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -40,7 +40,7 @@
         <if test="bo.lockingStatus != null">
             AND t.house_locking_status = #{bo.lockingStatus}
         </if>
-        <if test="bo.apartmentId != null and t.apartmentId != ''">
+        <if test="bo.apartmentId != null and bo.apartmentId != ''">
             AND t.apartment_id = #{bo.apartmentId}
         </if>
         <if test="bo.houseId != null">

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -50,4 +50,19 @@
         WHERE
             t.STATUS = 1 and t.sales_batch_id = #{salesBatchId}
     </select>
+
+    <select id="getBuildingById" resultType="com.huiju.estateagents.entity.TaBuilding">
+
+        SELECT
+            t2.*
+        FROM
+            ta_sales_batch t,
+            ta_building t2
+        WHERE
+            t.building_id = t2.building_id
+            AND t.sales_batch_id = #{salesBatchId}
+            AND t.org_id = #{orgId}
+            AND t.`status` != -1
+
+    </select>
 </mapper>