新增入住登记,产权登记

pro-base/src/main/java/com/idea/saleManage/controller/CheckInController.java

@@ -0,0 +1,91 @@
+package com.idea.saleManage.controller;
+
+import com.github.pagehelper.PageInfo;
+
+import com.idea.saleManage.model.CheckIn;
+import com.idea.saleManage.model.CheckInMore;
+import com.idea.saleManage.service.CheckInService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.frame.model.FrameFile;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.TableSplitResult;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.shiro.util.ShiroUtils;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Date;
+
+/**
+ * Created by zt on 2023
+ */
+@Controller
+@RequestMapping(value = "CheckInController")
+@Api(value="入住登记")
+public class CheckInController extends BaseController {
+
+    //主表
+    @Autowired
+    private CheckInService modelService;
+
+
+    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, CheckInMore model, DateTrans dt){
+        PageInfo<CheckInMore> page= modelService.list(tablepar,model,dt);
+        TableSplitResult<CheckInMore> result=new TableSplitResult<CheckInMore>(page.getPageNum(), page.getTotal(), page.getList());
+        return  result;
+    }
+
+    @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(CheckInMore model, DateTrans dt){
+        return  modelService.listAll(model,dt);
+    }
+
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(CheckIn record){
+        record=this.addInfo(record);
+        int result = modelService.insert(record);
+        return result(result);
+    }
+
+    @PostMapping(value = "remove/{id}",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult remove(@PathVariable("id") String id){
+        int result = modelService.deleteByPrimaryKey(id);
+        return result(result);
+    }
+
+    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult editSave(CheckIn model){
+        model=this.addInfo(model);
+        int result = modelService.updateByPrimaryKey(model);
+        return result(result);
+    }
+
+    public CheckIn addInfo(CheckIn model){
+        if ("null".equals(model.getStatus())){
+            model.setStatus(null);
+        }
+        model.setOperateTime(new Date());
+        model.setOperaterId(ShiroUtils.getUser().getId());
+        return model;
+    }
+
+    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public CheckIn getById(String id) {
+        return modelService.selectByPrimaryKey(id);
+    }
+
+
+}

pro-base/src/main/java/com/idea/saleManage/controller/PropertyRegistrationController.java

@@ -0,0 +1,94 @@
+package com.idea.saleManage.controller;
+
+import com.github.pagehelper.PageInfo;
+
+import com.idea.saleManage.model.CheckIn;
+import com.idea.saleManage.model.PropertyRegistration;
+import com.idea.saleManage.model.PropertyRegistrationMore;
+import com.idea.saleManage.service.PropertyRegistrationService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.frame.model.FrameFile;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.TableSplitResult;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.shiro.util.ShiroUtils;
+import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Date;
+
+/**
+ * Created by zt on 2023
+ */
+@Controller
+@RequestMapping(value = "PropertyRegistrationController")
+@Api(value="产权登记")
+public class PropertyRegistrationController extends BaseController {
+
+    //主表
+    @Autowired
+    private PropertyRegistrationService modelService;
+
+
+    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, PropertyRegistrationMore model, DateTrans dt){
+        PageInfo<PropertyRegistrationMore> page= modelService.list(tablepar,model,dt);
+        TableSplitResult<PropertyRegistrationMore> result=new TableSplitResult<PropertyRegistrationMore>(page.getPageNum(), page.getTotal(), page.getList());
+        return  result;
+    }
+
+    @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(PropertyRegistrationMore model, DateTrans dt){
+        return  modelService.listAll(model,dt);
+    }
+
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(PropertyRegistration record){
+        record=this.addInfo(record);
+
+        int result = modelService.insert(record);
+        return result(result);
+    }
+
+    @PostMapping(value = "remove/{id}",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult remove(@PathVariable("id") String id){
+
+    int result = modelService.deleteByPrimaryKey(id);
+        return result(result);
+    }
+
+    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult editSave(PropertyRegistration model){
+        model=this.addInfo(model);
+
+        int result = modelService.updateByPrimaryKey(model);
+        return result(result);
+    }
+    public PropertyRegistration addInfo(PropertyRegistration model){
+        if ("null".equals(model.getStatus())){
+            model.setStatus(null);
+        }
+        model.setOperateTime(new Date());
+        model.setOperaterId(ShiroUtils.getUser().getId());
+        return model;
+    }
+    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public PropertyRegistration getById(String id) {
+        return modelService.selectByPrimaryKey(id);
+    }
+
+
+}

pro-base/src/main/java/com/idea/saleManage/mapper/CheckInMapper.java

@@ -0,0 +1,36 @@
+package com.idea.saleManage.mapper;
+
+import com.idea.saleManage.model.CheckIn;
+import com.idea.saleManage.model.CheckInExample;
+import java.util.List;
+
+import com.idea.saleManage.model.CheckInMore;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+@Component
+public interface CheckInMapper {
+    long countByExample(CheckInExample example);
+
+    int deleteByExample(CheckInExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(CheckIn record);
+
+    int insertSelective(CheckIn record);
+
+    List<CheckIn> selectByExample(CheckInExample example);
+
+    CheckIn selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") CheckIn record, @Param("example") CheckInExample example);
+
+    int updateByExample(@Param("record") CheckIn record, @Param("example") CheckInExample example);
+
+    int updateByPrimaryKeySelective(CheckIn record);
+
+    int updateByPrimaryKey(CheckIn record);
+
+    List<CheckInMore> findList(@Param("record") CheckInMore model);
+}

pro-base/src/main/java/com/idea/saleManage/mapper/PropertyRegistrationMapper.java

@@ -0,0 +1,36 @@
+package com.idea.saleManage.mapper;
+
+import com.idea.saleManage.model.PropertyRegistration;
+import com.idea.saleManage.model.PropertyRegistrationExample;
+import java.util.List;
+
+import com.idea.saleManage.model.PropertyRegistrationMore;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+@Component
+public interface PropertyRegistrationMapper {
+    long countByExample(PropertyRegistrationExample example);
+
+    int deleteByExample(PropertyRegistrationExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(PropertyRegistration record);
+
+    int insertSelective(PropertyRegistration record);
+
+    List<PropertyRegistration> selectByExample(PropertyRegistrationExample example);
+
+    PropertyRegistration selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") PropertyRegistration record, @Param("example") PropertyRegistrationExample example);
+
+    int updateByExample(@Param("record") PropertyRegistration record, @Param("example") PropertyRegistrationExample example);
+
+    int updateByPrimaryKeySelective(PropertyRegistration record);
+
+    int updateByPrimaryKey(PropertyRegistration record);
+
+    List<PropertyRegistrationMore> findList(@Param("record") PropertyRegistrationMore model);
+}

pro-base/src/main/java/com/idea/saleManage/model/CheckIn.java

@@ -0,0 +1,78 @@
+package com.idea.saleManage.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CheckIn implements Serializable {
+    private String id;
+
+    private String contractManageId;
+
+    private String status;
+
+    private Date inDate;
+
+    private String remark;
+
+    private Date operateTime;
+
+    private String operaterId;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getContractManageId() {
+        return contractManageId;
+    }
+
+    public void setContractManageId(String contractManageId) {
+        this.contractManageId = contractManageId == null ? null : contractManageId.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public Date getInDate() {
+        return inDate;
+    }
+
+    public void setInDate(Date inDate) {
+        this.inDate = inDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getOperateTime() {
+        return operateTime;
+    }
+
+    public void setOperateTime(Date operateTime) {
+        this.operateTime = operateTime;
+    }
+
+    public String getOperaterId() {
+        return operaterId;
+    }
+
+    public void setOperaterId(String operaterId) {
+        this.operaterId = operaterId == null ? null : operaterId.trim();
+    }
+}

pro-base/src/main/java/com/idea/saleManage/model/CheckInExample.java

@@ -0,0 +1,671 @@
+package com.idea.saleManage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CheckInExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CheckInExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdIsNull() {
+            addCriterion("contract_manage_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdIsNotNull() {
+            addCriterion("contract_manage_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdEqualTo(String value) {
+            addCriterion("contract_manage_id =", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdNotEqualTo(String value) {
+            addCriterion("contract_manage_id <>", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdGreaterThan(String value) {
+            addCriterion("contract_manage_id >", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdGreaterThanOrEqualTo(String value) {
+            addCriterion("contract_manage_id >=", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdLessThan(String value) {
+            addCriterion("contract_manage_id <", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdLessThanOrEqualTo(String value) {
+            addCriterion("contract_manage_id <=", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdLike(String value) {
+            addCriterion("contract_manage_id like", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdNotLike(String value) {
+            addCriterion("contract_manage_id not like", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdIn(List<String> values) {
+            addCriterion("contract_manage_id in", values, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdNotIn(List<String> values) {
+            addCriterion("contract_manage_id not in", values, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdBetween(String value1, String value2) {
+            addCriterion("contract_manage_id between", value1, value2, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdNotBetween(String value1, String value2) {
+            addCriterion("contract_manage_id not between", value1, value2, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("status like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("status not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateIsNull() {
+            addCriterion("in_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateIsNotNull() {
+            addCriterion("in_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateEqualTo(Date value) {
+            addCriterion("in_date =", value, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateNotEqualTo(Date value) {
+            addCriterion("in_date <>", value, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateGreaterThan(Date value) {
+            addCriterion("in_date >", value, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("in_date >=", value, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateLessThan(Date value) {
+            addCriterion("in_date <", value, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateLessThanOrEqualTo(Date value) {
+            addCriterion("in_date <=", value, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateIn(List<Date> values) {
+            addCriterion("in_date in", values, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateNotIn(List<Date> values) {
+            addCriterion("in_date not in", values, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateBetween(Date value1, Date value2) {
+            addCriterion("in_date between", value1, value2, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInDateNotBetween(Date value1, Date value2) {
+            addCriterion("in_date not between", value1, value2, "inDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIsNull() {
+            addCriterion("operate_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIsNotNull() {
+            addCriterion("operate_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeEqualTo(Date value) {
+            addCriterion("operate_time =", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotEqualTo(Date value) {
+            addCriterion("operate_time <>", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeGreaterThan(Date value) {
+            addCriterion("operate_time >", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("operate_time >=", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeLessThan(Date value) {
+            addCriterion("operate_time <", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("operate_time <=", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIn(List<Date> values) {
+            addCriterion("operate_time in", values, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotIn(List<Date> values) {
+            addCriterion("operate_time not in", values, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeBetween(Date value1, Date value2) {
+            addCriterion("operate_time between", value1, value2, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("operate_time not between", value1, value2, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdIsNull() {
+            addCriterion("operater_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdIsNotNull() {
+            addCriterion("operater_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdEqualTo(String value) {
+            addCriterion("operater_id =", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdNotEqualTo(String value) {
+            addCriterion("operater_id <>", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdGreaterThan(String value) {
+            addCriterion("operater_id >", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdGreaterThanOrEqualTo(String value) {
+            addCriterion("operater_id >=", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdLessThan(String value) {
+            addCriterion("operater_id <", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdLessThanOrEqualTo(String value) {
+            addCriterion("operater_id <=", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdLike(String value) {
+            addCriterion("operater_id like", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdNotLike(String value) {
+            addCriterion("operater_id not like", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdIn(List<String> values) {
+            addCriterion("operater_id in", values, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdNotIn(List<String> values) {
+            addCriterion("operater_id not in", values, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdBetween(String value1, String value2) {
+            addCriterion("operater_id between", value1, value2, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdNotBetween(String value1, String value2) {
+            addCriterion("operater_id not between", value1, value2, "operaterId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

pro-base/src/main/java/com/idea/saleManage/model/CheckInMore.java

@@ -0,0 +1,17 @@
+package com.idea.saleManage.model;
+
+import lombok.Data;
+
+@Data
+public class CheckInMore extends CheckIn{
+    //买受人名称
+    private String buyerName;
+    //合同备案号
+    private String contractNumber;
+    //房屋名称
+    private String houseName;
+
+    private String operater;
+    //合同id
+    private String  contractManageId2;
+}

pro-base/src/main/java/com/idea/saleManage/model/PropertyRegistration.java

@@ -0,0 +1,78 @@
+package com.idea.saleManage.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class PropertyRegistration implements Serializable {
+    private String id;
+
+    private String contractManageId;
+
+    private String status;
+
+    private String propertyNum;
+
+    private String remark;
+
+    private Date operateTime;
+
+    private String operaterId;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getContractManageId() {
+        return contractManageId;
+    }
+
+    public void setContractManageId(String contractManageId) {
+        this.contractManageId = contractManageId == null ? null : contractManageId.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getPropertyNum() {
+        return propertyNum;
+    }
+
+    public void setPropertyNum(String propertyNum) {
+        this.propertyNum = propertyNum == null ? null : propertyNum.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getOperateTime() {
+        return operateTime;
+    }
+
+    public void setOperateTime(Date operateTime) {
+        this.operateTime = operateTime;
+    }
+
+    public String getOperaterId() {
+        return operaterId;
+    }
+
+    public void setOperaterId(String operaterId) {
+        this.operaterId = operaterId == null ? null : operaterId.trim();
+    }
+}

pro-base/src/main/java/com/idea/saleManage/model/PropertyRegistrationExample.java

@@ -0,0 +1,681 @@
+package com.idea.saleManage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PropertyRegistrationExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PropertyRegistrationExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdIsNull() {
+            addCriterion("contract_manage_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdIsNotNull() {
+            addCriterion("contract_manage_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdEqualTo(String value) {
+            addCriterion("contract_manage_id =", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdNotEqualTo(String value) {
+            addCriterion("contract_manage_id <>", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdGreaterThan(String value) {
+            addCriterion("contract_manage_id >", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdGreaterThanOrEqualTo(String value) {
+            addCriterion("contract_manage_id >=", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdLessThan(String value) {
+            addCriterion("contract_manage_id <", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdLessThanOrEqualTo(String value) {
+            addCriterion("contract_manage_id <=", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdLike(String value) {
+            addCriterion("contract_manage_id like", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdNotLike(String value) {
+            addCriterion("contract_manage_id not like", value, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdIn(List<String> values) {
+            addCriterion("contract_manage_id in", values, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdNotIn(List<String> values) {
+            addCriterion("contract_manage_id not in", values, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdBetween(String value1, String value2) {
+            addCriterion("contract_manage_id between", value1, value2, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractManageIdNotBetween(String value1, String value2) {
+            addCriterion("contract_manage_id not between", value1, value2, "contractManageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("status like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("status not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumIsNull() {
+            addCriterion("property_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumIsNotNull() {
+            addCriterion("property_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumEqualTo(String value) {
+            addCriterion("property_num =", value, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumNotEqualTo(String value) {
+            addCriterion("property_num <>", value, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumGreaterThan(String value) {
+            addCriterion("property_num >", value, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumGreaterThanOrEqualTo(String value) {
+            addCriterion("property_num >=", value, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumLessThan(String value) {
+            addCriterion("property_num <", value, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumLessThanOrEqualTo(String value) {
+            addCriterion("property_num <=", value, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumLike(String value) {
+            addCriterion("property_num like", value, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumNotLike(String value) {
+            addCriterion("property_num not like", value, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumIn(List<String> values) {
+            addCriterion("property_num in", values, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumNotIn(List<String> values) {
+            addCriterion("property_num not in", values, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumBetween(String value1, String value2) {
+            addCriterion("property_num between", value1, value2, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPropertyNumNotBetween(String value1, String value2) {
+            addCriterion("property_num not between", value1, value2, "propertyNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIsNull() {
+            addCriterion("operate_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIsNotNull() {
+            addCriterion("operate_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeEqualTo(Date value) {
+            addCriterion("operate_time =", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotEqualTo(Date value) {
+            addCriterion("operate_time <>", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeGreaterThan(Date value) {
+            addCriterion("operate_time >", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("operate_time >=", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeLessThan(Date value) {
+            addCriterion("operate_time <", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("operate_time <=", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIn(List<Date> values) {
+            addCriterion("operate_time in", values, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotIn(List<Date> values) {
+            addCriterion("operate_time not in", values, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeBetween(Date value1, Date value2) {
+            addCriterion("operate_time between", value1, value2, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("operate_time not between", value1, value2, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdIsNull() {
+            addCriterion("operater_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdIsNotNull() {
+            addCriterion("operater_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdEqualTo(String value) {
+            addCriterion("operater_id =", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdNotEqualTo(String value) {
+            addCriterion("operater_id <>", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdGreaterThan(String value) {
+            addCriterion("operater_id >", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdGreaterThanOrEqualTo(String value) {
+            addCriterion("operater_id >=", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdLessThan(String value) {
+            addCriterion("operater_id <", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdLessThanOrEqualTo(String value) {
+            addCriterion("operater_id <=", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdLike(String value) {
+            addCriterion("operater_id like", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdNotLike(String value) {
+            addCriterion("operater_id not like", value, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdIn(List<String> values) {
+            addCriterion("operater_id in", values, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdNotIn(List<String> values) {
+            addCriterion("operater_id not in", values, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdBetween(String value1, String value2) {
+            addCriterion("operater_id between", value1, value2, "operaterId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperaterIdNotBetween(String value1, String value2) {
+            addCriterion("operater_id not between", value1, value2, "operaterId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

pro-base/src/main/java/com/idea/saleManage/model/PropertyRegistrationMore.java

@@ -0,0 +1,16 @@
+package com.idea.saleManage.model;
+
+import lombok.Data;
+
+@Data
+public class PropertyRegistrationMore extends PropertyRegistration {
+    //买受人名称
+    private String buyerName;
+    //合同备案号
+    private String contractNumber;
+    //房屋名称
+    private String houseName;
+    private String operater;
+    //合同id
+    private String  contractManageId2;
+}

pro-base/src/main/java/com/idea/saleManage/service/CheckInService.java

@@ -0,0 +1,112 @@
+package com.idea.saleManage.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import com.idea.saleManage.mapper.CheckInMapper;
+import com.idea.saleManage.model.CheckIn;
+import com.idea.saleManage.model.CheckInExample;
+import com.idea.saleManage.model.CheckInMore;
+import com.rockstar.common.base.BaseService;
+import com.rockstar.common.support.Convert;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.util.DateUtils;
+import com.rockstar.util.StringUtils;
+import com.rockstar.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CheckInService implements BaseService<CheckIn, CheckInExample> {
+
+    //文件mapper
+    @Autowired
+    private CheckInMapper modelMapper;
+
+    /**
+     * 分页查询
+     *
+     * @return
+     */
+    public PageInfo<CheckInMore> list(Tablepar tablepar, CheckInMore model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<CheckInMore> list =modelMapper.findList(model);
+        PageInfo<CheckInMore> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+   public Object listAll(CheckInMore model, DateTrans dt) {
+        List<CheckInMore> list = modelMapper.findList(model);
+        return list;
+    }
+
+
+
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+        List<String> lista = Convert.toListStrArray(ids);
+        CheckInExample example = new CheckInExample();
+        example.createCriteria().andIdIn(lista);
+        return modelMapper.deleteByExample(example);
+    }
+
+    @Override
+    public CheckIn selectByPrimaryKey(String id) {
+        return modelMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(CheckIn record) {
+        return modelMapper.updateByPrimaryKeySelective(record);
+    }
+
+    public int updateByPrimaryKey(CheckIn record) {
+        return modelMapper.updateByPrimaryKey(record);
+    }
+    @Override
+    public int updateByExampleSelective(CheckIn record, CheckInExample example) {
+        return modelMapper.updateByExampleSelective(record, example);
+    }
+
+    @Override
+    public int updateByExample(CheckIn record, CheckInExample example) {
+        return modelMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<CheckIn> selectByExample(CheckInExample example) {
+        return modelMapper.selectByExample(example);
+    }
+
+    @Override
+    public long countByExample(CheckInExample example) {
+        return modelMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(CheckInExample example) {
+        return modelMapper.deleteByExample(example);
+    }
+
+    public int insert(CheckIn record){
+        record.setId(UUIDUtils.middleUUID());
+        return insertWithoutId(record);
+    }
+
+    public int insertWithoutId(CheckIn record){
+        return modelMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(CheckIn record) {
+        record.setId(UUIDUtils.middleUUID());
+        return modelMapper.insertSelective(record);
+    }
+
+}

pro-base/src/main/java/com/idea/saleManage/service/PropertyRegistrationService.java

@@ -0,0 +1,113 @@
+package com.idea.saleManage.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import com.idea.saleManage.mapper.PropertyRegistrationMapper;
+import com.idea.saleManage.model.CheckIn;
+import com.idea.saleManage.model.PropertyRegistration;
+import com.idea.saleManage.model.PropertyRegistrationExample;
+import com.idea.saleManage.model.PropertyRegistrationMore;
+import com.rockstar.common.base.BaseService;
+import com.rockstar.common.support.Convert;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.util.DateUtils;
+import com.rockstar.util.StringUtils;
+import com.rockstar.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class PropertyRegistrationService implements BaseService<PropertyRegistration, PropertyRegistrationExample> {
+
+    //文件mapper
+    @Autowired
+    private PropertyRegistrationMapper modelMapper;
+
+    /**
+     * 分页查询
+     *
+     * @return
+     */
+    public PageInfo<PropertyRegistrationMore> list(Tablepar tablepar, PropertyRegistrationMore model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<PropertyRegistrationMore> list = modelMapper.findList(model);
+        PageInfo<PropertyRegistrationMore> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+   public Object listAll(PropertyRegistrationMore model, DateTrans dt) {
+        List<PropertyRegistrationMore> list = modelMapper.findList(model);
+        return list;
+    }
+
+
+
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+        List<String> lista = Convert.toListStrArray(ids);
+        PropertyRegistrationExample example = new PropertyRegistrationExample();
+        example.createCriteria().andIdIn(lista);
+        return modelMapper.deleteByExample(example);
+    }
+
+    @Override
+    public PropertyRegistration selectByPrimaryKey(String id) {
+        return modelMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(PropertyRegistration record) {
+        return modelMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByExampleSelective(PropertyRegistration record, PropertyRegistrationExample example) {
+        return modelMapper.updateByExampleSelective(record, example);
+    }
+
+    @Override
+    public int updateByExample(PropertyRegistration record, PropertyRegistrationExample example) {
+        return modelMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<PropertyRegistration> selectByExample(PropertyRegistrationExample example) {
+        return modelMapper.selectByExample(example);
+    }
+
+    @Override
+    public long countByExample(PropertyRegistrationExample example) {
+        return modelMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(PropertyRegistrationExample example) {
+        return modelMapper.deleteByExample(example);
+    }
+
+    public int insert(PropertyRegistration record){
+        record.setId(UUIDUtils.middleUUID());
+        return insertWithoutId(record);
+    }
+
+    public int insertWithoutId(PropertyRegistration record){
+        return modelMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(PropertyRegistration record) {
+        record.setId(UUIDUtils.middleUUID());
+        return modelMapper.insertSelective(record);
+    }
+
+    public int updateByPrimaryKey(PropertyRegistration model) {
+        return modelMapper.updateByPrimaryKey(model);
+    }
+}

pro-base/src/main/resources/mybatis/saleManage/CheckInMapper.xml

@@ -0,0 +1,284 @@
+<?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.saleManage.mapper.CheckInMapper">
+    <resultMap id="BaseResultMap" type="com.idea.saleManage.model.CheckIn">
+        <id column="id" jdbcType="VARCHAR" property="id"/>
+        <result column="contract_manage_id" jdbcType="VARCHAR" property="contractManageId"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="in_date" jdbcType="TIMESTAMP" property="inDate"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="operate_time" jdbcType="TIMESTAMP" property="operateTime"/>
+        <result column="operater_id" jdbcType="VARCHAR" property="operaterId"/>
+    </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
+        , contract_manage_id, status, in_date, remark, operate_time, operater_id
+    </sql>
+    <select id="selectByExample" parameterType="com.idea.saleManage.model.CheckInExample" resultMap="BaseResultMap">
+        select
+        <if test="distinct">
+            distinct
+        </if>
+        <include refid="Base_Column_List"/>
+        from check_in
+        <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="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from check_in
+        where id = #{id,jdbcType=VARCHAR}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+        delete
+        from check_in
+        where id = #{id,jdbcType=VARCHAR}
+    </delete>
+    <delete id="deleteByExample" parameterType="com.idea.saleManage.model.CheckInExample">
+        delete from check_in
+        <if test="_parameter != null">
+            <include refid="Example_Where_Clause"/>
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.idea.saleManage.model.CheckIn">
+        insert into check_in (id, contract_manage_id, status,
+                              in_date, remark, operate_time,
+                              operater_id)
+        values (#{id,jdbcType=VARCHAR}, #{contractManageId,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
+                #{inDate,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{operateTime,jdbcType=TIMESTAMP},
+                #{operaterId,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.idea.saleManage.model.CheckIn">
+        insert into check_in
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="contractManageId != null">
+                contract_manage_id,
+            </if>
+            <if test="status != null">
+                status,
+            </if>
+            <if test="inDate != null">
+                in_date,
+            </if>
+            <if test="remark != null">
+                remark,
+            </if>
+            <if test="operateTime != null">
+                operate_time,
+            </if>
+            <if test="operaterId != null">
+                operater_id,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=VARCHAR},
+            </if>
+            <if test="contractManageId != null">
+                #{contractManageId,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=VARCHAR},
+            </if>
+            <if test="inDate != null">
+                #{inDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="operateTime != null">
+                #{operateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="operaterId != null">
+                #{operaterId,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <select id="countByExample" parameterType="com.idea.saleManage.model.CheckInExample" resultType="java.lang.Long">
+        select count(*) from check_in
+        <if test="_parameter != null">
+            <include refid="Example_Where_Clause"/>
+        </if>
+    </select>
+    <update id="updateByExampleSelective" parameterType="map">
+        update check_in
+        <set>
+            <if test="record.id != null">
+                id = #{record.id,jdbcType=VARCHAR},
+            </if>
+            <if test="record.contractManageId != null">
+                contract_manage_id = #{record.contractManageId,jdbcType=VARCHAR},
+            </if>
+            <if test="record.status != null">
+                status = #{record.status,jdbcType=VARCHAR},
+            </if>
+            <if test="record.inDate != null">
+                in_date = #{record.inDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="record.remark != null">
+                remark = #{record.remark,jdbcType=VARCHAR},
+            </if>
+            <if test="record.operateTime != null">
+                operate_time = #{record.operateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="record.operaterId != null">
+                operater_id = #{record.operaterId,jdbcType=VARCHAR},
+            </if>
+        </set>
+        <if test="_parameter != null">
+            <include refid="Update_By_Example_Where_Clause"/>
+        </if>
+    </update>
+    <update id="updateByExample" parameterType="map">
+        update check_in
+        set id = #{record.id,jdbcType=VARCHAR},
+        contract_manage_id = #{record.contractManageId,jdbcType=VARCHAR},
+        status = #{record.status,jdbcType=VARCHAR},
+        in_date = #{record.inDate,jdbcType=TIMESTAMP},
+        remark = #{record.remark,jdbcType=VARCHAR},
+        operate_time = #{record.operateTime,jdbcType=TIMESTAMP},
+        operater_id = #{record.operaterId,jdbcType=VARCHAR}
+        <if test="_parameter != null">
+            <include refid="Update_By_Example_Where_Clause"/>
+        </if>
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.idea.saleManage.model.CheckIn">
+        update check_in
+        <set>
+            <if test="contractManageId != null">
+                contract_manage_id = #{contractManageId,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                status = #{status,jdbcType=VARCHAR},
+            </if>
+            <if test="inDate != null">
+                in_date = #{inDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="remark != null">
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="operateTime != null">
+                operate_time = #{operateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="operaterId != null">
+                operater_id = #{operaterId,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where id = #{id,jdbcType=VARCHAR}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.idea.saleManage.model.CheckIn">
+        update check_in
+        set contract_manage_id = #{contractManageId,jdbcType=VARCHAR},
+            status             = #{status,jdbcType=VARCHAR},
+            in_date            = #{inDate,jdbcType=TIMESTAMP},
+            remark             = #{remark,jdbcType=VARCHAR},
+            operate_time       = #{operateTime,jdbcType=TIMESTAMP},
+            operater_id        = #{operaterId,jdbcType=VARCHAR}
+        where id = #{id,jdbcType=VARCHAR}
+    </update>
+
+
+    <!--    ================新增============================          -->
+    <select id="findList" parameterType="com.idea.saleManage.model.CheckInMore"
+            resultType="com.idea.saleManage.model.CheckInMore">
+        SELECT
+        contract_manage.id as contract_manage_id2,
+        contract_manage.buyer_Name,
+        contract_manage.contract_Number,
+        contract_manage.house_Name,
+        frame_user.username as operater,
+        check_in.*
+        FROM
+        contract_manage
+        LEFT JOIN check_in ON check_in.contract_manage_id = contract_manage.id
+        left join frame_user on frame_user.id=check_in.operater_id
+        WHERE
+        fund_collection_status =2
+        <if test="record.buyerName != null and record.buyerName != ''">
+            and contract_manage.buyer_Name like concat('%',#{record.buyerName},'%')
+
+        </if>
+        <if test="record.houseName != null and record.houseName != ''">
+            and contract_manage.house_Name like concat('%',#{record.houseName},'%')
+        </if>
+        <if test="record.status != null and record.status != ''">
+            <if test="record.status = '0'">
+                and check_in.status is null
+            </if>
+            <if test="record.status = '1'">
+                and check_in.status = '1'
+            </if>
+            <if test="record.status = '2'">
+                and check_in.status = '2'
+            </if>
+        </if>
+    </select>
+</mapper>

pro-base/src/main/resources/mybatis/saleManage/PropertyRegistrationMapper.xml

@@ -0,0 +1,280 @@
+<?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.saleManage.mapper.PropertyRegistrationMapper">
+  <resultMap id="BaseResultMap" type="com.idea.saleManage.model.PropertyRegistration">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="contract_manage_id" jdbcType="VARCHAR" property="contractManageId" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="property_num" jdbcType="VARCHAR" property="propertyNum" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="operate_time" jdbcType="TIMESTAMP" property="operateTime" />
+    <result column="operater_id" jdbcType="VARCHAR" property="operaterId" />
+  </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, contract_manage_id, status, property_num, remark, operate_time, operater_id
+  </sql>
+  <select id="selectByExample" parameterType="com.idea.saleManage.model.PropertyRegistrationExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from property_registration
+    <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="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from property_registration
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from property_registration
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.saleManage.model.PropertyRegistrationExample">
+    delete from property_registration
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.saleManage.model.PropertyRegistration">
+    insert into property_registration (id, contract_manage_id, status, 
+      property_num, remark, operate_time, 
+      operater_id)
+    values (#{id,jdbcType=VARCHAR}, #{contractManageId,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
+      #{propertyNum,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{operateTime,jdbcType=TIMESTAMP}, 
+      #{operaterId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.saleManage.model.PropertyRegistration">
+    insert into property_registration
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="contractManageId != null">
+        contract_manage_id,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="propertyNum != null">
+        property_num,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="operateTime != null">
+        operate_time,
+      </if>
+      <if test="operaterId != null">
+        operater_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="contractManageId != null">
+        #{contractManageId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="propertyNum != null">
+        #{propertyNum,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="operateTime != null">
+        #{operateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operaterId != null">
+        #{operaterId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.saleManage.model.PropertyRegistrationExample" resultType="java.lang.Long">
+    select count(*) from property_registration
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update property_registration
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractManageId != null">
+        contract_manage_id = #{record.contractManageId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.propertyNum != null">
+        property_num = #{record.propertyNum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operateTime != null">
+        operate_time = #{record.operateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.operaterId != null">
+        operater_id = #{record.operaterId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update property_registration
+    set id = #{record.id,jdbcType=VARCHAR},
+      contract_manage_id = #{record.contractManageId,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=VARCHAR},
+      property_num = #{record.propertyNum,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      operate_time = #{record.operateTime,jdbcType=TIMESTAMP},
+      operater_id = #{record.operaterId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.saleManage.model.PropertyRegistration">
+    update property_registration
+    <set>
+      <if test="contractManageId != null">
+        contract_manage_id = #{contractManageId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="propertyNum != null">
+        property_num = #{propertyNum,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="operateTime != null">
+        operate_time = #{operateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operaterId != null">
+        operater_id = #{operaterId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.saleManage.model.PropertyRegistration">
+    update property_registration
+    set contract_manage_id = #{contractManageId,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR},
+      property_num = #{propertyNum,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      operate_time = #{operateTime,jdbcType=TIMESTAMP},
+      operater_id = #{operaterId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+
+
+  <!--    ================新增============================          -->
+  <select id="findList" parameterType="com.idea.saleManage.model.PropertyRegistrationMore"
+          resultType="com.idea.saleManage.model.PropertyRegistrationMore">
+    SELECT
+    contract_manage.id as contract_manage_id2,
+    contract_manage.buyer_Name,
+    contract_manage.contract_Number,
+    contract_manage.house_Name,
+    frame_user.username as operater,
+    property_registration.*
+    FROM
+    contract_manage
+    LEFT JOIN property_registration ON property_registration.contract_manage_id = contract_manage.id
+    left join frame_user on frame_user.id=property_registration.operater_id
+    WHERE
+    fund_collection_status =2
+    <if test="record.buyerName != null and record.buyerName != ''">
+      and contract_manage.buyer_Name like concat('%',#{record.buyerName},'%')
+
+    </if>
+    <if test="record.houseName != null and record.houseName != ''">
+      and contract_manage.house_Name like concat('%',#{record.houseName},'%')
+    </if>
+    <if test="record.status != null and record.status != ''">
+      <if test="record.status = '0'">
+        and property_registration.status is null
+      </if>
+      <if test="record.status = '1'">
+        and property_registration.status = '1'
+      </if>
+      <if test="record.status = '2'">
+        and property_registration.status = '2'
+      </if>
+    </if>
+  </select>
+</mapper>