LAPTOP-FO2T5SIU\35838 hai 8 meses
pai
achega
7bfdbb4a7e

+ 13 - 0
pro-base/src/main/java/com/idea/customerManagement/service/ContractManageService.java

@@ -14,6 +14,7 @@ import com.idea.customerManagement.dto.CustomerManagementDto;
 import com.idea.customerManagement.mapper.ContractManageExtendMapper;
 import com.idea.customerManagement.mapper.ContractManageMapper;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
+import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
 import com.idea.customerManagement.model.*;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.extend.DateTrans;
@@ -44,6 +45,8 @@ public class ContractManageService implements BaseService<ContractManage, Contra
     private SysDictService sysDictService;
     @Autowired
     private CustomerManagementMapper customerManagementMapper;
+    @Autowired
+    private RoomSelectionInfoMapper roomSelectionInfoMapper;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -126,6 +129,7 @@ public class ContractManageService implements BaseService<ContractManage, Contra
         contractManage.setActualShareArea(parkRoom.getActualShareArea());
         contractManage.setMaintenanceFunds(parkFloorDisc.getMaintenanceFunds());
         contractManage.setContractStatus(1);
+        contractManage.setFundCollectionStatus(1);
         
         // 拼接买受人名称
         BuyerExample buyerExample = new BuyerExample();
@@ -176,6 +180,15 @@ public class ContractManageService implements BaseService<ContractManage, Contra
             CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(model.getCustomerManagementId());
             customerManagement.setStatus(3);
             customerManagementMapper.updateByPrimaryKeySelective(customerManagement);
+            // 更新定金管理 收取状态
+            RoomSelectionInfoExample example = new RoomSelectionInfoExample();
+            example.createCriteria().andCustomerManagementIdEqualTo(model.getCustomerManagementId());
+            List<RoomSelectionInfo> list = roomSelectionInfoMapper.selectByExample(example);
+            for(RoomSelectionInfo roomSelectionInfo : list){
+                // 已签约转房款
+                roomSelectionInfo.setStatus(4);
+                roomSelectionInfoMapper.updateByPrimaryKeySelective(roomSelectionInfo);
+            }
         }
         int result = updateByPrimaryKeySelective(model);
         return result;

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

@@ -325,6 +325,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
         // 退意向金
         model.setStatus(3);
+        model.setHandleId(ShiroUtils.getUserId());
+        model.setHandleDate(new Date());
         int result = modelMapper.updateByPrimaryKeySelective(model);
         return result;
     }

+ 62 - 0
pro-base/src/main/java/com/idea/paymentManagement/controller/MaintenanceFundsManagementController.java

@@ -0,0 +1,62 @@
+package com.idea.paymentManagement.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.idea.customerManagement.dto.ContractManageDto;
+import com.idea.paymentManagement.model.MaintenanceFundsManagement;
+import com.idea.paymentManagement.service.MaintenanceFundsManagementService;
+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 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 = "MaintenanceFundsManagementController")
+@Api(tags = "专项维修资金")
+public class MaintenanceFundsManagementController extends BaseController {
+
+    @Autowired
+    private MaintenanceFundsManagementService modelService;
+
+    /**
+     * 分页
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, ContractManageDto model, DateTrans dt){
+        PageInfo<ContractManageDto> page= modelService.listByModel(tablepar,model,dt);
+        TableSplitResult<ContractManageDto> result = new TableSplitResult<ContractManageDto>(page.getPageNum(), page.getTotal(), page.getList());
+        return  result;
+    }
+
+    /**
+     * 收款登记
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(MaintenanceFundsManagement model){
+        int result = modelService.add(model);
+        return result(result);
+    }
+
+
+
+
+
+
+
+
+
+}

+ 17 - 0
pro-base/src/main/java/com/idea/paymentManagement/mapper/MaintenanceFundsManagementExtendMapper.java

@@ -0,0 +1,17 @@
+package com.idea.paymentManagement.mapper;
+
+import com.idea.customerManagement.dto.ContractManageDto;
+import com.idea.paymentManagement.model.MaintenanceFundsManagement;
+import com.idea.paymentManagement.model.MaintenanceFundsManagementExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MaintenanceFundsManagementExtendMapper {
+
+
+    List<ContractManageDto> listByModel(ContractManageDto contractManageDto);
+
+
+
+}

+ 37 - 0
pro-base/src/main/java/com/idea/paymentManagement/mapper/MaintenanceFundsManagementMapper.java

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

+ 149 - 0
pro-base/src/main/java/com/idea/paymentManagement/model/MaintenanceFundsManagement.java

@@ -0,0 +1,149 @@
+package com.idea.paymentManagement.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class MaintenanceFundsManagement implements Serializable {
+    private String id;
+
+    private String contractId;
+
+    private Integer paymentMethod;
+
+    private Date payTime;
+
+    private String bankName;
+
+    private String bankBranchName;
+
+    private String bankNumber;
+
+    private BigDecimal payMoney;
+
+    private String createdId;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private String updatedId;
+
+    private String remark;
+
+    private String paymentVoucher;
+
+    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 getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(String contractId) {
+        this.contractId = contractId == null ? null : contractId.trim();
+    }
+
+    public Integer getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(Integer paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName == null ? null : bankName.trim();
+    }
+
+    public String getBankBranchName() {
+        return bankBranchName;
+    }
+
+    public void setBankBranchName(String bankBranchName) {
+        this.bankBranchName = bankBranchName == null ? null : bankBranchName.trim();
+    }
+
+    public String getBankNumber() {
+        return bankNumber;
+    }
+
+    public void setBankNumber(String bankNumber) {
+        this.bankNumber = bankNumber == null ? null : bankNumber.trim();
+    }
+
+    public BigDecimal getPayMoney() {
+        return payMoney;
+    }
+
+    public void setPayMoney(BigDecimal payMoney) {
+        this.payMoney = payMoney;
+    }
+
+    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 String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getPaymentVoucher() {
+        return paymentVoucher;
+    }
+
+    public void setPaymentVoucher(String paymentVoucher) {
+        this.paymentVoucher = paymentVoucher == null ? null : paymentVoucher.trim();
+    }
+}

+ 992 - 0
pro-base/src/main/java/com/idea/paymentManagement/model/MaintenanceFundsManagementExample.java

@@ -0,0 +1,992 @@
+package com.idea.paymentManagement.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MaintenanceFundsManagementExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public MaintenanceFundsManagementExample() {
+        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 andContractIdIsNull() {
+            addCriterion("contract_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdIsNotNull() {
+            addCriterion("contract_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdEqualTo(String value) {
+            addCriterion("contract_id =", value, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdNotEqualTo(String value) {
+            addCriterion("contract_id <>", value, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdGreaterThan(String value) {
+            addCriterion("contract_id >", value, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdGreaterThanOrEqualTo(String value) {
+            addCriterion("contract_id >=", value, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdLessThan(String value) {
+            addCriterion("contract_id <", value, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdLessThanOrEqualTo(String value) {
+            addCriterion("contract_id <=", value, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdLike(String value) {
+            addCriterion("contract_id like", value, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdNotLike(String value) {
+            addCriterion("contract_id not like", value, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdIn(List<String> values) {
+            addCriterion("contract_id in", values, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdNotIn(List<String> values) {
+            addCriterion("contract_id not in", values, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdBetween(String value1, String value2) {
+            addCriterion("contract_id between", value1, value2, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractIdNotBetween(String value1, String value2) {
+            addCriterion("contract_id not between", value1, value2, "contractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodIsNull() {
+            addCriterion("payment_method is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodIsNotNull() {
+            addCriterion("payment_method is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodEqualTo(Integer value) {
+            addCriterion("payment_method =", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodNotEqualTo(Integer value) {
+            addCriterion("payment_method <>", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodGreaterThan(Integer value) {
+            addCriterion("payment_method >", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("payment_method >=", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodLessThan(Integer value) {
+            addCriterion("payment_method <", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodLessThanOrEqualTo(Integer value) {
+            addCriterion("payment_method <=", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodIn(List<Integer> values) {
+            addCriterion("payment_method in", values, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodNotIn(List<Integer> values) {
+            addCriterion("payment_method not in", values, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodBetween(Integer value1, Integer value2) {
+            addCriterion("payment_method between", value1, value2, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodNotBetween(Integer value1, Integer value2) {
+            addCriterion("payment_method not between", value1, value2, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeIsNull() {
+            addCriterion("pay_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeIsNotNull() {
+            addCriterion("pay_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeEqualTo(Date value) {
+            addCriterion("pay_time =", value, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeNotEqualTo(Date value) {
+            addCriterion("pay_time <>", value, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeGreaterThan(Date value) {
+            addCriterion("pay_time >", value, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("pay_time >=", value, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeLessThan(Date value) {
+            addCriterion("pay_time <", value, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeLessThanOrEqualTo(Date value) {
+            addCriterion("pay_time <=", value, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeIn(List<Date> values) {
+            addCriterion("pay_time in", values, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeNotIn(List<Date> values) {
+            addCriterion("pay_time not in", values, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeBetween(Date value1, Date value2) {
+            addCriterion("pay_time between", value1, value2, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTimeNotBetween(Date value1, Date value2) {
+            addCriterion("pay_time not between", value1, value2, "payTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIsNull() {
+            addCriterion("bank_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIsNotNull() {
+            addCriterion("bank_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameEqualTo(String value) {
+            addCriterion("bank_name =", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotEqualTo(String value) {
+            addCriterion("bank_name <>", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThan(String value) {
+            addCriterion("bank_name >", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_name >=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThan(String value) {
+            addCriterion("bank_name <", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_name <=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLike(String value) {
+            addCriterion("bank_name like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotLike(String value) {
+            addCriterion("bank_name not like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIn(List<String> values) {
+            addCriterion("bank_name in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotIn(List<String> values) {
+            addCriterion("bank_name not in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameBetween(String value1, String value2) {
+            addCriterion("bank_name between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotBetween(String value1, String value2) {
+            addCriterion("bank_name not between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIsNull() {
+            addCriterion("bank_branch_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIsNotNull() {
+            addCriterion("bank_branch_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameEqualTo(String value) {
+            addCriterion("bank_branch_name =", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotEqualTo(String value) {
+            addCriterion("bank_branch_name <>", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameGreaterThan(String value) {
+            addCriterion("bank_branch_name >", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_branch_name >=", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLessThan(String value) {
+            addCriterion("bank_branch_name <", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_branch_name <=", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLike(String value) {
+            addCriterion("bank_branch_name like", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotLike(String value) {
+            addCriterion("bank_branch_name not like", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIn(List<String> values) {
+            addCriterion("bank_branch_name in", values, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotIn(List<String> values) {
+            addCriterion("bank_branch_name not in", values, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameBetween(String value1, String value2) {
+            addCriterion("bank_branch_name between", value1, value2, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotBetween(String value1, String value2) {
+            addCriterion("bank_branch_name not between", value1, value2, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIsNull() {
+            addCriterion("bank_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIsNotNull() {
+            addCriterion("bank_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberEqualTo(String value) {
+            addCriterion("bank_number =", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotEqualTo(String value) {
+            addCriterion("bank_number <>", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberGreaterThan(String value) {
+            addCriterion("bank_number >", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_number >=", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLessThan(String value) {
+            addCriterion("bank_number <", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLessThanOrEqualTo(String value) {
+            addCriterion("bank_number <=", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLike(String value) {
+            addCriterion("bank_number like", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotLike(String value) {
+            addCriterion("bank_number not like", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIn(List<String> values) {
+            addCriterion("bank_number in", values, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotIn(List<String> values) {
+            addCriterion("bank_number not in", values, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberBetween(String value1, String value2) {
+            addCriterion("bank_number between", value1, value2, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotBetween(String value1, String value2) {
+            addCriterion("bank_number not between", value1, value2, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyIsNull() {
+            addCriterion("pay_money is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyIsNotNull() {
+            addCriterion("pay_money is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyEqualTo(BigDecimal value) {
+            addCriterion("pay_money =", value, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyNotEqualTo(BigDecimal value) {
+            addCriterion("pay_money <>", value, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyGreaterThan(BigDecimal value) {
+            addCriterion("pay_money >", value, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("pay_money >=", value, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyLessThan(BigDecimal value) {
+            addCriterion("pay_money <", value, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("pay_money <=", value, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyIn(List<BigDecimal> values) {
+            addCriterion("pay_money in", values, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyNotIn(List<BigDecimal> values) {
+            addCriterion("pay_money not in", values, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("pay_money between", value1, value2, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("pay_money not between", value1, value2, "payMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIsNull() {
+            addCriterion("created_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIsNotNull() {
+            addCriterion("created_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdEqualTo(String value) {
+            addCriterion("created_id =", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotEqualTo(String value) {
+            addCriterion("created_id <>", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdGreaterThan(String value) {
+            addCriterion("created_id >", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdGreaterThanOrEqualTo(String value) {
+            addCriterion("created_id >=", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLessThan(String value) {
+            addCriterion("created_id <", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLessThanOrEqualTo(String value) {
+            addCriterion("created_id <=", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLike(String value) {
+            addCriterion("created_id like", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotLike(String value) {
+            addCriterion("created_id not like", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIn(List<String> values) {
+            addCriterion("created_id in", values, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotIn(List<String> values) {
+            addCriterion("created_id not in", values, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdBetween(String value1, String value2) {
+            addCriterion("created_id between", value1, value2, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotBetween(String value1, String value2) {
+            addCriterion("created_id not between", value1, value2, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIsNull() {
+            addCriterion("updated_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIsNotNull() {
+            addCriterion("updated_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdEqualTo(String value) {
+            addCriterion("updated_id =", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotEqualTo(String value) {
+            addCriterion("updated_id <>", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdGreaterThan(String value) {
+            addCriterion("updated_id >", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdGreaterThanOrEqualTo(String value) {
+            addCriterion("updated_id >=", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLessThan(String value) {
+            addCriterion("updated_id <", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLessThanOrEqualTo(String value) {
+            addCriterion("updated_id <=", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLike(String value) {
+            addCriterion("updated_id like", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotLike(String value) {
+            addCriterion("updated_id not like", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIn(List<String> values) {
+            addCriterion("updated_id in", values, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotIn(List<String> values) {
+            addCriterion("updated_id not in", values, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdBetween(String value1, String value2) {
+            addCriterion("updated_id between", value1, value2, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotBetween(String value1, String value2) {
+            addCriterion("updated_id not between", value1, value2, "updatedId");
+            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);
+        }
+    }
+}

+ 111 - 0
pro-base/src/main/java/com/idea/paymentManagement/service/MaintenanceFundsManagementService.java

@@ -0,0 +1,111 @@
+package com.idea.paymentManagement.service;
+
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.idea.customerManagement.dto.ContractManageDto;
+import com.idea.customerManagement.mapper.ContractManageMapper;
+import com.idea.customerManagement.model.ContractManage;
+import com.idea.paymentManagement.mapper.MaintenanceFundsManagementExtendMapper;
+import com.idea.paymentManagement.mapper.MaintenanceFundsManagementMapper;
+import com.idea.paymentManagement.model.MaintenanceFundsManagement;
+import com.idea.paymentManagement.model.MaintenanceFundsManagementExample;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class MaintenanceFundsManagementService implements BaseService<MaintenanceFundsManagement, MaintenanceFundsManagementExample> {
+
+    @Autowired
+    private MaintenanceFundsManagementMapper modelMapper;
+    @Autowired
+    private MaintenanceFundsManagementExtendMapper extendMapper;
+    @Autowired
+    private ContractManageMapper contractManageMapper;
+
+
+
+    @Override
+    public int deleteByPrimaryKey(String s) {
+        return modelMapper.deleteByPrimaryKey(s);
+    }
+
+    @Override
+    public int insertSelective(MaintenanceFundsManagement maintenanceFundsManagement) {
+        maintenanceFundsManagement.setId(IdUtil.simpleUUID());
+        return modelMapper.insertSelective(maintenanceFundsManagement);
+    }
+
+    public int insertWithoutId(MaintenanceFundsManagement maintenanceFundsManagement) {
+        return modelMapper.insertSelective(maintenanceFundsManagement);
+    }
+
+    @Override
+    public MaintenanceFundsManagement selectByPrimaryKey(String s) {
+        return modelMapper.selectByPrimaryKey(s);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(MaintenanceFundsManagement maintenanceFundsManagement) {
+        return modelMapper.updateByPrimaryKeySelective(maintenanceFundsManagement);
+    }
+
+    @Override
+    public int updateByExampleSelective(MaintenanceFundsManagement maintenanceFundsManagement, MaintenanceFundsManagementExample maintenanceFundsManagementExample) {
+        return modelMapper.updateByExampleSelective(maintenanceFundsManagement,maintenanceFundsManagementExample);
+    }
+
+    @Override
+    public int updateByExample(MaintenanceFundsManagement maintenanceFundsManagement, MaintenanceFundsManagementExample maintenanceFundsManagementExample) {
+        return modelMapper.updateByExample(maintenanceFundsManagement,maintenanceFundsManagementExample);
+    }
+
+    @Override
+    public List<MaintenanceFundsManagement> selectByExample(MaintenanceFundsManagementExample maintenanceFundsManagementExample) {
+        return modelMapper.selectByExample(maintenanceFundsManagementExample);
+    }
+
+    @Override
+    public long countByExample(MaintenanceFundsManagementExample maintenanceFundsManagementExample) {
+        return modelMapper.countByExample(maintenanceFundsManagementExample);
+    }
+
+    @Override
+    public int deleteByExample(MaintenanceFundsManagementExample maintenanceFundsManagementExample) {
+        return modelMapper.deleteByExample(maintenanceFundsManagementExample);
+    }
+
+
+    /**
+     * 收款登记
+     * @param model
+     * @return
+     */
+    public int add(MaintenanceFundsManagement model){
+
+        model.setCreatedId(ShiroUtils.getUserId());
+        model.setCreatedAt(new Date());
+        // 更新合同 专项维修资金收取状态 已收款
+        ContractManage contractManage = contractManageMapper.selectByPrimaryKey(model.getContractId());
+        contractManage.setFundCollectionStatus(2);
+        int result = insertSelective(model);
+        return result;
+    }
+
+
+    public PageInfo<ContractManageDto> listByModel(Tablepar tablepar, ContractManageDto model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<ContractManageDto> list = extendMapper.listByModel(model);
+        PageInfo<ContractManageDto> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+
+}

+ 32 - 0
pro-base/src/main/resources/mybatis/paymentManagement/MaintenanceFundsManagementExtendMapper.xml

@@ -0,0 +1,32 @@
+<?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.paymentManagement.mapper.MaintenanceFundsManagementExtendMapper">
+
+
+  <select id="listByModel" resultType="com.idea.customerManagement.dto.ContractManageDto">
+    select contract_manage.*,
+           maintenance_funds_management.pay_money receivedMoney
+           from contract_manage
+    left join maintenance_funds_management on contract_manage.id = maintenance_funds_management.contract_id
+    <where>
+        and contract_manage.contract_status = '2'
+      <if test="houseName != null and houseName != ''">
+        and house_name like concat('%',#{houseName},'%')
+      </if>
+      <if test="contractStatus != null and contractStatus != ''">
+        and contract_status = #{contractStatus}
+      </if>
+      <if test="signingDateFrom != null and signingDateFrom != ''">
+        and signing_date >= #{signingDateFrom}
+      </if>
+      <if test="signingDateTo != null and signingDateTo != ''">
+        and signing_date &lt;= #{signingDateTo}
+      </if>
+      <if test="buyerName != null and buyerName != ''">
+        and customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))
+      </if>
+    </where>
+  </select>
+
+
+</mapper>

+ 409 - 0
pro-base/src/main/resources/mybatis/paymentManagement/MaintenanceFundsManagementMapper.xml

@@ -0,0 +1,409 @@
+<?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.paymentManagement.mapper.MaintenanceFundsManagementMapper">
+  <resultMap id="BaseResultMap" type="com.idea.paymentManagement.model.MaintenanceFundsManagement">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="contract_id" jdbcType="VARCHAR" property="contractId" />
+    <result column="payment_method" jdbcType="INTEGER" property="paymentMethod" />
+    <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
+    <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank_branch_name" jdbcType="VARCHAR" property="bankBranchName" />
+    <result column="bank_number" jdbcType="CHAR" property="bankNumber" />
+    <result column="pay_money" jdbcType="DECIMAL" property="payMoney" />
+    <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" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.paymentManagement.model.MaintenanceFundsManagement">
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    <result column="payment_voucher" jdbcType="LONGVARCHAR" property="paymentVoucher" />
+  </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_id, payment_method, pay_time, bank_name, bank_branch_name, bank_number, 
+    pay_money, created_id, created_at, updated_at, updated_id
+  </sql>
+  <sql id="Blob_Column_List">
+    remark, payment_voucher
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagementExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from maintenance_funds_management
+    <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.paymentManagement.model.MaintenanceFundsManagementExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from maintenance_funds_management
+    <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 maintenance_funds_management
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from maintenance_funds_management
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagementExample">
+    delete from maintenance_funds_management
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
+    insert into maintenance_funds_management (id, contract_id, payment_method, 
+      pay_time, bank_name, bank_branch_name, 
+      bank_number, pay_money, created_id, 
+      created_at, updated_at, updated_id, 
+      remark, payment_voucher)
+    values (#{id,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, #{paymentMethod,jdbcType=INTEGER}, 
+      #{payTime,jdbcType=TIMESTAMP}, #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR}, 
+      #{bankNumber,jdbcType=CHAR}, #{payMoney,jdbcType=DECIMAL}, #{createdId,jdbcType=VARCHAR}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=LONGVARCHAR}, #{paymentVoucher,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
+    insert into maintenance_funds_management
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="contractId != null">
+        contract_id,
+      </if>
+      <if test="paymentMethod != null">
+        payment_method,
+      </if>
+      <if test="payTime != null">
+        pay_time,
+      </if>
+      <if test="bankName != null">
+        bank_name,
+      </if>
+      <if test="bankBranchName != null">
+        bank_branch_name,
+      </if>
+      <if test="bankNumber != null">
+        bank_number,
+      </if>
+      <if test="payMoney != null">
+        pay_money,
+      </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="remark != null">
+        remark,
+      </if>
+      <if test="paymentVoucher != null">
+        payment_voucher,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="contractId != null">
+        #{contractId,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentMethod != null">
+        #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="payTime != null">
+        #{payTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankBranchName != null">
+        #{bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        #{bankNumber,jdbcType=CHAR},
+      </if>
+      <if test="payMoney != null">
+        #{payMoney,jdbcType=DECIMAL},
+      </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="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="paymentVoucher != null">
+        #{paymentVoucher,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagementExample" resultType="java.lang.Long">
+    select count(*) from maintenance_funds_management
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update maintenance_funds_management
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractId != null">
+        contract_id = #{record.contractId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.paymentMethod != null">
+        payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="record.payTime != null">
+        pay_time = #{record.payTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.bankName != null">
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankBranchName != null">
+        bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankNumber != null">
+        bank_number = #{record.bankNumber,jdbcType=CHAR},
+      </if>
+      <if test="record.payMoney != null">
+        pay_money = #{record.payMoney,jdbcType=DECIMAL},
+      </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.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.paymentVoucher != null">
+        payment_voucher = #{record.paymentVoucher,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update maintenance_funds_management
+    set id = #{record.id,jdbcType=VARCHAR},
+      contract_id = #{record.contractId,jdbcType=VARCHAR},
+      payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      pay_time = #{record.payTime,jdbcType=TIMESTAMP},
+      bank_name = #{record.bankName,jdbcType=VARCHAR},
+      bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
+      bank_number = #{record.bankNumber,jdbcType=CHAR},
+      pay_money = #{record.payMoney,jdbcType=DECIMAL},
+      created_id = #{record.createdId,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      updated_id = #{record.updatedId,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=LONGVARCHAR},
+      payment_voucher = #{record.paymentVoucher,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update maintenance_funds_management
+    set id = #{record.id,jdbcType=VARCHAR},
+      contract_id = #{record.contractId,jdbcType=VARCHAR},
+      payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      pay_time = #{record.payTime,jdbcType=TIMESTAMP},
+      bank_name = #{record.bankName,jdbcType=VARCHAR},
+      bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
+      bank_number = #{record.bankNumber,jdbcType=CHAR},
+      pay_money = #{record.payMoney,jdbcType=DECIMAL},
+      created_id = #{record.createdId,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      updated_id = #{record.updatedId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
+    update maintenance_funds_management
+    <set>
+      <if test="contractId != null">
+        contract_id = #{contractId,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentMethod != null">
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="payTime != null">
+        pay_time = #{payTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bankName != null">
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankBranchName != null">
+        bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        bank_number = #{bankNumber,jdbcType=CHAR},
+      </if>
+      <if test="payMoney != null">
+        pay_money = #{payMoney,jdbcType=DECIMAL},
+      </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="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="paymentVoucher != null">
+        payment_voucher = #{paymentVoucher,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
+    update maintenance_funds_management
+    set contract_id = #{contractId,jdbcType=VARCHAR},
+      payment_method = #{paymentMethod,jdbcType=INTEGER},
+      pay_time = #{payTime,jdbcType=TIMESTAMP},
+      bank_name = #{bankName,jdbcType=VARCHAR},
+      bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+      bank_number = #{bankNumber,jdbcType=CHAR},
+      pay_money = #{payMoney,jdbcType=DECIMAL},
+      created_id = #{createdId,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      updated_id = #{updatedId,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=LONGVARCHAR},
+      payment_voucher = #{paymentVoucher,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
+    update maintenance_funds_management
+    set contract_id = #{contractId,jdbcType=VARCHAR},
+      payment_method = #{paymentMethod,jdbcType=INTEGER},
+      pay_time = #{payTime,jdbcType=TIMESTAMP},
+      bank_name = #{bankName,jdbcType=VARCHAR},
+      bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+      bank_number = #{bankNumber,jdbcType=CHAR},
+      pay_money = #{payMoney,jdbcType=DECIMAL},
+      created_id = #{createdId,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      updated_id = #{updatedId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>