by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了费用bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
yuyongle
2025-07-18 17:48:04 +08:00
parent b7d225c107
commit 6163532f39
30 changed files with 528 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
ruoyi-common/ruoyi-common-core/src/main/resources/mapper/CostPayFeeAuditMapper.xml Normal file
View File

@@ -0,0 +1,247 @@
<?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=".mapper.CostPayFeeAuditMapper">
<resultMap type=".domain.CostPayFeeAudit" id="CostPayFeeAuditMap">
<result property="id" column="id"/>
<result property="houseChargeId" column="house_charge_id"/>
<result property="itemId" column="item_id"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="receivedAmount" column="received_amount"/>
<result property="receivableAmount" column="receivable_amount"/>
<result property="payTime" column="pay_time"/>
<result property="state" column="state"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="searchValue" column="search_value"/>
<result property="createDept" column="create_dept"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
<!--查询所有-->
<select id="queryAll" resultMap="CostPayFeeAuditMap">
select
id, house_charge_id, item_id, start_time, end_time, received_amount, receivable_amount, pay_time, state, remark, create_time, create_by, update_time, update_by, search_value, create_dept, tenant_id
from cost_pay_fee_audit
</select>
<!--查询单个-->
<select id="queryById" resultMap="CostPayFeeAuditMap">
select
id, house_charge_id, item_id, start_time, end_time, received_amount, receivable_amount, pay_time, state, remark, create_time, create_by, update_time, update_by, search_value, create_dept, tenant_id
from cost_pay_fee_audit
where id = #{id}
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="CostPayFeeAuditMap">
select
id, house_charge_id, item_id, start_time, end_time, received_amount, receivable_amount, pay_time, state, remark, create_time, create_by, update_time, update_by, search_value, create_dept, tenant_id
from cost_pay_fee_audit
<where>
<if test="id != null">
and id = #{id}
</if>
<if test="houseChargeId != null">
and house_charge_id = #{houseChargeId}
</if>
<if test="itemId != null">
and item_id = #{itemId}
</if>
<if test="startTime != null">
and start_time = #{startTime}
</if>
<if test="endTime != null">
and end_time = #{endTime}
</if>
<if test="receivedAmount != null">
and received_amount = #{receivedAmount}
</if>
<if test="receivableAmount != null">
and receivable_amount = #{receivableAmount}
</if>
<if test="payTime != null">
and pay_time = #{payTime}
</if>
<if test="state != null and state != ''">
and state = #{state}
</if>
<if test="remark != null and remark != ''">
and remark = #{remark}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="createBy != null and createBy != ''">
and create_by = #{createBy}
</if>
<if test="updateTime != null">
and update_time = #{updateTime}
</if>
<if test="updateBy != null and updateBy != ''">
and update_by = #{updateBy}
</if>
<if test="searchValue != null and searchValue != ''">
and search_value = #{searchValue}
</if>
<if test="createDept != null">
and create_dept = #{createDept}
</if>
<if test="tenantId != null and tenantId != ''">
and tenant_id = #{tenantId}
</if>
</where>
limit #{pageable.offset}, #{pageable.pageSize}
</select>
<!--统计总行数-->
<select id="count" resultType="java.lang.Long">
select count(1)
from cost_pay_fee_audit
<where>
<if test="id != null">
and id = #{id}
</if>
<if test="houseChargeId != null">
and house_charge_id = #{houseChargeId}
</if>
<if test="itemId != null">
and item_id = #{itemId}
</if>
<if test="startTime != null">
and start_time = #{startTime}
</if>
<if test="endTime != null">
and end_time = #{endTime}
</if>
<if test="receivedAmount != null">
and received_amount = #{receivedAmount}
</if>
<if test="receivableAmount != null">
and receivable_amount = #{receivableAmount}
</if>
<if test="payTime != null">
and pay_time = #{payTime}
</if>
<if test="state != null and state != ''">
and state = #{state}
</if>
<if test="remark != null and remark != ''">
and remark = #{remark}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="createBy != null and createBy != ''">
and create_by = #{createBy}
</if>
<if test="updateTime != null">
and update_time = #{updateTime}
</if>
<if test="updateBy != null and updateBy != ''">
and update_by = #{updateBy}
</if>
<if test="searchValue != null and searchValue != ''">
and search_value = #{searchValue}
</if>
<if test="createDept != null">
and create_dept = #{createDept}
</if>
<if test="tenantId != null and tenantId != ''">
and tenant_id = #{tenantId}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into cost_pay_fee_audit(house_charge_iditem_idstart_timeend_timereceived_amountreceivable_amountpay_timestateremarkcreate_timecreate_byupdate_timeupdate_bysearch_valuecreate_depttenant_id)
values (#{houseChargeId}#{itemId}#{startTime}#{endTime}#{receivedAmount}#{receivableAmount}#{payTime}#{state}#{remark}#{createTime}#{createBy}#{updateTime}#{updateBy}#{searchValue}#{createDept}#{tenantId})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into cost_pay_fee_audit(house_charge_iditem_idstart_timeend_timereceived_amountreceivable_amountpay_timestateremarkcreate_timecreate_byupdate_timeupdate_bysearch_valuecreate_depttenant_id)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.houseChargeId}#{entity.itemId}#{entity.startTime}#{entity.endTime}#{entity.receivedAmount}#{entity.receivableAmount}#{entity.payTime}#{entity.state}#{entity.remark}#{entity.createTime}#{entity.createBy}#{entity.updateTime}#{entity.updateBy}#{entity.searchValue}#{entity.createDept}#{entity.tenantId})
</foreach>
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into cost_pay_fee_audit(house_charge_iditem_idstart_timeend_timereceived_amountreceivable_amountpay_timestateremarkcreate_timecreate_byupdate_timeupdate_bysearch_valuecreate_depttenant_id)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.houseChargeId}#{entity.itemId}#{entity.startTime}#{entity.endTime}#{entity.receivedAmount}#{entity.receivableAmount}#{entity.payTime}#{entity.state}#{entity.remark}#{entity.createTime}#{entity.createBy}#{entity.updateTime}#{entity.updateBy}#{entity.searchValue}#{entity.createDept}#{entity.tenantId})
</foreach>
on duplicate key update
house_charge_id = values(house_charge_id)item_id = values(item_id)start_time = values(start_time)end_time = values(end_time)received_amount = values(received_amount)receivable_amount = values(receivable_amount)pay_time = values(pay_time)state = values(state)remark = values(remark)create_time = values(create_time)create_by = values(create_by)update_time = values(update_time)update_by = values(update_by)search_value = values(search_value)create_dept = values(create_dept)tenant_id = values(tenant_id)
</insert>
<!--通过主键修改数据-->
<update id="update">
update cost_pay_fee_audit
<set>
<if test="houseChargeId != null">
house_charge_id = #{houseChargeId},
</if>
<if test="itemId != null">
item_id = #{itemId},
</if>
<if test="startTime != null">
start_time = #{startTime},
</if>
<if test="endTime != null">
end_time = #{endTime},
</if>
<if test="receivedAmount != null">
received_amount = #{receivedAmount},
</if>
<if test="receivableAmount != null">
receivable_amount = #{receivableAmount},
</if>
<if test="payTime != null">
pay_time = #{payTime},
</if>
<if test="state != null and state != ''">
state = #{state},
</if>
<if test="remark != null and remark != ''">
remark = #{remark},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
<if test="createBy != null and createBy != ''">
create_by = #{createBy},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="updateBy != null and updateBy != ''">
update_by = #{updateBy},
</if>
<if test="searchValue != null and searchValue != ''">
search_value = #{searchValue},
</if>
<if test="createDept != null">
create_dept = #{createDept},
</if>
<if test="tenantId != null and tenantId != ''">
tenant_id = #{tenantId},
</if>
</set>
where id = #{id}
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete from cost_pay_fee_audit where id = #{id}
</delete>
</mapper>

3
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostHouseChargeController.java
View File

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.property.domain.vo.CostHouseChargeDetailVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -64,7 +65,7 @@ public class CostHouseChargeController extends BaseController {
*/
@SaCheckPermission("property:houseCharge:query")
@GetMapping("/{id}")
public R<CostHouseChargeVo> getInfo(@NotNull(message = "主键不能为空")
public R<CostHouseChargeDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(costHouseChargeService.queryById(id));
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostPayFeeAuditController.java
View File

@@ -40,7 +40,7 @@ public class CostPayFeeAuditController extends BaseController {
/**
* 查询费用-缴费审核列表
*/
@SaCheckPermission("system:payFeeAudit:list")
// @SaCheckPermission("system:payFeeAudit:list")
@GetMapping("/list")
public TableDataInfo<CostPayFeeAuditVo> list(CostPayFeeAuditBo bo, PageQuery pageQuery) {
return costPayFeeAuditService.queryPageList(bo, pageQuery);

19
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CostItems.java
View File

@@ -6,16 +6,17 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 费用项设置对象 costItemSetting
* 费用项设置对象 costItems
*
* @author mocheng
* @date 2025-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("costItemSetting")
@TableName("cost_items")
public class CostItems extends TenantEntity {
@Serial
@@ -31,6 +32,10 @@ public class CostItems extends TenantEntity {
* 费用类型
*/
private String costType;
/**
* 费用编号
*/
private String chargeNo;
/**
* 收费项目
@@ -50,7 +55,7 @@ public class CostItems extends TenantEntity {
/**
* 缴费周期（月）
*/
private Long chargeCycle;
private Integer chargeCycle;
/**
* 是否手机缴费
@@ -80,17 +85,17 @@ public class CostItems extends TenantEntity {
/**
* 计费单价
*/
private Long unitPrice;
private BigDecimal unitPrice;
/**
* 附加费
*/
private Long surcharge;
private BigDecimal surcharge;
/**
* 搜索值
*单位
*/
private String searchValue;
private String unit;
}

11
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CostMeterType.java
View File

@@ -8,14 +8,14 @@ import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 抄表类型对象 meterReadingType
* 抄表类型对象 CostMeterType
*
* @author mocheng
* @date 2025-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("meterReadingType")
@TableName("cost_meter_type")
public class CostMeterType extends TenantEntity {
@Serial
@@ -41,11 +41,4 @@ public class CostMeterType extends TenantEntity {
* 说明
*/
private String remark;
/**
* 搜索值
*/
private String searchValue;
}

12
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CostMeterWater.java
View File

@@ -29,10 +29,18 @@ public class CostMeterWater extends TenantEntity {
@TableId(value = "id")
private Long id;
/**
* 业主id
*/
private Long userId;
/**
* 费用类型id
*/
private Long itemId;
/**
* 房间id
*/
private Long roomId;
/**
* 抄表类型id
@@ -70,10 +78,6 @@ public class CostMeterWater extends TenantEntity {
*/
private String remark;
/**
* 搜索值
*/
private String searchValue;
}

12
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CostPayFeeAudit.java
View File

@@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import java.io.Serial;
@@ -51,12 +53,12 @@ public class CostPayFeeAudit extends TenantEntity {
/**
* 实付金额
*/
private String receivedAmount;
private BigDecimal receivedAmount;
/**
* 应收金额
*/
private Long receivableAmount;
private BigDecimal receivableAmount;
/**
* 缴费时间
@@ -75,10 +77,4 @@ public class CostPayFeeAudit extends TenantEntity {
*/
private String remark;
/**
* 搜索值
*/
private String searchValue;
}

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/MachineMaintainPlan.java
View File

@@ -77,10 +77,4 @@ public class MachineMaintainPlan extends TenantEntity {
*/
private String state;
/**
* 搜索值
*/
private String searchValue;
}

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoom.java
View File

@@ -60,6 +60,10 @@ public class TbRoom extends TenantEntity {
* 面积(平方米)
*/
private Float area;
/**
* 套内面积(平方米)
*/
private Float insideInArea;
/**
* 户型(如2室1厅1卫)

19
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CostItemsBo.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.domain.bo;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.property.domain.CostItems;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
@@ -9,6 +10,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
/**
* 费用项设置业务对象 costItemSetting
*
@@ -25,7 +28,10 @@ public class CostItemsBo extends BaseEntity {
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
private Long id;
/**
* 费用编号
*/
private String chargeNo;
/**
* 费用类型
*/
@@ -49,11 +55,16 @@ public class CostItemsBo extends BaseEntity {
*/
@NotBlank(message = "付费类型不能为空", groups = { AddGroup.class, EditGroup.class })
private String paymentType;
/**
*单位
*/
@ExcelProperty(value = "单位")
private String unit;
/**
* 缴费周期（月）
*/
private Long chargeCycle;
private Integer chargeCycle;
/**
* 是否手机缴费
@@ -83,12 +94,12 @@ public class CostItemsBo extends BaseEntity {
/**
* 计费单价
*/
private Long unitPrice;
private BigDecimal unitPrice;
/**
* 附加费
*/
private Long surcharge;
private BigDecimal surcharge;
/**
* 搜索值

11
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CostMeterWaterBo.java
View File

@@ -29,12 +29,21 @@ public class CostMeterWaterBo extends BaseEntity {
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
private Long id;
/**
* 业主id
*/
@NotNull(message = "业主id不能为空", groups = { EditGroup.class })
private Long userId;
/**
* 费用类型id
*/
@NotNull(message = "费用类型id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long itemId;
/**
* 房间id
*/
private Long roomId;
/**
* 抄表类型id
*/

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CostPayFeeAuditBo.java
View File

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.property.domain.CostPayFeeAudit;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -56,13 +57,13 @@ public class CostPayFeeAuditBo extends BaseEntity {
/**
* 实付金额
*/
private String receivedAmount;
private BigDecimal receivedAmount;
/**
* 应收金额
*/
@NotNull(message = "应收金额不能为空", groups = { AddGroup.class, EditGroup.class })
private Long receivableAmount;
private BigDecimal receivableAmount;
/**
* 缴费时间

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MachineMaintainPlanBo.java
View File

@@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.property.domain.MachineMaintainPlan;
import java.util.Date;
import java.util.List;
/**
* 设备保养计划业务对象 machine_maintain_plan
@@ -85,5 +86,10 @@ public class MachineMaintainPlanBo extends BaseEntity {
*/
private String searchValue;
/**
* 选择员工
*/
private List<MachineMaintainPlanStaffBo> machineMaintainPlanStaffBoList;
}

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBo.java
View File

@@ -47,7 +47,10 @@ public class TbRoomBo extends BaseEntity {
* 面积(平方米)
*/
private Float area;
/**
* 套内面积(平方米)
*/
private Float insideInArea;
/**
* 户型(如2室1厅1卫)
*/

98
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostHouseChargeDetailVo.java Normal file
View File

@@ -0,0 +1,98 @@
package org.dromara.property.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.property.domain.CostHouseCharge;
import org.dromara.property.domain.CostItems;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @Author:yuyongle
* @Date:2025/7/18 16:03
* @Description:
**/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = CostHouseCharge.class)
public class CostHouseChargeDetailVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 房屋
*/
@ExcelProperty(value = "房屋")
private Long roomId;
/**
* 收费项目
*/
@ExcelProperty(value = "收费项目")
private Long costItemsId;
/**
* 支付方式
*/
@ExcelProperty(value = "支付方式")
private String payType;
/**
* 支付周期
*/
@ExcelProperty(value = "支付周期")
private String chargeCycle;
/**
* 应收金额
*/
@ExcelProperty(value = "应收金额")
private Long amountReceivable;
/**
* 计费开始时间
*/
@ExcelProperty(value = "计费开始时间")
private Date startTime;
/**
* 计费结束时间
*/
@ExcelProperty(value = "计费结束时间")
private Date endTime;
/**
* 状态
*/
@ExcelProperty(value = "状态")
private String state;
/**
* 说明
*/
@ExcelProperty(value = "说明")
private String remark;
/**
* 房间信息
*/
@ExcelProperty(value = "房间信息")
private TbRoomVo roomVo;
/**
* 收费项设置
*/
@ExcelProperty(value = "收费项设置")
private CostItemsVo costItemsVo;
}

19
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostItemsVo.java
View File

@@ -10,12 +10,13 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 费用项设置视图对象 costItemSetting
* 费用项设置视图对象 costItems
*
* @author mocheng
* @date 2025-07-17
@@ -33,7 +34,10 @@ public class CostItemsVo implements Serializable {
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 费用编号
*/
private String chargeNo;
/**
* 费用类型
*/
@@ -64,7 +68,7 @@ public class CostItemsVo implements Serializable {
*/
@ExcelProperty(value = "缴费周期", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "月=")
private Long chargeCycle;
private Integer chargeCycle;
/**
* 是否手机缴费
@@ -100,19 +104,24 @@ public class CostItemsVo implements Serializable {
* 计费单价
*/
@ExcelProperty(value = "计费单价")
private Long unitPrice;
private BigDecimal unitPrice;
/**
* 附加费
*/
@ExcelProperty(value = "附加费")
private Long surcharge;
private BigDecimal surcharge;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
/**
*单位
*/
@ExcelProperty(value = "单位")
private String unit;
}

7
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostMeterTypeVo.java
View File

@@ -10,7 +10,7 @@ import org.dromara.property.domain.CostMeterType;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
@@ -51,6 +51,11 @@ public class CostMeterTypeVo implements Serializable {
*/
@ExcelProperty(value = "说明")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
/**
* 搜索值

10
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostMeterWaterVo.java
View File

@@ -32,12 +32,20 @@ public class CostMeterWaterVo implements Serializable {
@ExcelProperty(value = "主键")
private Long id;
/**
* 业主id
*/
private Long userId;
/**
* 费用类型id
*/
@ExcelProperty(value = "费用类型id")
private Long itemId;
/**
* 房间id
*/
private Long roomId;
/**
* 抄表类型id
*/

21
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostPayFeeAuditVo.java
View File

@@ -8,6 +8,7 @@ import org.dromara.property.domain.CostPayFeeAudit;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -38,12 +39,26 @@ public class CostPayFeeAuditVo implements Serializable {
@ExcelProperty(value = "房屋收费id")
private Long houseChargeId;
/**
* 房间号(如101,202)
*/
@ExcelProperty(value = "房间号(如101,202)")
private String roomNumber;
/**
* 费用项目id
*/
@ExcelProperty(value = "费用项目id")
private Long itemId;
/**
* 收费项目
*/
@ExcelProperty(value = "收费项目")
private String chargeItem;
/**
* 缴费周期（月）
*/
private Integer chargeCycle;
/**
* 缴费开始时间
*/
@@ -60,13 +75,13 @@ public class CostPayFeeAuditVo implements Serializable {
* 实付金额
*/
@ExcelProperty(value = "实付金额")
private String receivedAmount;
private BigDecimal receivedAmount;
/**
* 应收金额
*/
@ExcelProperty(value = "应收金额")
private Long receivableAmount;
private BigDecimal receivableAmount;
/**
* 缴费时间

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/MachineMaintainPlanVo.java
View File

@@ -9,7 +9,7 @@ import org.dromara.property.domain.MachineMaintainPlan;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@@ -98,5 +98,9 @@ public class MachineMaintainPlanVo implements Serializable {
@ExcelProperty(value = "搜索值")
private String searchValue;
/**
* 员工
*/
@ExcelProperty(value = "搜索值")
private List<MachineMaintainPlanStaffVo> machineMaintainPlanStaffVos;
}

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomVo.java
View File

@@ -77,7 +77,10 @@ public class TbRoomVo implements Serializable {
*/
@ExcelProperty(value = "面积(平方米)")
private Long area;
/**
* 套内面积(平方米)
*/
private Float insideInArea;
/**
* 户型(如2室1厅1卫)
*/

3
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CostPayFeeAuditMapper.java
View File

@@ -1,6 +1,9 @@
package org.dromara.property.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.CostPayFeeAudit;
import org.dromara.property.domain.vo.CostPayFeeAuditVo;

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICostHouseChargeService.java
View File

@@ -1,6 +1,7 @@
package org.dromara.property.service;
import org.dromara.property.domain.CostHouseCharge;
import org.dromara.property.domain.vo.CostHouseChargeDetailVo;
import org.dromara.property.domain.vo.CostHouseChargeVo;
import org.dromara.property.domain.bo.CostHouseChargeBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -23,7 +24,7 @@ public interface ICostHouseChargeService {
* @param id 主键
* @return 房屋收费
*/
CostHouseChargeVo queryById(Long id);
CostHouseChargeDetailVo queryById(Long id);
/**
* 分页查询房屋收费列表

18
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import cn.hutool.core.bean.BeanUtil;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,6 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.vo.CostHouseChargeDetailVo;
import org.dromara.property.domain.vo.CostItemsVo;
import org.dromara.property.domain.vo.TbRoomVo;
import org.dromara.property.mapper.CostItemsMapper;
import org.dromara.property.mapper.TbRoomMapper;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.CostHouseChargeBo;
import org.dromara.property.domain.vo.CostHouseChargeVo;
@@ -32,6 +38,8 @@ import java.util.Collection;
public class CostHouseChargeServiceImpl implements ICostHouseChargeService {
private final CostHouseChargeMapper baseMapper;
private final CostItemsMapper costItemsMapper;
private final TbRoomMapper tbRoomMapper;
/**
* 查询房屋收费
@@ -40,8 +48,14 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService {
* @return 房屋收费
*/
@Override
public CostHouseChargeVo queryById(Long id){
return baseMapper.selectVoById(id);
public CostHouseChargeDetailVo queryById(Long id){
CostHouseChargeVo costHouseChargeVo = baseMapper.selectVoById(id);
CostHouseChargeDetailVo costHouseChargeDetailVo = BeanUtil.copyProperties(costHouseChargeVo, CostHouseChargeDetailVo.class);
CostItemsVo costItemsVo = costItemsMapper.selectVoById(costHouseChargeDetailVo.getCostItemsId());
costHouseChargeDetailVo.setCostItemsVo( costItemsVo );
TbRoomVo tbRoomVo = tbRoomMapper.selectVoById(costHouseChargeDetailVo.getRoomId());
costHouseChargeDetailVo.setRoomVo(tbRoomVo);
return costHouseChargeDetailVo;
}
/**

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostItemsServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import cn.hutool.core.util.RandomUtil;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -99,6 +100,7 @@ public class CostItemsServiceImpl implements ICostItemsService {
@Override
public Boolean insertByBo(CostItemsBo bo) {
CostItems add = MapstructUtils.convert(bo, CostItems.class);
add.setChargeNo( RandomUtil.randomNumbers(11));
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

1
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java
View File

@@ -78,7 +78,6 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService {
lqw.eq(bo.getItemId() != null, CostPayFeeAudit::getItemId, bo.getItemId());
lqw.eq(bo.getStartTime() != null, CostPayFeeAudit::getStartTime, bo.getStartTime());
lqw.eq(bo.getEndTime() != null, CostPayFeeAudit::getEndTime, bo.getEndTime());
lqw.eq(StringUtils.isNotBlank(bo.getReceivedAmount()), CostPayFeeAudit::getReceivedAmount, bo.getReceivedAmount());
lqw.eq(bo.getReceivableAmount() != null, CostPayFeeAudit::getReceivableAmount, bo.getReceivableAmount());
lqw.eq(bo.getPayTime() != null, CostPayFeeAudit::getPayTime, bo.getPayTime());
lqw.eq(StringUtils.isNotBlank(bo.getState()), CostPayFeeAudit::getState, bo.getState());

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineLocationServiceImpl.java
View File

@@ -153,6 +153,7 @@ public class MachineLocationServiceImpl implements IMachineLocationService {
@Override
public Boolean insertByBo(MachineLocationBo bo) {
MachineLocation add = MapstructUtils.convert(bo, MachineLocation.class);
add.setLocationCode(RandomUtil.randomNumbers(11));
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@@ -179,7 +180,7 @@ public class MachineLocationServiceImpl implements IMachineLocationService {
*/
private void validEntityBeforeSave(MachineLocation entity) {
//TODO 做一些数据校验,如唯一约束
entity.setLocationCode(RandomUtil.randomNumbers(11));
}
/**

26
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanServiceImpl.java
View File

@@ -1,5 +1,7 @@
package org.dromara.property.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,10 +11,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.InspectionPlanStaff;
import org.dromara.property.domain.MachineMaintainPlan;
import org.dromara.property.domain.MachineMaintainPlanStaff;
import org.dromara.property.domain.bo.InspectionPlanStaffBo;
import org.dromara.property.domain.bo.MachineMaintainPlanBo;
import org.dromara.property.domain.bo.MachineMaintainPlanStaffBo;
import org.dromara.property.domain.vo.MachineMaintainPlanStaffVo;
import org.dromara.property.domain.vo.MachineMaintainPlanVo;
import org.dromara.property.mapper.MachineMaintainPlanMapper;
import org.dromara.property.mapper.MachineMaintainPlanStaffMapper;
import org.dromara.property.service.IMachineMaintainPlanService;
import org.springframework.stereotype.Service;
@@ -32,6 +40,7 @@ import java.util.Collection;
public class MachineMaintainPlanServiceImpl implements IMachineMaintainPlanService {
private final MachineMaintainPlanMapper baseMapper;
private final MachineMaintainPlanStaffMapper machineMaintainPlanStaffMapper;
/**
* 查询设备保养计划
@@ -41,7 +50,12 @@ public class MachineMaintainPlanServiceImpl implements IMachineMaintainPlanServi
*/
@Override
public MachineMaintainPlanVo queryById(Long id){
return baseMapper.selectVoById(id);
MachineMaintainPlanVo machineMaintainPlanVo = baseMapper.selectVoById(id);
LambdaQueryWrapper<MachineMaintainPlanStaff> planQueryWrapper = new LambdaQueryWrapper<>();
planQueryWrapper.eq(MachineMaintainPlanStaff::getMaintainPlanId,id);
List<MachineMaintainPlanStaffVo> machineMaintainPlanStaffVos = machineMaintainPlanStaffMapper.selectVoList(planQueryWrapper);
machineMaintainPlanVo.setMachineMaintainPlanStaffVos(machineMaintainPlanStaffVos );
return machineMaintainPlanVo;
}
/**
@@ -97,10 +111,18 @@ public class MachineMaintainPlanServiceImpl implements IMachineMaintainPlanServi
@Override
public Boolean insertByBo(MachineMaintainPlanBo bo) {
MachineMaintainPlan add = MapstructUtils.convert(bo, MachineMaintainPlan.class);
add.setState("0");
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
List<MachineMaintainPlanStaffBo> machineMaintainPlanStaffBoList = bo.getMachineMaintainPlanStaffBoList();
if (CollectionUtil.isNotEmpty(machineMaintainPlanStaffBoList)) {
for (MachineMaintainPlanStaffBo staffBo : machineMaintainPlanStaffBoList) {
staffBo.setMaintainPlanId(add.getId());
}
machineMaintainPlanStaffMapper.insertBatch(BeanUtil.copyToList(machineMaintainPlanStaffBoList, MachineMaintainPlanStaff.class));
}
}
return flag;
}
@@ -123,7 +145,7 @@ public class MachineMaintainPlanServiceImpl implements IMachineMaintainPlanServi
*/
private void validEntityBeforeSave(MachineMaintainPlan entity){
//TODO 做一些数据校验,如唯一约束
entity.setState("0");
}
/**

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderChargeServiceImpl.java
View File

@@ -109,6 +109,9 @@ public class PlantsOrderChargeServiceImpl implements IPlantsOrderChargeService {
@Override
public Boolean insertByBo(PlantsOrderChargeBo bo) {
PlantsOrderCharge add = MapstructUtils.convert(bo, PlantsOrderCharge.class);
if(add.getRent()!=null&&add.getDeposit()!=null&&add.getPenalty()!=null){
add.setTotalAmount(add.getRent().add(add.getDeposit()).add(add.getPenalty()));
}
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@@ -134,9 +137,7 @@ public class PlantsOrderChargeServiceImpl implements IPlantsOrderChargeService {
* 保存前的数据校验
*/
private void validEntityBeforeSave(PlantsOrderCharge entity){
if(entity.getRent()!=null&&entity.getDeposit()!=null&&entity.getPenalty()!=null){
entity.setTotalAmount(entity.getRent().add(entity.getDeposit()).add(entity.getPenalty()));
}
}
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java
View File

@@ -137,7 +137,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(ServiceWorkOrdersBo bo) {
ServiceWorkOrders add = MapstructUtils.convert(bo, ServiceWorkOrders.class);
add.setOrderNo("GD" + IdUtil.getSnowflakeNextIdStr());
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@@ -165,7 +165,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
*/
private void validEntityBeforeSave(ServiceWorkOrders entity) {
//TODO 做一些数据校验,如唯一约束
entity.setOrderNo("GD" + IdUtil.getSnowflakeNextIdStr());
}
/**