1

pro-base/src/main/java/com/idea/buyingMore/controller/BuyingMoreController.java

@@ -0,0 +1,72 @@
+package com.idea.buyingMore.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.idea.buyingMore.model.BuyingMore;
+import com.idea.buyingMore.service.BuyingMoreService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.TableSplitResult;
+import com.rockstar.frame.model.extend.Tablepar;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+
+@Controller
+@RequestMapping(value = "BuyingMoreController")
+@Api(tags = "增购管理")
+public class BuyingMoreController extends BaseController {
+
+    @Autowired
+    private BuyingMoreService modelService;
+
+    @ApiOperation(value = "新增增购")
+    @PostMapping(value = "add", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(BuyingMore record) {
+
+        int result = modelService.add(record);
+        return result(result);
+    }
+
+    @ApiOperation(value = "编辑增购")
+    @PostMapping(value = "edit", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult edit(BuyingMore record) {
+
+        int result = modelService.edit(record);
+        return result(result);
+    }
+
+    @ApiOperation(value = "删除增购")
+    @PostMapping(value = "delete", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult delete(String id) {
+
+        int result = modelService.delete(id);
+        return result(result);
+    }
+
+
+    @PostMapping(value = "list", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, BuyingMore model, DateTrans dt) {
+        PageInfo<BuyingMore> page = modelService.list(tablepar, model, dt);
+        TableSplitResult<BuyingMore> result = new TableSplitResult<BuyingMore>(page.getPageNum(), page.getTotal(), page.getList());
+        return result;
+    }
+
+    @ApiOperation(value = "房间列表")
+    @PostMapping(value = "listAll", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(BuyingMore model, DateTrans dt) {
+        return modelService.listAll(model, dt);
+    }
+
+
+}

pro-base/src/main/java/com/idea/buyingMore/mapper/BuyingMoreMapper.java

@@ -0,0 +1,36 @@
+package com.idea.buyingMore.mapper;
+
+import com.idea.buyingMore.model.BuyingMore;
+import com.idea.buyingMore.model.BuyingMoreExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BuyingMoreMapper {
+    long countByExample(BuyingMoreExample example);
+
+    int deleteByExample(BuyingMoreExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(BuyingMore record);
+
+    int insertSelective(BuyingMore record);
+
+    List<BuyingMore> selectByExampleWithBLOBs(BuyingMoreExample example);
+
+    List<BuyingMore> selectByExample(BuyingMoreExample example);
+
+    BuyingMore selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") BuyingMore record, @Param("example") BuyingMoreExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") BuyingMore record, @Param("example") BuyingMoreExample example);
+
+    int updateByExample(@Param("record") BuyingMore record, @Param("example") BuyingMoreExample example);
+
+    int updateByPrimaryKeySelective(BuyingMore record);
+
+    int updateByPrimaryKeyWithBLOBs(BuyingMore record);
+
+    int updateByPrimaryKey(BuyingMore record);
+}

pro-base/src/main/java/com/idea/buyingMore/model/BuyingMore.java

@@ -0,0 +1,239 @@
+package com.idea.buyingMore.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BuyingMore implements Serializable {
+    private String id;
+
+    private Integer type;
+
+    private String serialNumber;
+
+    private String contractId;
+
+    private String buyerName;
+
+    private String houseId;
+
+    private String houseName;
+
+    private Double actualBuildArea;
+
+    private Date signingDate;
+
+    private BigDecimal housePrice;
+
+    private Double buyerProportion;
+
+    private Double transferProportion;
+
+    private Double transferBuyerProportion;
+
+    private Double transferCompanyProportion;
+
+    private Double transferPrice;
+
+    private BigDecimal transferMoney;
+
+    private Date registrationDate;
+
+    private String createdId;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private String updatedId;
+
+    private Integer delFlag;
+
+    private String fileList;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber == null ? null : serialNumber.trim();
+    }
+
+    public String getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(String contractId) {
+        this.contractId = contractId == null ? null : contractId.trim();
+    }
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName == null ? null : buyerName.trim();
+    }
+
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId == null ? null : houseId.trim();
+    }
+
+    public String getHouseName() {
+        return houseName;
+    }
+
+    public void setHouseName(String houseName) {
+        this.houseName = houseName == null ? null : houseName.trim();
+    }
+
+    public Double getActualBuildArea() {
+        return actualBuildArea;
+    }
+
+    public void setActualBuildArea(Double actualBuildArea) {
+        this.actualBuildArea = actualBuildArea;
+    }
+
+    public Date getSigningDate() {
+        return signingDate;
+    }
+
+    public void setSigningDate(Date signingDate) {
+        this.signingDate = signingDate;
+    }
+
+    public BigDecimal getHousePrice() {
+        return housePrice;
+    }
+
+    public void setHousePrice(BigDecimal housePrice) {
+        this.housePrice = housePrice;
+    }
+
+    public Double getBuyerProportion() {
+        return buyerProportion;
+    }
+
+    public void setBuyerProportion(Double buyerProportion) {
+        this.buyerProportion = buyerProportion;
+    }
+
+    public Double getTransferProportion() {
+        return transferProportion;
+    }
+
+    public void setTransferProportion(Double transferProportion) {
+        this.transferProportion = transferProportion;
+    }
+
+    public Double getTransferBuyerProportion() {
+        return transferBuyerProportion;
+    }
+
+    public void setTransferBuyerProportion(Double transferBuyerProportion) {
+        this.transferBuyerProportion = transferBuyerProportion;
+    }
+
+    public Double getTransferCompanyProportion() {
+        return transferCompanyProportion;
+    }
+
+    public void setTransferCompanyProportion(Double transferCompanyProportion) {
+        this.transferCompanyProportion = transferCompanyProportion;
+    }
+
+    public Double getTransferPrice() {
+        return transferPrice;
+    }
+
+    public void setTransferPrice(Double transferPrice) {
+        this.transferPrice = transferPrice;
+    }
+
+    public BigDecimal getTransferMoney() {
+        return transferMoney;
+    }
+
+    public void setTransferMoney(BigDecimal transferMoney) {
+        this.transferMoney = transferMoney;
+    }
+
+    public Date getRegistrationDate() {
+        return registrationDate;
+    }
+
+    public void setRegistrationDate(Date registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+    public String getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(String createdId) {
+        this.createdId = createdId == null ? null : createdId.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public String getUpdatedId() {
+        return updatedId;
+    }
+
+    public void setUpdatedId(String updatedId) {
+        this.updatedId = updatedId == null ? null : updatedId.trim();
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(String fileList) {
+        this.fileList = fileList == null ? null : fileList.trim();
+    }
+}

pro-base/src/main/java/com/idea/buyingMore/service/BuyingMoreService.java

@@ -0,0 +1,182 @@
+package com.idea.buyingMore.service;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.idea.buyingMore.mapper.BuyingMoreMapper;
+import com.idea.buyingMore.model.BuyingMore;
+import com.idea.buyingMore.model.BuyingMoreExample;
+import com.idea.util.DateUtils;
+import com.rockstar.common.base.BaseService;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.shiro.util.ShiroUtils;
+import com.rockstar.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class BuyingMoreService implements BaseService<BuyingMore, BuyingMoreExample> {
+
+    private BuyingMoreMapper modelMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String s) {
+        return modelMapper.deleteByPrimaryKey(s);
+    }
+
+    @Override
+    public int insertSelective(BuyingMore buyingMore) {
+        buyingMore.setId(IdUtil.simpleUUID());
+        return modelMapper.insertSelective(buyingMore);
+    }
+
+    public int insertWithoutId(BuyingMore buyingMore) {
+        return modelMapper.insertSelective(buyingMore);
+    }
+
+    @Override
+    public BuyingMore selectByPrimaryKey(String s) {
+        return modelMapper.selectByPrimaryKey(s);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(BuyingMore buyingMore) {
+        return modelMapper.updateByPrimaryKeySelective(buyingMore);
+    }
+
+    @Override
+    public int updateByExampleSelective(BuyingMore buyingMore, BuyingMoreExample buyingMoreExample) {
+        return modelMapper.updateByExampleSelective(buyingMore, buyingMoreExample);
+    }
+
+    @Override
+    public int updateByExample(BuyingMore buyingMore, BuyingMoreExample buyingMoreExample) {
+        return modelMapper.updateByExample(buyingMore, buyingMoreExample);
+    }
+
+    @Override
+    public List<BuyingMore> selectByExample(BuyingMoreExample buyingMoreExample) {
+        return modelMapper.selectByExample(buyingMoreExample);
+    }
+
+    @Override
+    public long countByExample(BuyingMoreExample buyingMoreExample) {
+        return modelMapper.countByExample(buyingMoreExample);
+    }
+
+    @Override
+    public int deleteByExample(BuyingMoreExample buyingMoreExample) {
+        return modelMapper.deleteByExample(buyingMoreExample);
+    }
+
+    /**
+     * 新增
+     *
+     * @param model
+     * @return
+     */
+    public int add(BuyingMore model) {
+
+        String serialNumber = getSerialNumber(model.getType());
+        model.setDelFlag(0);
+        model.setSerialNumber(serialNumber);
+        model.setCreatedId(ShiroUtils.getUserId());
+        model.setCreatedAt(new Date());
+        int result = modelMapper.insertSelective(model);
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param model
+     * @return
+     */
+    public int edit(BuyingMore model) {
+        model.setUpdatedId(ShiroUtils.getUserId());
+        model.setUpdatedAt(new Date());
+        int result = modelMapper.updateByPrimaryKeySelective(model);
+        return result;
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     */
+    public int delete(String id) {
+        int result = 0;
+        BuyingMore buyingMore = modelMapper.selectByPrimaryKey(id);
+        if (ObjectUtil.isNotNull(buyingMore)) {
+            buyingMore.setDelFlag(1);
+            result = modelMapper.updateByPrimaryKeySelective(buyingMore);
+        }
+        return result;
+    }
+
+    public String getSerialNumber(Integer type) {
+
+        BuyingMoreExample example = new BuyingMoreExample();
+        example.createCriteria().andTypeEqualTo(type);
+        Long count = countByExample(example);
+        String number = "";
+        if (count.doubleValue() == 0) {
+            number = "0001";
+        } else {
+            count++;
+            number = String.format("%04d", count);
+        }
+        String year = DateUtils.getYear(new Date(), 0);
+        String serialNumber = "";
+        if (type == 1) {
+            serialNumber = "ZG-" + year + "-" + number;
+        }
+        if (type == 2) {
+            serialNumber = "HG-" + year + "-" + number;
+        }
+        return serialNumber;
+    }
+
+    /**
+     * 分页查询
+     *
+     * @return
+     */
+    public PageInfo<BuyingMore> list(Tablepar tablepar, BuyingMore model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<BuyingMore> list = modelMapper.selectByExample(getCondition(model, dt));
+        PageInfo<BuyingMore> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 查询指定
+     *
+     * @return
+     */
+    public List<BuyingMore> listAll(BuyingMore model, DateTrans dt) {
+        return modelMapper.selectByExample(getCondition(model, dt));
+    }
+
+    private BuyingMoreExample getCondition(BuyingMore model, DateTrans dt) {
+        BuyingMoreExample ex = new BuyingMoreExample();
+        ex.setOrderByClause("order_num asc");
+        BuyingMoreExample.Criteria criteria = ex.createCriteria();
+        criteria.andDelFlagEqualTo(0);
+        if (StringUtils.isNotEmpty(model.getBuyerName())) {
+            criteria.andBuyerNameLike("%" + model.getBuyerName() + "%");
+        }
+        if (StringUtils.isNotEmpty(model.getHouseName())) {
+            criteria.andHouseNameLike("%" + model.getHouseName() + "%");
+        }
+        return ex;
+    }
+
+
+}

pro-base/src/main/java/com/idea/customerManagement/service/IntentionalDepositService.java

@@ -502,6 +502,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
         RefundDetail detail = new RefundDetail();
         detail.setId(IdUtil.simpleUUID());
+        // 意向金
+        detail.setContentType(7);
         detail.setRefundManageId(refundId);
         detail.setType("意向金");
         detail.setReceivedAmount(model.getReceivedAmount());

pro-base/src/main/java/com/idea/transactionRecordManage/service/TransactionRecordService.java

@@ -163,8 +163,11 @@ public class TransactionRecordService {
             List<String> list = Arrays.asList(model.getDiscIds().split(","));
             model.setDiscIdList(list);
         }
-        // 收款记录
+        // 转换记录
         List<NccRecordVo> list = modelMapper.convertRecord(model);
+        for (NccRecordVo recordVo : list){
+            recordVo.setContentType("7");
+        }
         PageInfo<NccRecordVo> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }

pro-base/src/main/java/com/idea/transactionRecordManage/vo/NccRecordVo.java

@@ -38,6 +38,10 @@ public class NccRecordVo {
      */
     private String contentType;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date handleDate;
+
     /**
      * 收/退款方式（收款方式）1-现金，2-支付宝，3-微信，4-银行卡，
      */

pro-base/src/main/resources/mybatis/buyingMore/BuyingMoreMapper.xml

@@ -0,0 +1,574 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.idea.buyingMore.mapper.BuyingMoreMapper">
+  <resultMap id="BaseResultMap" type="com.idea.buyingMore.model.BuyingMore">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
+    <result column="contract_id" jdbcType="VARCHAR" property="contractId" />
+    <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
+    <result column="house_id" jdbcType="VARCHAR" property="houseId" />
+    <result column="house_name" jdbcType="VARCHAR" property="houseName" />
+    <result column="actual_build_area" jdbcType="DOUBLE" property="actualBuildArea" />
+    <result column="signing_date" jdbcType="TIMESTAMP" property="signingDate" />
+    <result column="house_price" jdbcType="DECIMAL" property="housePrice" />
+    <result column="buyer_proportion" jdbcType="DOUBLE" property="buyerProportion" />
+    <result column="transfer_proportion" jdbcType="DOUBLE" property="transferProportion" />
+    <result column="transfer_buyer_proportion" jdbcType="DOUBLE" property="transferBuyerProportion" />
+    <result column="transfer_company_proportion" jdbcType="DOUBLE" property="transferCompanyProportion" />
+    <result column="transfer_price" jdbcType="DOUBLE" property="transferPrice" />
+    <result column="transfer_money" jdbcType="DECIMAL" property="transferMoney" />
+    <result column="registration_date" jdbcType="TIMESTAMP" property="registrationDate" />
+    <result column="created_id" jdbcType="VARCHAR" property="createdId" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.buyingMore.model.BuyingMore">
+    <result column="file_list" jdbcType="LONGVARCHAR" property="fileList" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, type, serial_number, contract_id, buyer_name, house_id, house_name, actual_build_area,
+    signing_date, house_price, buyer_proportion, transfer_proportion, transfer_buyer_proportion,
+    transfer_company_proportion, transfer_price, transfer_money, registration_date, created_id,
+    created_at, updated_at, updated_id, del_flag
+  </sql>
+  <sql id="Blob_Column_List">
+    file_list
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.idea.buyingMore.model.BuyingMoreExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from buying_more
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.idea.buyingMore.model.BuyingMoreExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from buying_more
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from buying_more
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from buying_more
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.buyingMore.model.BuyingMoreExample">
+    delete from buying_more
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.buyingMore.model.BuyingMore">
+    insert into buying_more (id, type, serial_number,
+                             contract_id, buyer_name, house_id,
+                             house_name, actual_build_area, signing_date,
+                             house_price, buyer_proportion, transfer_proportion,
+                             transfer_buyer_proportion, transfer_company_proportion,
+                             transfer_price, transfer_money, registration_date,
+                             created_id, created_at, updated_at,
+                             updated_id, del_flag, file_list
+    )
+    values (#{id,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR},
+            #{contractId,jdbcType=VARCHAR}, #{buyerName,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR},
+            #{houseName,jdbcType=VARCHAR}, #{actualBuildArea,jdbcType=DOUBLE}, #{signingDate,jdbcType=TIMESTAMP},
+            #{housePrice,jdbcType=DECIMAL}, #{buyerProportion,jdbcType=DOUBLE}, #{transferProportion,jdbcType=DOUBLE},
+            #{transferBuyerProportion,jdbcType=DOUBLE}, #{transferCompanyProportion,jdbcType=DOUBLE},
+            #{transferPrice,jdbcType=DOUBLE}, #{transferMoney,jdbcType=DECIMAL}, #{registrationDate,jdbcType=TIMESTAMP},
+            #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
+            #{updatedId,jdbcType=VARCHAR}, #{delFlag,jdbcType=INTEGER}, #{fileList,jdbcType=LONGVARCHAR}
+           )
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.buyingMore.model.BuyingMore">
+    insert into buying_more
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="serialNumber != null">
+        serial_number,
+      </if>
+      <if test="contractId != null">
+        contract_id,
+      </if>
+      <if test="buyerName != null">
+        buyer_name,
+      </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
+      <if test="houseName != null">
+        house_name,
+      </if>
+      <if test="actualBuildArea != null">
+        actual_build_area,
+      </if>
+      <if test="signingDate != null">
+        signing_date,
+      </if>
+      <if test="housePrice != null">
+        house_price,
+      </if>
+      <if test="buyerProportion != null">
+        buyer_proportion,
+      </if>
+      <if test="transferProportion != null">
+        transfer_proportion,
+      </if>
+      <if test="transferBuyerProportion != null">
+        transfer_buyer_proportion,
+      </if>
+      <if test="transferCompanyProportion != null">
+        transfer_company_proportion,
+      </if>
+      <if test="transferPrice != null">
+        transfer_price,
+      </if>
+      <if test="transferMoney != null">
+        transfer_money,
+      </if>
+      <if test="registrationDate != null">
+        registration_date,
+      </if>
+      <if test="createdId != null">
+        created_id,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="updatedId != null">
+        updated_id,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="fileList != null">
+        file_list,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="serialNumber != null">
+        #{serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="contractId != null">
+        #{contractId,jdbcType=VARCHAR},
+      </if>
+      <if test="buyerName != null">
+        #{buyerName,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="houseName != null">
+        #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="actualBuildArea != null">
+        #{actualBuildArea,jdbcType=DOUBLE},
+      </if>
+      <if test="signingDate != null">
+        #{signingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="housePrice != null">
+        #{housePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="buyerProportion != null">
+        #{buyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="transferProportion != null">
+        #{transferProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="transferBuyerProportion != null">
+        #{transferBuyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="transferCompanyProportion != null">
+        #{transferCompanyProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="transferPrice != null">
+        #{transferPrice,jdbcType=DOUBLE},
+      </if>
+      <if test="transferMoney != null">
+        #{transferMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="registrationDate != null">
+        #{registrationDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdId != null">
+        #{createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedId != null">
+        #{updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="fileList != null">
+        #{fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.buyingMore.model.BuyingMoreExample" resultType="java.lang.Long">
+    select count(*) from buying_more
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update buying_more
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
+      <if test="record.serialNumber != null">
+        serial_number = #{record.serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractId != null">
+        contract_id = #{record.contractId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.buyerName != null">
+        buyer_name = #{record.buyerName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseName != null">
+        house_name = #{record.houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.actualBuildArea != null">
+        actual_build_area = #{record.actualBuildArea,jdbcType=DOUBLE},
+      </if>
+      <if test="record.signingDate != null">
+        signing_date = #{record.signingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.housePrice != null">
+        house_price = #{record.housePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.buyerProportion != null">
+        buyer_proportion = #{record.buyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="record.transferProportion != null">
+        transfer_proportion = #{record.transferProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="record.transferBuyerProportion != null">
+        transfer_buyer_proportion = #{record.transferBuyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="record.transferCompanyProportion != null">
+        transfer_company_proportion = #{record.transferCompanyProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="record.transferPrice != null">
+        transfer_price = #{record.transferPrice,jdbcType=DOUBLE},
+      </if>
+      <if test="record.transferMoney != null">
+        transfer_money = #{record.transferMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.registrationDate != null">
+        registration_date = #{record.registrationDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createdId != null">
+        created_id = #{record.createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedId != null">
+        updated_id = #{record.updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.delFlag != null">
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.fileList != null">
+        file_list = #{record.fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update buying_more
+    set id = #{record.id,jdbcType=VARCHAR},
+    type = #{record.type,jdbcType=INTEGER},
+    serial_number = #{record.serialNumber,jdbcType=VARCHAR},
+    contract_id = #{record.contractId,jdbcType=VARCHAR},
+    buyer_name = #{record.buyerName,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
+    house_name = #{record.houseName,jdbcType=VARCHAR},
+    actual_build_area = #{record.actualBuildArea,jdbcType=DOUBLE},
+    signing_date = #{record.signingDate,jdbcType=TIMESTAMP},
+    house_price = #{record.housePrice,jdbcType=DECIMAL},
+    buyer_proportion = #{record.buyerProportion,jdbcType=DOUBLE},
+    transfer_proportion = #{record.transferProportion,jdbcType=DOUBLE},
+    transfer_buyer_proportion = #{record.transferBuyerProportion,jdbcType=DOUBLE},
+    transfer_company_proportion = #{record.transferCompanyProportion,jdbcType=DOUBLE},
+    transfer_price = #{record.transferPrice,jdbcType=DOUBLE},
+    transfer_money = #{record.transferMoney,jdbcType=DECIMAL},
+    registration_date = #{record.registrationDate,jdbcType=TIMESTAMP},
+    created_id = #{record.createdId,jdbcType=VARCHAR},
+    created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+    updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+    updated_id = #{record.updatedId,jdbcType=VARCHAR},
+    del_flag = #{record.delFlag,jdbcType=INTEGER},
+    file_list = #{record.fileList,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update buying_more
+    set id = #{record.id,jdbcType=VARCHAR},
+    type = #{record.type,jdbcType=INTEGER},
+    serial_number = #{record.serialNumber,jdbcType=VARCHAR},
+    contract_id = #{record.contractId,jdbcType=VARCHAR},
+    buyer_name = #{record.buyerName,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
+    house_name = #{record.houseName,jdbcType=VARCHAR},
+    actual_build_area = #{record.actualBuildArea,jdbcType=DOUBLE},
+    signing_date = #{record.signingDate,jdbcType=TIMESTAMP},
+    house_price = #{record.housePrice,jdbcType=DECIMAL},
+    buyer_proportion = #{record.buyerProportion,jdbcType=DOUBLE},
+    transfer_proportion = #{record.transferProportion,jdbcType=DOUBLE},
+    transfer_buyer_proportion = #{record.transferBuyerProportion,jdbcType=DOUBLE},
+    transfer_company_proportion = #{record.transferCompanyProportion,jdbcType=DOUBLE},
+    transfer_price = #{record.transferPrice,jdbcType=DOUBLE},
+    transfer_money = #{record.transferMoney,jdbcType=DECIMAL},
+    registration_date = #{record.registrationDate,jdbcType=TIMESTAMP},
+    created_id = #{record.createdId,jdbcType=VARCHAR},
+    created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+    updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+    updated_id = #{record.updatedId,jdbcType=VARCHAR},
+    del_flag = #{record.delFlag,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.buyingMore.model.BuyingMore">
+    update buying_more
+    <set>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="serialNumber != null">
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="contractId != null">
+        contract_id = #{contractId,jdbcType=VARCHAR},
+      </if>
+      <if test="buyerName != null">
+        buyer_name = #{buyerName,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="houseName != null">
+        house_name = #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="actualBuildArea != null">
+        actual_build_area = #{actualBuildArea,jdbcType=DOUBLE},
+      </if>
+      <if test="signingDate != null">
+        signing_date = #{signingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="housePrice != null">
+        house_price = #{housePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="buyerProportion != null">
+        buyer_proportion = #{buyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="transferProportion != null">
+        transfer_proportion = #{transferProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="transferBuyerProportion != null">
+        transfer_buyer_proportion = #{transferBuyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="transferCompanyProportion != null">
+        transfer_company_proportion = #{transferCompanyProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="transferPrice != null">
+        transfer_price = #{transferPrice,jdbcType=DOUBLE},
+      </if>
+      <if test="transferMoney != null">
+        transfer_money = #{transferMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="registrationDate != null">
+        registration_date = #{registrationDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdId != null">
+        created_id = #{createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedId != null">
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="fileList != null">
+        file_list = #{fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.buyingMore.model.BuyingMore">
+    update buying_more
+    set type = #{type,jdbcType=INTEGER},
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
+        contract_id = #{contractId,jdbcType=VARCHAR},
+        buyer_name = #{buyerName,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
+        house_name = #{houseName,jdbcType=VARCHAR},
+        actual_build_area = #{actualBuildArea,jdbcType=DOUBLE},
+        signing_date = #{signingDate,jdbcType=TIMESTAMP},
+        house_price = #{housePrice,jdbcType=DECIMAL},
+        buyer_proportion = #{buyerProportion,jdbcType=DOUBLE},
+        transfer_proportion = #{transferProportion,jdbcType=DOUBLE},
+        transfer_buyer_proportion = #{transferBuyerProportion,jdbcType=DOUBLE},
+        transfer_company_proportion = #{transferCompanyProportion,jdbcType=DOUBLE},
+        transfer_price = #{transferPrice,jdbcType=DOUBLE},
+        transfer_money = #{transferMoney,jdbcType=DECIMAL},
+        registration_date = #{registrationDate,jdbcType=TIMESTAMP},
+        created_id = #{createdId,jdbcType=VARCHAR},
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+        del_flag = #{delFlag,jdbcType=INTEGER},
+        file_list = #{fileList,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.buyingMore.model.BuyingMore">
+    update buying_more
+    set type = #{type,jdbcType=INTEGER},
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
+        contract_id = #{contractId,jdbcType=VARCHAR},
+        buyer_name = #{buyerName,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
+        house_name = #{houseName,jdbcType=VARCHAR},
+        actual_build_area = #{actualBuildArea,jdbcType=DOUBLE},
+        signing_date = #{signingDate,jdbcType=TIMESTAMP},
+        house_price = #{housePrice,jdbcType=DECIMAL},
+        buyer_proportion = #{buyerProportion,jdbcType=DOUBLE},
+        transfer_proportion = #{transferProportion,jdbcType=DOUBLE},
+        transfer_buyer_proportion = #{transferBuyerProportion,jdbcType=DOUBLE},
+        transfer_company_proportion = #{transferCompanyProportion,jdbcType=DOUBLE},
+        transfer_price = #{transferPrice,jdbcType=DOUBLE},
+        transfer_money = #{transferMoney,jdbcType=DECIMAL},
+        registration_date = #{registrationDate,jdbcType=TIMESTAMP},
+        created_id = #{createdId,jdbcType=VARCHAR},
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+        del_flag = #{delFlag,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

pro-base/src/main/resources/mybatis/transactionRecord/TransactionRecord.xml

@@ -113,6 +113,7 @@
         left join park_info on park_info.id = intentional_deposit.group_id
         left join park_floor_disc on park_floor_disc.id = intentional_deposit.disc_id
         <where>
+                and intentional_deposit.status != 1
             <if test="buyerName !=null and buyerName != '' " >
                 and customer_management.buyer_name like concat('%',#{buyerName},'%')
             </if>