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

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

      * @param request
      * @return
      */
-    @RequestMapping(value = "/admin/preselect/batchDelete", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/preselectRecord/batchDelete", method = RequestMethod.PUT)
     public ResponseBean batchDeletePreselectRecord(@RequestBody List<TaPreselectionRecord> preselectionRecordList,
                                                    HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();

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

 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
 
             // 校验批次是否已经认筹过
             QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
-            taRaiseQueryWrapper.eq("orgId", orgId);
+            taRaiseQueryWrapper.eq("org_Id", orgId);
             taRaiseQueryWrapper.eq("sales_batch_id", orgId);
             taRaiseQueryWrapper.eq("status", 1);
             TaRaise tr = iTaRaiseService.getOne(taRaiseQueryWrapper);
                 return responseBean;
             }
 
+            taRaise.setOrgId(orgId);
+            taRaise.setStatus(CommConstant.IS_PUBLISH);
+            taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
                 responseBean.addSuccess(taRaise);
             } else {
                                       @RequestBody TaRaise taRaise) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            taRaise.setRaiseId(id);
             if (iTaRaiseService.updateById(taRaise)) {
                 responseBean.addSuccess(taRaise);
             } else {

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

 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
      */
     private Integer salesBatchId;
 
+    /**
+     * 项目id
+     */
+    private String buildingId;
+
     /**
      * 认筹开始时间
      */
-    private LocalDateTime raiseStartTime;
+    private String raiseStartTime;
 
     /**
      * 认筹结束时间
      */
-    private LocalDateTime raiseEndTime;
+    private String raiseEndTime;
 
     /**
      * 锁房方式 auto自动锁房，manual手动锁房
      * 销售批次备注
      */
     @TableField(exist = false)
-    private Integer remark;
+    private String remark;
 
+    @TableField(exist = false)
+    private List<String> checkValue;
 }

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

                                         @Param("status") Integer status,
                                         @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    TaRaise getRaiseById(Integer id, Integer orgId);
+    TaRaise getRaiseById(@Param("id") Integer id, @Param("orgId") Integer orgId);
 }

src/main/resources/mapper/TaPreselectionRecordMapper.xml

         LEFT JOIN ta_person b ON t.person_id = b.person_id
         LEFT JOIN ta_building_apartment e ON a.apartment_id = e.apartment_id
         WHERE
-            b.org_id = #{bo.orgId}
+            b.org_id = #{bo.orgId} and t.status != -1
             AND a.sales_batch_id =  #{bo.salesBatchId}
             <if test="bo.termName != null and bo.termName != ''">
                 AND a.term_name like CONCAT('%',#{bo.termName}, '%')
           SET t.`status` = - 1,t.update_date = now()
         WHERE
             t.org_id = #{orgId}
-            AND t.preselection_id IN
+            AND t.house_id IN
         <foreach collection="preselectionRecordList" item="record" open="(" close=")" separator=",">
-            #{record.preselectionRecordId}
+            #{record.houseId}
         </foreach>
     </update>
 

src/main/resources/mapper/TaRaiseMapper.xml

         FROM
             ta_raise 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
             t.*,
             t2.sales_batch_name,
             t2.remark,
-            t2.qr_code,
-            t2.building_id
+            t2.qr_code
         FROM
             ta_raise t,
             ta_sales_batch t2