From 7de70ee2753214b1acaca1671bfff11cd1714821 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 25 Nov 2023 18:09:10 +0800
Subject: [PATCH] 物业维修资金申请修改
---
src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml | 11 ++++++++++-
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 2 +-
src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.java | 4 +++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index eb0dca5..bfb6695 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -81,7 +81,7 @@
* 分摊方式
*/
@ApiModelProperty(value = "分摊方式")
- private Integer allocationWay;
+ private String allocationWay;
/**
* 预算总金额
*/
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.java b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.java
index b5758b4..0ec021b 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.java
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,8 @@
* @param propertyCapitalApply
* @return
*/
- List<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage page, PropertyCapitalApplyVO propertyCapitalApply);
+ List<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage page,
+ @Param("propertyCapitalApply") PropertyCapitalApplyVO propertyCapitalApply);
}
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
index fc6d2e0..832504e 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
@@ -27,9 +27,18 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
+ <!--自定义分页查询-->
<select id="selectPropertyCapitalApplyPage" resultMap="propertyCapitalApplyResultMap">
select * from jczz_property_capital_apply where is_deleted = 0
+ <if test="propertyCapitalApply.districtId!=null">
+ and district_id = #{propertyCapitalApply.districtId}
+ </if>
+ <if test="propertyCapitalApply.name!=null and propertyCapitalApply.name!=''">
+ and name like concat('%',#{propertyCapitalApply.name},'%')
+ </if>
+ <if test="propertyCapitalApply.linkman!=null and propertyCapitalApply.linkman!=''">
+ and linkman like concat('%',#{propertyCapitalApply.linkman},'%')
+ </if>
</select>
--
Gitblit v1.9.3