专项维修资金

pro-base/src/main/java/com/idea/customerManagement/dto/ContractManageDto.java

@@ -21,4 +21,6 @@ public class ContractManageDto extends ContractManage {
 
     private BigDecimal arrears;
 
+    private String maintenanceFundsId;
+
 }

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

@@ -9,6 +9,7 @@ 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 com.rockstar.util.StringUtils;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -51,9 +52,26 @@ public class MaintenanceFundsManagementController extends BaseController {
         return result(result);
     }
 
+    /**
+     * 查询对应的银行
+     * @param contractId
+     * @return
+     */
+    @PostMapping(value = "getBankTaxRateByFloor",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getBankTaxRateByFloor(String contractId) {
+        if(!StringUtils.isNotEmpty(contractId)){
+            return AjaxResult.error(503, "参数不能为空");
+        }
+        return modelService.getBankTaxRateByFloor(contractId);
+    }
 
+    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getById(String id) {
 
-
+        return modelService.getById(id);
+    }
 
 
 

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

@@ -1,5 +1,8 @@
 package com.idea.paymentManagement.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,6 +14,8 @@ public class MaintenanceFundsManagement implements Serializable {
 
     private Integer paymentMethod;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date payTime;
 
     private String bankName;
@@ -21,6 +26,8 @@ public class MaintenanceFundsManagement implements Serializable {
 
     private BigDecimal payMoney;
 
+    private BigDecimal receivableMoney;
+
     private String createdId;
 
     private Date createdAt;
@@ -99,6 +106,14 @@ public class MaintenanceFundsManagement implements Serializable {
         this.payMoney = payMoney;
     }
 
+    public BigDecimal getReceivableMoney() {
+        return receivableMoney;
+    }
+
+    public void setReceivableMoney(BigDecimal receivableMoney) {
+        this.receivableMoney = receivableMoney;
+    }
+
     public String getCreatedId() {
         return createdId;
     }

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

@@ -636,6 +636,66 @@ public class MaintenanceFundsManagementExample {
             return (Criteria) this;
         }
 
+        public Criteria andReceivableMoneyIsNull() {
+            addCriterion("receivable_money is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyIsNotNull() {
+            addCriterion("receivable_money is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyEqualTo(BigDecimal value) {
+            addCriterion("receivable_money =", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyNotEqualTo(BigDecimal value) {
+            addCriterion("receivable_money <>", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyGreaterThan(BigDecimal value) {
+            addCriterion("receivable_money >", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("receivable_money >=", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyLessThan(BigDecimal value) {
+            addCriterion("receivable_money <", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("receivable_money <=", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyIn(List<BigDecimal> values) {
+            addCriterion("receivable_money in", values, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyNotIn(List<BigDecimal> values) {
+            addCriterion("receivable_money not in", values, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("receivable_money between", value1, value2, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("receivable_money not between", value1, value2, "receivableMoney");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedIdIsNull() {
             addCriterion("created_id is null");
             return (Criteria) this;

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

@@ -1,11 +1,17 @@
 package com.idea.paymentManagement.service;
 
 import cn.hutool.core.util.IdUtil;
+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.ContractManageDto;
 import com.idea.customerManagement.mapper.ContractManageMapper;
 import com.idea.customerManagement.model.ContractManage;
+import com.idea.invoice.model.InvoiceBank;
+import com.idea.invoice.model.InvoiceBankExample;
+import com.idea.invoice.service.InvoiceBankService;
 import com.idea.paymentManagement.mapper.MaintenanceFundsManagementExtendMapper;
 import com.idea.paymentManagement.mapper.MaintenanceFundsManagementMapper;
 import com.idea.paymentManagement.model.MaintenanceFundsManagement;
@@ -14,9 +20,11 @@ import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
 import com.rockstar.shiro.util.ShiroUtils;
+import com.rockstar.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -29,6 +37,10 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
     private MaintenanceFundsManagementExtendMapper extendMapper;
     @Autowired
     private ContractManageMapper contractManageMapper;
+    @Autowired
+    private InvoiceBankService invoiceBankService;
+    @Autowired
+    private ParkRoomMapper parkRoomMapper;
 
 
 
@@ -95,6 +107,7 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
         // 更新合同 专项维修资金收取状态 已收款
         ContractManage contractManage = contractManageMapper.selectByPrimaryKey(model.getContractId());
         contractManage.setFundCollectionStatus(2);
+        contractManageMapper.updateByPrimaryKeySelective(contractManage);
         int result = insertSelective(model);
         return result;
     }
@@ -107,5 +120,47 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
         return pageInfo;
     }
 
+    /**
+     * 查询对应的银行
+     * @param contractId
+     * @return
+     */
+    public JSONObject getBankTaxRateByFloor(String contractId) {
+        JSONObject jsonObject = new JSONObject();
+        String result = "";
+        // 1-房款，2-专项维修资金
+        InvoiceBankExample example = new InvoiceBankExample();
+        example.createCriteria().andSuitCostTypeLike("%" + "专项维修资金" + "%");
+        List<InvoiceBank> bankList = invoiceBankService.selectByExample(example);
+        ContractManage contractManage = contractManageMapper.selectByPrimaryKey(contractId);
+        ParkRoom parkRoom = parkRoomMapper.selectByPrimaryKey(contractManage.getHouseId());
+        String discId = parkRoom.getDiscId();
+        for (InvoiceBank invoiceBank : bankList) {
+            if (StringUtils.isNotEmpty(invoiceBank.getSuitFloor())) {
+                String[] floors = invoiceBank.getSuitFloor().split(",");
+                for (String floor : floors) {
+                    if (discId.equals(floor)) {
+                        result = invoiceBank.getBankName() + invoiceBank.getBankBranchName() + invoiceBank.getBankNumber();
+                        jsonObject.put("bankName", invoiceBank.getBankName());
+                        jsonObject.put("bankBranchName", invoiceBank.getBankBranchName());
+                        jsonObject.put("bankNumber", invoiceBank.getBankNumber());
+                        jsonObject.put("bankFullName", result);
+                        break;
+                    }
+                }
+            }
+        }
+        return jsonObject;
+    }
+
+    public MaintenanceFundsManagement getById(String id){
+        return modelMapper.selectByPrimaryKey(id);
+    }
+
+
+
+
+
+
 
 }

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

@@ -5,7 +5,8 @@
 
   <select id="listByModel" resultType="com.idea.customerManagement.dto.ContractManageDto">
     select contract_manage.*,
-           maintenance_funds_management.pay_money receivedMoney
+           maintenance_funds_management.pay_money receivedMoney,
+           maintenance_funds_management.id maintenanceFundsId
            from contract_manage
     left join maintenance_funds_management on contract_manage.id = maintenance_funds_management.contract_id
     <where>

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

@@ -10,6 +10,7 @@
     <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="receivable_money" jdbcType="DECIMAL" property="receivableMoney" />
     <result column="created_id" jdbcType="VARCHAR" property="createdId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -78,8 +79,8 @@
     </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
+    id, contract_id, payment_method, pay_time, bank_name, bank_branch_name, bank_number,
+    pay_money, receivable_money, created_id, created_at, updated_at, updated_id
   </sql>
   <sql id="Blob_Column_List">
     remark, payment_voucher
@@ -115,7 +116,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -133,16 +134,18 @@
     </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 into maintenance_funds_management (id, contract_id, payment_method,
+                                              pay_time, bank_name, bank_branch_name,
+                                              bank_number, pay_money, receivable_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}, #{receivableMoney,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
@@ -171,6 +174,9 @@
       <if test="payMoney != null">
         pay_money,
       </if>
+      <if test="receivableMoney != null">
+        receivable_money,
+      </if>
       <if test="createdId != null">
         created_id,
       </if>
@@ -215,6 +221,9 @@
       <if test="payMoney != null">
         #{payMoney,jdbcType=DECIMAL},
       </if>
+      <if test="receivableMoney != null">
+        #{receivableMoney,jdbcType=DECIMAL},
+      </if>
       <if test="createdId != null">
         #{createdId,jdbcType=VARCHAR},
       </if>
@@ -268,6 +277,9 @@
       <if test="record.payMoney != null">
         pay_money = #{record.payMoney,jdbcType=DECIMAL},
       </if>
+      <if test="record.receivableMoney != null">
+        receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
+      </if>
       <if test="record.createdId != null">
         created_id = #{record.createdId,jdbcType=VARCHAR},
       </if>
@@ -294,19 +306,20 @@
   <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}
+    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},
+    receivable_money = #{record.receivableMoney,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>
@@ -314,17 +327,18 @@
   <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}
+    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},
+    receivable_money = #{record.receivableMoney,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>
@@ -353,6 +367,9 @@
       <if test="payMoney != null">
         pay_money = #{payMoney,jdbcType=DECIMAL},
       </if>
+      <if test="receivableMoney != null">
+        receivable_money = #{receivableMoney,jdbcType=DECIMAL},
+      </if>
       <if test="createdId != null">
         created_id = #{createdId,jdbcType=VARCHAR},
       </if>
@@ -377,33 +394,35 @@
   <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}
+        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},
+        receivable_money = #{receivableMoney,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}
+        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},
+        receivable_money = #{receivableMoney,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>