新需求

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

@@ -208,7 +208,7 @@ public class TaPreselectionController extends BaseController {
      * @param taPreselection 实体对象
      * @return
      */
-    @RequestMapping(value = "/taPreselection/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taPreselection/{id}", method = RequestMethod.PUT)
     public ResponseBean taPreselectionUpdate(@PathVariable Integer id,
                                              @RequestBody TaPreselection taPreselection,
                                              HttpServletRequest request) {

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

@@ -56,6 +56,11 @@ public class TaPreselection implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 项目id
+     */
+    private String buildingId;
+
     /**
      * 创建时间
      */
@@ -79,6 +84,12 @@ public class TaPreselection implements Serializable {
     @TableField(exist = false)
     private String salesBatchName;
 
+    /**
+     * 备注
+     */
+    @TableField(exist = false)
+    private String remark;
+
     /**
      * 二维码
      */
@@ -90,4 +101,10 @@ public class TaPreselection implements Serializable {
      */
     @TableField(exist = false)
     private Integer realHeat;
+
+    /**
+     * 预选实际热度
+     */
+    @TableField(exist = false)
+    private Integer preNum;
 }

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

@@ -76,7 +76,7 @@ public class TaPreselectionRecord implements Serializable {
     private String buildingId;
 
     /**
-     * 预选id
+     * 预选idtaSalesBatch
      */
-    private String preselectId;
+    private String preselectionId;
 }

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

@@ -47,7 +47,13 @@ public class TaPreselectionServiceImpl extends ServiceImpl<TaPreselectionMapper,
 
         ResponseBean responseBean = new ResponseBean();
         IPage<TaPreselection> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taPreselectionMapper.listPresecretByCondition(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId));
+        IPage<TaPreselection>  taPreselectionIPage = taPreselectionMapper.listPresecretByCondition(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId);
+        taPreselectionIPage.getRecords().forEach(e->{
+            QueryWrapper<TaPreselectionRecord> taPreselectionRecordQueryWrapper = new QueryWrapper<>();
+            taPreselectionRecordQueryWrapper.eq("sales_batch_id", e.getSalesBatchId());
+            e.setPreNum(taPreselectionRecordMapper.selectCount(taPreselectionRecordQueryWrapper));
+        });
+        responseBean.addSuccess(taPreselectionIPage);
         return responseBean;
     }
 
@@ -65,7 +71,7 @@ public class TaPreselectionServiceImpl extends ServiceImpl<TaPreselectionMapper,
             preselectionRecordQueryWrapper.eq("status", 1);
             List<TaPreselectionRecord> tpList = taPreselectionRecordMapper.selectList(preselectionRecordQueryWrapper);
             if (CollectionUtils.isNotEmpty(tpList)) {
-                responseBean.addError(String.format("销售批次%s已有用户预选，请先删除预选记录。", tp.getSalesBatchId()));
+                responseBean.addError(String.format("销售批次%s已有用户预选，请先删除预选记录。", tp.getSalesBatchName()));
                 return responseBean;
             }
         }

src/main/resources/mapper/TaPreselectionMapper.xml

@@ -5,13 +5,13 @@
     <select id="listPresecretByCondition" resultType="com.huiju.estateagents.entity.TaPreselection">
         SELECT
         t.*,
-        t2.sales_number,
+        t2.sales_number,t2.sales_batch_name,t2.remark,
         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
         ta_preselection t
         LEFT JOIN ta_sales_batch t2 ON t.sales_batch_id = t2.sales_batch_id
-        LEFT JOIN ta_building t3 ON t2.building_id = t3.building_id
+        LEFT JOIN ta_building t3 ON t.building_id = t3.building_id
         WHERE
         t.org_id = #{orgId}
         AND t.STATUS != - 1
@@ -43,8 +43,7 @@
         SELECT
             t.*,
             t2.qr_code,
-            t2.sales_batch_name,
-            t2.building_id
+            t2.sales_batch_name
         FROM
             ta_preselection t,
             ta_sales_batch t2