bug 银行账号配置

pro-base/src/main/java/com/idea/buildManage/model/ParkRoom.java

@@ -63,6 +63,8 @@ public class ParkRoom implements Serializable {
 
     private String orderNum;
 
+    private Integer isChoose;
+
     private static final long serialVersionUID = 1L;
 
 }

pro-base/src/main/java/com/idea/buildManage/model/ParkRoomExample.java

@@ -1854,6 +1854,66 @@ public class ParkRoomExample {
             addCriterion("order_num not between", value1, value2, "orderNum");
             return (Criteria) this;
         }
+
+        public Criteria andIsChooseIsNull() {
+            addCriterion("is_choose is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseIsNotNull() {
+            addCriterion("is_choose is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseEqualTo(Integer value) {
+            addCriterion("is_choose =", value, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseNotEqualTo(Integer value) {
+            addCriterion("is_choose <>", value, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseGreaterThan(Integer value) {
+            addCriterion("is_choose >", value, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_choose >=", value, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseLessThan(Integer value) {
+            addCriterion("is_choose <", value, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseLessThanOrEqualTo(Integer value) {
+            addCriterion("is_choose <=", value, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseIn(List<Integer> values) {
+            addCriterion("is_choose in", values, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseNotIn(List<Integer> values) {
+            addCriterion("is_choose not in", values, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseBetween(Integer value1, Integer value2) {
+            addCriterion("is_choose between", value1, value2, "isChoose");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsChooseNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_choose not between", value1, value2, "isChoose");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -6,13 +6,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.idea.buildManage.mapper.ParkRoomMapper;
+import com.idea.buildManage.model.ParkRoom;
 import com.idea.customerManagement.dto.CustomerManagementDto;
 import com.idea.customerManagement.mapper.CustomerManagementExtendMapper;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
-import com.idea.customerManagement.model.Buyer;
-import com.idea.customerManagement.model.BuyerExample;
-import com.idea.customerManagement.model.CustomerManagement;
-import com.idea.customerManagement.model.CustomerManagementExample;
+import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
+import com.idea.customerManagement.model.*;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.FrameUser;
 import com.rockstar.frame.model.extend.DateTrans;
@@ -42,6 +42,10 @@ public class CustomerManagementService implements BaseService<CustomerManagement
     private SysDictService sysDictService;
     @Autowired
     private FrameUserService frameUserService;
+    @Autowired
+    private RoomSelectionInfoMapper roomSelectionInfoMapper;
+    @Autowired
+    private ParkRoomMapper parkRoomMapper;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -243,7 +247,19 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         model.setStatus(6);
         model.setAbandonmentAt(new Date());
         model.setAbandonmentId(ShiroUtils.getUserId());
-        return updateByPrimaryKeySelective(model);
+        int result = updateByPrimaryKeySelective(model);
+
+        RoomSelectionInfoExample example = new RoomSelectionInfoExample();
+        example.createCriteria().andCustomerManagementIdEqualTo(model.getId());
+        List<RoomSelectionInfo> list = roomSelectionInfoMapper.selectByExample(example);
+        for(RoomSelectionInfo roomSelectionInfo : list){
+            ParkRoom parkRoom = new ParkRoom();
+            parkRoom.setId(roomSelectionInfo.getHouseId());
+            parkRoom.setIsChoose(0);
+            parkRoomMapper.updateByPrimaryKeySelective(parkRoom);
+        }
+
+        return result;
     }
 
 

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

@@ -38,6 +38,8 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     private ContractManageService contractManageService;
     @Autowired
     private BuyerService buyerService;
+    @Autowired
+    private ParkRoomMapper parkRoomMapper;
 
 
     @Override
@@ -141,6 +143,12 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
             roomSelectionInfo.setReceivableMoney(response.getSubscriptionFunds());
             roomSelectionInfo.setStatus(1);
             insertSelective(roomSelectionInfo);
+
+            ParkRoom parkRoom = new ParkRoom();
+            parkRoom.setId(response.getId());
+            parkRoom.setIsChoose(1);
+            parkRoomMapper.updateByPrimaryKeySelective(parkRoom);
+
         }
         if (builder.length() > 0) {
             builder.deleteCharAt(builder.length() - 1);

pro-base/src/main/java/com/idea/invoice/mapper/InvoiceBankMapper.java

@@ -0,0 +1,33 @@
+package com.idea.invoice.mapper;
+
+import com.idea.invoice.model.InvoiceBank;
+import com.idea.invoice.model.InvoiceBankExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface InvoiceBankMapper {
+    long countByExample(InvoiceBankExample example);
+
+    int deleteByExample(InvoiceBankExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(InvoiceBank record);
+
+    int insertSelective(InvoiceBank record);
+
+    List<InvoiceBank> selectByExample(InvoiceBankExample example);
+
+    InvoiceBank selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") InvoiceBank record, @Param("example") InvoiceBankExample example);
+
+    int updateByExample(@Param("record") InvoiceBank record, @Param("example") InvoiceBankExample example);
+
+    int updateByPrimaryKeySelective(InvoiceBank record);
+
+    int updateByPrimaryKey(InvoiceBank record);
+}

pro-base/src/main/java/com/idea/invoice/model/InvoiceBank.java

@@ -0,0 +1,42 @@
+package com.idea.invoice.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class InvoiceBank implements Serializable {
+    private String id;
+
+    private String bankName;
+
+    private String bankBranchName;
+
+    private String bankNumber;
+
+    private String suitFloor;
+
+    private String suitFloorStr;
+
+    private String suitCostType;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String updateUser;
+
+    private Date updateTime;
+
+    private String taxRate;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 非数据库字段
+     */
+    private String infos;
+    private String suitCostTypeStr;
+
+}

pro-base/src/main/java/com/idea/invoice/model/InvoiceBankExample.java

@@ -0,0 +1,951 @@
+package com.idea.invoice.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class InvoiceBankExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public InvoiceBankExample() {
+        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 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 andSuitFloorIsNull() {
+            addCriterion("suit_floor is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorIsNotNull() {
+            addCriterion("suit_floor is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorEqualTo(String value) {
+            addCriterion("suit_floor =", value, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorNotEqualTo(String value) {
+            addCriterion("suit_floor <>", value, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorGreaterThan(String value) {
+            addCriterion("suit_floor >", value, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorGreaterThanOrEqualTo(String value) {
+            addCriterion("suit_floor >=", value, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorLessThan(String value) {
+            addCriterion("suit_floor <", value, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorLessThanOrEqualTo(String value) {
+            addCriterion("suit_floor <=", value, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorLike(String value) {
+            addCriterion("suit_floor like", value, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorNotLike(String value) {
+            addCriterion("suit_floor not like", value, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorIn(List<String> values) {
+            addCriterion("suit_floor in", values, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorNotIn(List<String> values) {
+            addCriterion("suit_floor not in", values, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorBetween(String value1, String value2) {
+            addCriterion("suit_floor between", value1, value2, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitFloorNotBetween(String value1, String value2) {
+            addCriterion("suit_floor not between", value1, value2, "suitFloor");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeIsNull() {
+            addCriterion("suit_cost_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeIsNotNull() {
+            addCriterion("suit_cost_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeEqualTo(String value) {
+            addCriterion("suit_cost_type =", value, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeNotEqualTo(String value) {
+            addCriterion("suit_cost_type <>", value, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeGreaterThan(String value) {
+            addCriterion("suit_cost_type >", value, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("suit_cost_type >=", value, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeLessThan(String value) {
+            addCriterion("suit_cost_type <", value, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeLessThanOrEqualTo(String value) {
+            addCriterion("suit_cost_type <=", value, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeLike(String value) {
+            addCriterion("suit_cost_type like", value, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeNotLike(String value) {
+            addCriterion("suit_cost_type not like", value, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeIn(List<String> values) {
+            addCriterion("suit_cost_type in", values, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeNotIn(List<String> values) {
+            addCriterion("suit_cost_type not in", values, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeBetween(String value1, String value2) {
+            addCriterion("suit_cost_type between", value1, value2, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuitCostTypeNotBetween(String value1, String value2) {
+            addCriterion("suit_cost_type not between", value1, value2, "suitCostType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIsNull() {
+            addCriterion("tax_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIsNotNull() {
+            addCriterion("tax_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateEqualTo(String value) {
+            addCriterion("tax_rate =", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotEqualTo(String value) {
+            addCriterion("tax_rate <>", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateGreaterThan(String value) {
+            addCriterion("tax_rate >", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateGreaterThanOrEqualTo(String value) {
+            addCriterion("tax_rate >=", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateLessThan(String value) {
+            addCriterion("tax_rate <", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateLessThanOrEqualTo(String value) {
+            addCriterion("tax_rate <=", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateLike(String value) {
+            addCriterion("tax_rate like", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotLike(String value) {
+            addCriterion("tax_rate not like", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIn(List<String> values) {
+            addCriterion("tax_rate in", values, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotIn(List<String> values) {
+            addCriterion("tax_rate not in", values, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateBetween(String value1, String value2) {
+            addCriterion("tax_rate between", value1, value2, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotBetween(String value1, String value2) {
+            addCriterion("tax_rate not between", value1, value2, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("create_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("create_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("create_user =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("create_user <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("create_user >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("create_user >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("create_user <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("create_user <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("create_user like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("create_user not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("create_user in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("create_user not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("create_user between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("create_user not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("update_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("update_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("update_user =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("update_user <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("update_user >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("update_user >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("update_user <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("update_user <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("update_user like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("update_user not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("update_user in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("update_user not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("update_user between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("update_user not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            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/invoice/service/InvoiceBankService.java

@@ -0,0 +1,305 @@
+package com.idea.invoice.service;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.idea.buildManage.model.ParkFloorDisc;
+import com.idea.buildManage.model.ParkFloorDiscExample;
+import com.idea.buildManage.model.ParkInfo;
+import com.idea.buildManage.model.ParkInfoExample;
+import com.idea.buildManage.service.ParkFloorDiscService;
+import com.idea.buildManage.service.ParkInfoService;
+import com.idea.invoice.mapper.InvoiceBankMapper;
+import com.idea.invoice.model.InvoiceBank;
+import com.idea.invoice.model.InvoiceBankExample;
+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.system.service.SysDictService;
+import com.rockstar.util.StringUtils;
+import com.rockstar.util.UUIDUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class InvoiceBankService implements BaseService<InvoiceBank, InvoiceBankExample> {
+
+    //文件mapper
+    @Autowired
+    private InvoiceBankMapper modelMapper;
+    @Autowired
+    private ParkInfoService parkInfoService;
+    @Autowired
+    private ParkFloorDiscService parkFloorDiscService;
+    @Autowired
+    private SysDictService sysDictService;
+
+    public PageInfo<InvoiceBank> list(Tablepar tablepar, InvoiceBank model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<InvoiceBank> list = modelMapper.selectByExample(getCondition(model,dt));
+        setData(list);
+        return new PageInfo<>(list);
+    }
+    public List<InvoiceBank> listAll(InvoiceBank model, DateTrans dt) {
+        List<InvoiceBank> list = modelMapper.selectByExample(getCondition(model,dt));
+        setData(list);
+        return list;
+    }
+    private void setData(List<InvoiceBank> list) {
+        if(CollectionUtils.isNotEmpty(list)) {
+            for (InvoiceBank bank : list) {
+                if(StringUtils.isNotEmpty(bank.getSuitFloor())){
+                    List<String> ids = Arrays.asList(bank.getSuitFloor().split(","));
+                    ParkFloorDiscExample example = new ParkFloorDiscExample();
+                    example.createCriteria().andIdIn(ids);
+                    List<ParkFloorDisc> parkFloorDiscList = parkFloorDiscService.selectByExample(example);
+                    if(CollectionUtils.isNotEmpty(parkFloorDiscList)){
+                        List<String> groupIds = parkFloorDiscList.stream().map(ParkFloorDisc::getGroupId).distinct().collect(Collectors.toList());
+                        if(CollectionUtils.isNotEmpty(groupIds)){
+                            String resultStr = "";
+                            for (String groupId : groupIds) {
+                                ParkInfo parkInfo = parkInfoService.selectByPrimaryKey(groupId);
+                                String str = parkInfo.getGroupName() + "：" + parkFloorDiscList.stream().filter(x -> groupId.equals(x.getGroupId()))
+                                        .map(ParkFloorDisc::getName).collect(Collectors.joining(","));
+                                if(StringUtils.isNotEmpty(resultStr)){
+                                    resultStr = resultStr + "；" + str;
+                                } else {
+                                    resultStr = str;
+                                }
+                            }
+                            bank.setSuitFloorStr(resultStr);
+                        }
+                    }
+                }
+                if(StringUtils.isNotEmpty(bank.getSuitCostType())) {
+                    String[] suitCostType = bank.getSuitCostType().split(",");
+                    String[] taxRate = bank.getTaxRate().split(",");
+                    StringBuilder builder = new StringBuilder();
+                    for(int i = 0 ; i < suitCostType.length; i++){
+                        builder.append(suitCostType[i])
+                                .append("(")
+                                .append(Double.parseDouble(taxRate[i])*100).append("%")
+                                .append(")")
+                                .append(",");
+                    }
+                    if(builder.length() > 0){
+                        builder.deleteCharAt(builder.length() - 1);
+                    }
+                    bank.setSuitCostTypeStr(builder.toString());
+
+                }
+            }
+        }
+    }
+
+    private InvoiceBankExample getCondition(InvoiceBank model, DateTrans dt) {
+        InvoiceBankExample ex = new InvoiceBankExample();
+        InvoiceBankExample.Criteria criteria = ex.createCriteria();
+        return ex;
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+        List<String> list = Convert.toListStrArray(ids);
+        InvoiceBankExample example = new InvoiceBankExample();
+        example.createCriteria().andIdIn(list);
+        return modelMapper.deleteByExample(example);
+    }
+
+    @Override
+    public InvoiceBank selectByPrimaryKey(String id) {
+        return modelMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(InvoiceBank record) {
+        record.setUpdateTime(new Date());
+        return modelMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByExampleSelective(InvoiceBank record, InvoiceBankExample example) {
+        record.setUpdateTime(new Date());
+        return modelMapper.updateByExampleSelective(record, example);
+    }
+
+    @Override
+    public int updateByExample(InvoiceBank record, InvoiceBankExample example) {
+        record.setUpdateTime(new Date());
+        return modelMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<InvoiceBank> selectByExample(InvoiceBankExample example) {
+        return modelMapper.selectByExample(example);
+    }
+
+    @Override
+    public long countByExample(InvoiceBankExample example) {
+        return modelMapper.countByExample(example);
+    }
+
+    public long countByExample(InvoiceBank model, DateTrans dt) {
+        return modelMapper.countByExample(getCondition(model,dt));
+    }
+
+    @Override
+    public int deleteByExample(InvoiceBankExample example) {
+        return modelMapper.deleteByExample(example);
+    }
+
+    public int insert(InvoiceBank record){
+        record.setId(UUIDUtils.middleUUID());
+        return insertWithoutId(record);
+    }
+
+    public int insertWithoutId(InvoiceBank record){
+        record.setCreateTime(new Date());
+        record.setUpdateTime(new Date());
+        return modelMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(InvoiceBank record) {
+        record.setId(UUIDUtils.middleUUID());
+        record.setCreateTime(new Date());
+        record.setUpdateTime(new Date());
+        return modelMapper.insertSelective(record);
+    }
+
+    public JSONArray getTreeData() {
+        JSONArray jsonArray = new JSONArray();
+        List<ParkInfo> parkInfoList = parkInfoService.selectByExample(new ParkInfoExample());
+        if(CollectionUtils.isNotEmpty(parkInfoList)){
+            for (ParkInfo info : parkInfoList) {
+                JSONObject jsonObject = new JSONObject();
+                JSONArray jsonArray1 = new JSONArray();
+                ParkFloorDiscExample example = new ParkFloorDiscExample();
+                example.createCriteria().andGroupIdEqualTo(info.getId());
+                List<ParkFloorDisc> floorList = parkFloorDiscService.selectByExample(example);
+                if(CollectionUtils.isNotEmpty(floorList)){
+                    jsonObject.put("id", info.getId());
+                    jsonObject.put("label", info.getGroupName());
+                    for (ParkFloorDisc floor : floorList) {
+                        JSONObject jsonObject1 = new JSONObject();
+                        jsonObject1.put("id", floor.getId());
+                        jsonObject1.put("label", floor.getName());
+                        jsonArray1.add(jsonObject1);
+                    }
+                    jsonObject.put("children", jsonArray1);
+                    jsonArray.add(jsonObject);
+                }
+            }
+        }
+        return jsonArray;
+    }
+
+    /**
+     * 查询适用费用类型
+     * @param id
+     * @return
+     */
+    public JSONArray getBillType(String id) {
+
+        // 账单类型
+        List<Map<String, String>> houseUsage = sysDictService.selectDictList("BILL_TYPE");
+        JSONArray billJsonArray = new JSONArray();
+        for (Map<String, String> stringStringMap : houseUsage) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("suitCostType",stringStringMap.get("label"));
+            billJsonArray.add(jsonObject);
+        }
+        InvoiceBank invoiceBank = selectByPrimaryKey(id);
+        String suitCostType = "";
+        if(ObjectUtil.isNotNull(invoiceBank) && StringUtils.isNotEmpty(invoiceBank.getSuitCostType())){
+            suitCostType = invoiceBank.getSuitCostType();
+        }
+        String taxRate = "";
+        if(ObjectUtil.isNotNull(invoiceBank) && StringUtils.isNotEmpty(invoiceBank.getTaxRate())){
+            taxRate = invoiceBank.getTaxRate();
+        }
+        String[] suitCostTypeSplit = suitCostType.split(",");
+        String[] taxRateSplit = taxRate.split(",");
+        JSONArray jsonArray = new JSONArray();
+        for(int i = 0; i < suitCostTypeSplit.length; i ++) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("suitCostType",suitCostTypeSplit[i]);
+            jsonObject.put("taxRate",taxRateSplit[i]);
+            jsonArray.add(jsonObject);
+        }
+
+        for(int i = 0; i < billJsonArray.size(); i++){
+            JSONObject billJsonObject = billJsonArray.getJSONObject(i);
+            for(int j = 0; j < jsonArray.size(); j++){
+                JSONObject jsonObject = jsonArray.getJSONObject(j);
+                //处理jsonObject
+                if(billJsonObject.get("suitCostType").equals(jsonObject.get("suitCostType"))){
+                    billJsonObject.put("taxRate",jsonObject.get("taxRate"));
+                    billJsonObject.put("id", IdUtil.simpleUUID());
+                }
+            }
+        }
+        return billJsonArray;
+
+    }
+
+
+    public int edit(InvoiceBank record) {
+
+        String infos = record.getInfos();
+        List<InvoiceBank> invoiceBanks = JSONObject.parseArray(infos, InvoiceBank.class);
+        StringBuilder suitCostType = new StringBuilder();
+        StringBuilder taxRate = new StringBuilder();
+
+        for(InvoiceBank bank: invoiceBanks){
+            suitCostType.append(bank.getSuitCostType()).append(",");
+            taxRate.append(bank.getTaxRate()).append(",");
+        }
+        if(suitCostType.length() > 0){
+            suitCostType.deleteCharAt(suitCostType.length() - 1);
+        }
+        if(taxRate.length() > 0){
+            taxRate.deleteCharAt(taxRate.length() - 1);
+        }
+        record.setSuitCostType(suitCostType.toString());
+        record.setTaxRate(taxRate.toString());
+        int result = updateByPrimaryKeySelective(record);
+        return result;
+    }
+
+
+    public int add(InvoiceBank record) {
+
+        String infos = record.getInfos();
+        List<InvoiceBank> invoiceBanks = JSONObject.parseArray(infos, InvoiceBank.class);
+        StringBuilder suitCostType = new StringBuilder();
+        StringBuilder taxRate = new StringBuilder();
+
+        for(InvoiceBank bank: invoiceBanks){
+            suitCostType.append(bank.getSuitCostType()).append(",");
+            taxRate.append(bank.getTaxRate()).append(",");
+        }
+        if(suitCostType.length() > 0){
+            suitCostType.deleteCharAt(suitCostType.length() - 1);
+        }
+        if(taxRate.length() > 0){
+            taxRate.deleteCharAt(taxRate.length() - 1);
+        }
+        record.setSuitCostType(suitCostType.toString());
+        record.setTaxRate(taxRate.toString());
+        int result = insertSelective(record);
+        return result;
+    }
+
+}

pro-base/src/main/resources/mybatis/buildManage/ParkRoomMapper.xml

@@ -29,6 +29,7 @@
     <result column="sold_status" jdbcType="INTEGER" property="soldStatus" />
     <result column="two_point_two" jdbcType="VARCHAR" property="twoPointTwo" />
     <result column="order_num" jdbcType="VARCHAR" property="orderNum" />
+    <result column="is_choose" jdbcType="INTEGER" property="isChoose" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.buildManage.model.ParkRoom">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -96,7 +97,7 @@
     prediction_build_area, prediction_land_area, actual_internal_area, actual_share_area,
     actual_build_area, actual_land_area, room_use, room_number, decoration_situation,
     house_type_id, house_type_picture, created_id, created_at, updated_at, updated_id,
-    sale_status, sold_status, two_point_two, order_num
+    sale_status, sold_status, two_point_two, order_num, is_choose
   </sql>
   <sql id="Blob_Column_List">
     remark
@@ -159,8 +160,8 @@
                            decoration_situation, house_type_id, house_type_picture,
                            created_id, created_at, updated_at,
                            updated_id, sale_status, sold_status,
-                           two_point_two, order_num, remark
-    )
+                           two_point_two, order_num, is_choose,
+                           remark)
     values (#{id,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
             #{groupId,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, #{floor,jdbcType=VARCHAR},
             #{predictionInternalArea,jdbcType=DOUBLE}, #{predictionShareArea,jdbcType=DOUBLE},
@@ -170,8 +171,8 @@
             #{decorationSituation,jdbcType=INTEGER}, #{houseTypeId,jdbcType=VARCHAR}, #{houseTypePicture,jdbcType=VARCHAR},
             #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
             #{updatedId,jdbcType=VARCHAR}, #{saleStatus,jdbcType=INTEGER}, #{soldStatus,jdbcType=INTEGER},
-            #{twoPointTwo,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}
-           )
+            #{twoPointTwo,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR}, #{isChoose,jdbcType=INTEGER},
+            #{remark,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.buildManage.model.ParkRoom">
     insert into park_room
@@ -257,6 +258,9 @@
       <if test="orderNum != null">
         order_num,
       </if>
+      <if test="isChoose != null">
+        is_choose,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -343,6 +347,9 @@
       <if test="orderNum != null">
         #{orderNum,jdbcType=VARCHAR},
       </if>
+      <if test="isChoose != null">
+        #{isChoose,jdbcType=INTEGER},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -438,6 +445,9 @@
       <if test="record.orderNum != null">
         order_num = #{record.orderNum,jdbcType=VARCHAR},
       </if>
+      <if test="record.isChoose != null">
+        is_choose = #{record.isChoose,jdbcType=INTEGER},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -475,6 +485,7 @@
     sold_status = #{record.soldStatus,jdbcType=INTEGER},
     two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR},
     order_num = #{record.orderNum,jdbcType=VARCHAR},
+    is_choose = #{record.isChoose,jdbcType=INTEGER},
     remark = #{record.remark,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -508,7 +519,8 @@
     sale_status = #{record.saleStatus,jdbcType=INTEGER},
     sold_status = #{record.soldStatus,jdbcType=INTEGER},
     two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR},
-    order_num = #{record.orderNum,jdbcType=VARCHAR}
+    order_num = #{record.orderNum,jdbcType=VARCHAR},
+    is_choose = #{record.isChoose,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -594,6 +606,9 @@
       <if test="orderNum != null">
         order_num = #{orderNum,jdbcType=VARCHAR},
       </if>
+      <if test="isChoose != null">
+        is_choose = #{isChoose,jdbcType=INTEGER},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -628,6 +643,7 @@
         sold_status = #{soldStatus,jdbcType=INTEGER},
         two_point_two = #{twoPointTwo,jdbcType=VARCHAR},
         order_num = #{orderNum,jdbcType=VARCHAR},
+        is_choose = #{isChoose,jdbcType=INTEGER},
         remark = #{remark,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -658,7 +674,8 @@
         sale_status = #{saleStatus,jdbcType=INTEGER},
         sold_status = #{soldStatus,jdbcType=INTEGER},
         two_point_two = #{twoPointTwo,jdbcType=VARCHAR},
-        order_num = #{orderNum,jdbcType=VARCHAR}
+        order_num = #{orderNum,jdbcType=VARCHAR},
+        is_choose = #{isChoose,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

pro-base/src/main/resources/mybatis/invoice/InvoiceBankMapper.xml

@@ -0,0 +1,306 @@
+<?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.invoice.mapper.InvoiceBankMapper">
+  <resultMap id="BaseResultMap" type="com.idea.invoice.model.InvoiceBank">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank_branch_name" jdbcType="VARCHAR" property="bankBranchName" />
+    <result column="bank_number" jdbcType="VARCHAR" property="bankNumber" />
+    <result column="suit_floor" jdbcType="VARCHAR" property="suitFloor" />
+    <result column="suit_cost_type" jdbcType="VARCHAR" property="suitCostType" />
+    <result column="tax_rate" jdbcType="VARCHAR" property="taxRate" />
+    <result column="create_user" jdbcType="VARCHAR" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_user" jdbcType="VARCHAR" property="updateUser" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </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, bank_name, bank_branch_name, bank_number, suit_floor, suit_cost_type, tax_rate,
+    create_user, create_time, update_user, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.idea.invoice.model.InvoiceBankExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from invoice_bank
+    <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 invoice_bank
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from invoice_bank
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.invoice.model.InvoiceBankExample">
+    delete from invoice_bank
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.invoice.model.InvoiceBank">
+    insert into invoice_bank (id, bank_name, bank_branch_name,
+                              bank_number, suit_floor, suit_cost_type,
+                              tax_rate, create_user, create_time,
+                              update_user, update_time)
+    values (#{id,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR},
+            #{bankNumber,jdbcType=VARCHAR}, #{suitFloor,jdbcType=VARCHAR}, #{suitCostType,jdbcType=VARCHAR},
+            #{taxRate,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+            #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.invoice.model.InvoiceBank">
+    insert into invoice_bank
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </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="suitFloor != null">
+        suit_floor,
+      </if>
+      <if test="suitCostType != null">
+        suit_cost_type,
+      </if>
+      <if test="taxRate != null">
+        tax_rate,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateUser != null">
+        update_user,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankBranchName != null">
+        #{bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        #{bankNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="suitFloor != null">
+        #{suitFloor,jdbcType=VARCHAR},
+      </if>
+      <if test="suitCostType != null">
+        #{suitCostType,jdbcType=VARCHAR},
+      </if>
+      <if test="taxRate != null">
+        #{taxRate,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.invoice.model.InvoiceBankExample" resultType="java.lang.Long">
+    select count(*) from invoice_bank
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update invoice_bank
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </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=VARCHAR},
+      </if>
+      <if test="record.suitFloor != null">
+        suit_floor = #{record.suitFloor,jdbcType=VARCHAR},
+      </if>
+      <if test="record.suitCostType != null">
+        suit_cost_type = #{record.suitCostType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taxRate != null">
+        tax_rate = #{record.taxRate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUser != null">
+        update_user = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update invoice_bank
+    set id = #{record.id,jdbcType=VARCHAR},
+    bank_name = #{record.bankName,jdbcType=VARCHAR},
+    bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
+    bank_number = #{record.bankNumber,jdbcType=VARCHAR},
+    suit_floor = #{record.suitFloor,jdbcType=VARCHAR},
+    suit_cost_type = #{record.suitCostType,jdbcType=VARCHAR},
+    tax_rate = #{record.taxRate,jdbcType=VARCHAR},
+    create_user = #{record.createUser,jdbcType=VARCHAR},
+    create_time = #{record.createTime,jdbcType=TIMESTAMP},
+    update_user = #{record.updateUser,jdbcType=VARCHAR},
+    update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.invoice.model.InvoiceBank">
+    update invoice_bank
+    <set>
+      <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=VARCHAR},
+      </if>
+      <if test="suitFloor != null">
+        suit_floor = #{suitFloor,jdbcType=VARCHAR},
+      </if>
+      <if test="suitCostType != null">
+        suit_cost_type = #{suitCostType,jdbcType=VARCHAR},
+      </if>
+      <if test="taxRate != null">
+        tax_rate = #{taxRate,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        update_user = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.invoice.model.InvoiceBank">
+    update invoice_bank
+    set bank_name = #{bankName,jdbcType=VARCHAR},
+        bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+        bank_number = #{bankNumber,jdbcType=VARCHAR},
+        suit_floor = #{suitFloor,jdbcType=VARCHAR},
+        suit_cost_type = #{suitCostType,jdbcType=VARCHAR},
+        tax_rate = #{taxRate,jdbcType=VARCHAR},
+        create_user = #{createUser,jdbcType=VARCHAR},
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+        update_user = #{updateUser,jdbcType=VARCHAR},
+        update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>