diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java new file mode 100644 index 00000000..0082d98a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java @@ -0,0 +1,162 @@ +package org.dromara.xzd.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 决算清单(调整)对象 xzd_jsqd_tz + * + * @author Lion Li + * @date 2025-10-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("xzd_jsqd_tz") +public class XzdJsqdTz extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 关联主id + */ + private Long mainId; + + /** + * 1承包合同竣工决算2决算调整 + */ + private String type; + + /** + * 编码 + */ + private String bm; + + /** + * 合同清单名称 + */ + private String htqdmc; + + /** + * 计量单位 + */ + private String jldw; + + /** + * 原决算数量 + */ + private Long yjssl; + + /** + * 调整后决算数量 + */ + private Long tzhjssl; + + /** + * 原决算含税单价 + */ + private BigDecimal yjshsdj; + + /** + * 调整后决算含税单价 + */ + private BigDecimal tzhjsjsdj; + + /** + * 原决算含税合计 + */ + private BigDecimal yjshshj; + + /** + * 调整后决算价税合计 + */ + private BigDecimal tzhjsjshj; + + /** + * 原决算单价 + */ + private BigDecimal yjsdj; + + /** + * 调整后决算单价 + */ + private BigDecimal tzhjsdj; + + /** + * 原决算金额 + */ + private BigDecimal yjsje; + + /** + * 调整后决算金额 + */ + private BigDecimal tzhjsje; + + /** + * 原税率 + */ + private BigDecimal ysl; + + /** + * 调整后税率 + */ + private BigDecimal tzhsl; + + /** + * 原决算税额 + */ + private BigDecimal tzhse; + + /** + * 调整后决算税额 + */ + private BigDecimal tzhjsse; + + /** + * 原wbs + */ + private String ywbs; + + /** + * wbs + */ + private String wbs; + + /** + * 备注 + */ + private String remark; + + /** + * 数据来源 + */ + private String sjly; + + /** + * 送审造价 + */ + private BigDecimal sszj; + + /** + * 审定造价 + */ + private BigDecimal sdzj; + + /** + * 决算审减 + */ + private BigDecimal jssj; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java new file mode 100644 index 00000000..ec376e1f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java @@ -0,0 +1,158 @@ +package org.dromara.xzd.domain.bo; + +import org.dromara.xzd.domain.XzdJsqdTz; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 决算清单(调整)业务对象 xzd_jsqd_tz + * + * @author Lion Li + * @date 2025-10-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = XzdJsqdTz.class, reverseConvertGenerate = false) +public class XzdJsqdTzBo extends BaseEntity { + + /** + * id + */ + private Long id; + + /** + * 关联主id + */ + private Long mainId; + + /** + * 1承包合同竣工决算2决算调整 + */ + private String type; + + /** + * 编码 + */ + private String bm; + + /** + * 合同清单名称 + */ + private String htqdmc; + + /** + * 计量单位 + */ + private String jldw; + + /** + * 原决算数量 + */ + private Long yjssl; + + /** + * 调整后决算数量 + */ + private Long tzhjssl; + + /** + * 原决算含税单价 + */ + private BigDecimal yjshsdj; + + /** + * 调整后决算含税单价 + */ + private BigDecimal tzhjsjsdj; + + /** + * 原决算含税合计 + */ + private BigDecimal yjshshj; + + /** + * 调整后决算价税合计 + */ + private BigDecimal tzhjsjshj; + + /** + * 原决算单价 + */ + private BigDecimal yjsdj; + + /** + * 调整后决算单价 + */ + private BigDecimal tzhjsdj; + + /** + * 原决算金额 + */ + private BigDecimal yjsje; + + /** + * 调整后决算金额 + */ + private BigDecimal tzhjsje; + + /** + * 原税率 + */ + private BigDecimal ysl; + + /** + * 调整后税率 + */ + private BigDecimal tzhsl; + + /** + * 原决算税额 + */ + private BigDecimal tzhse; + + /** + * 调整后决算税额 + */ + private BigDecimal tzhjsse; + + /** + * 原wbs + */ + private String ywbs; + + /** + * wbs + */ + private String wbs; + + /** + * 备注 + */ + private String remark; + + /** + * 数据来源 + */ + private String sjly; + + /** + * 送审造价 + */ + private BigDecimal sszj; + + /** + * 审定造价 + */ + private BigDecimal sdzj; + + /** + * 决算审减 + */ + private BigDecimal jssj; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java new file mode 100644 index 00000000..227156b2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java @@ -0,0 +1,191 @@ +package org.dromara.xzd.domain.vo; + +import java.math.BigDecimal; +import org.dromara.xzd.domain.XzdJsqdTz; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 决算清单(调整)视图对象 xzd_jsqd_tz + * + * @author Lion Li + * @date 2025-10-20 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = XzdJsqdTz.class) +public class XzdJsqdTzVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 关联主id + */ + @ExcelProperty(value = "关联主id") + private Long mainId; + + /** + * 1承包合同竣工决算2决算调整 + */ + @ExcelProperty(value = "1承包合同竣工决算2决算调整") + private String type; + + /** + * 编码 + */ + @ExcelProperty(value = "编码") + private String bm; + + /** + * 合同清单名称 + */ + @ExcelProperty(value = "合同清单名称") + private String htqdmc; + + /** + * 计量单位 + */ + @ExcelProperty(value = "计量单位") + private String jldw; + + /** + * 原决算数量 + */ + @ExcelProperty(value = "原决算数量") + private Long yjssl; + + /** + * 调整后决算数量 + */ + @ExcelProperty(value = "调整后决算数量") + private Long tzhjssl; + + /** + * 原决算含税单价 + */ + @ExcelProperty(value = "原决算含税单价") + private BigDecimal yjshsdj; + + /** + * 调整后决算含税单价 + */ + @ExcelProperty(value = "调整后决算含税单价") + private BigDecimal tzhjsjsdj; + + /** + * 原决算含税合计 + */ + @ExcelProperty(value = "原决算含税合计") + private BigDecimal yjshshj; + + /** + * 调整后决算价税合计 + */ + @ExcelProperty(value = "调整后决算价税合计") + private BigDecimal tzhjsjshj; + + /** + * 原决算单价 + */ + @ExcelProperty(value = "原决算单价") + private BigDecimal yjsdj; + + /** + * 调整后决算单价 + */ + @ExcelProperty(value = "调整后决算单价") + private BigDecimal tzhjsdj; + + /** + * 原决算金额 + */ + @ExcelProperty(value = "原决算金额") + private BigDecimal yjsje; + + /** + * 调整后决算金额 + */ + @ExcelProperty(value = "调整后决算金额") + private BigDecimal tzhjsje; + + /** + * 原税率 + */ + @ExcelProperty(value = "原税率") + private BigDecimal ysl; + + /** + * 调整后税率 + */ + @ExcelProperty(value = "调整后税率") + private BigDecimal tzhsl; + + /** + * 原决算税额 + */ + @ExcelProperty(value = "原决算税额") + private BigDecimal tzhse; + + /** + * 调整后决算税额 + */ + @ExcelProperty(value = "调整后决算税额") + private BigDecimal tzhjsse; + + /** + * 原wbs + */ + @ExcelProperty(value = "原wbs") + private String ywbs; + + /** + * wbs + */ + @ExcelProperty(value = "wbs") + private String wbs; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 数据来源 + */ + @ExcelProperty(value = "数据来源") + private String sjly; + + /** + * 送审造价 + */ + @ExcelProperty(value = "送审造价") + private BigDecimal sszj; + + /** + * 审定造价 + */ + @ExcelProperty(value = "审定造价") + private BigDecimal sdzj; + + /** + * 决算审减 + */ + @ExcelProperty(value = "决算审减") + private BigDecimal jssj; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdJsqdTzMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdJsqdTzMapper.java new file mode 100644 index 00000000..63f3564c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdJsqdTzMapper.java @@ -0,0 +1,15 @@ +package org.dromara.xzd.mapper; + +import org.dromara.xzd.domain.XzdJsqdTz; +import org.dromara.xzd.domain.vo.XzdJsqdTzVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 决算清单(调整)Mapper接口 + * + * @author Lion Li + * @date 2025-10-20 + */ +public interface XzdJsqdTzMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdJsqdTzService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdJsqdTzService.java new file mode 100644 index 00000000..3a7b3d7e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdJsqdTzService.java @@ -0,0 +1,70 @@ +package org.dromara.xzd.service; + +import org.dromara.xzd.domain.vo.XzdJsqdTzVo; +import org.dromara.xzd.domain.bo.XzdJsqdTzBo; +import org.dromara.xzd.domain.XzdJsqdTz; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 决算清单(调整)Service接口 + * + * @author Lion Li + * @date 2025-10-20 + */ +public interface IXzdJsqdTzService extends IService{ + + /** + * 查询决算清单(调整) + * + * @param id 主键 + * @return 决算清单(调整) + */ + XzdJsqdTzVo queryById(Long id); + + /** + * 分页查询决算清单(调整)列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 决算清单(调整)分页列表 + */ + TableDataInfo queryPageList(XzdJsqdTzBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的决算清单(调整)列表 + * + * @param bo 查询条件 + * @return 决算清单(调整)列表 + */ + List queryList(XzdJsqdTzBo bo); + + /** + * 新增决算清单(调整) + * + * @param bo 决算清单(调整) + * @return 是否新增成功 + */ + Boolean insertByBo(XzdJsqdTzBo bo); + + /** + * 修改决算清单(调整) + * + * @param bo 决算清单(调整) + * @return 是否修改成功 + */ + Boolean updateByBo(XzdJsqdTzBo bo); + + /** + * 校验并批量删除决算清单(调整)信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdJsqdTzServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdJsqdTzServiceImpl.java new file mode 100644 index 00000000..cbbddcdf --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdJsqdTzServiceImpl.java @@ -0,0 +1,155 @@ +package org.dromara.xzd.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.xzd.domain.bo.XzdJsqdTzBo; +import org.dromara.xzd.domain.vo.XzdJsqdTzVo; +import org.dromara.xzd.domain.XzdJsqdTz; +import org.dromara.xzd.mapper.XzdJsqdTzMapper; +import org.dromara.xzd.service.IXzdJsqdTzService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 决算清单(调整)Service业务层处理 + * + * @author Lion Li + * @date 2025-10-20 + */ +@RequiredArgsConstructor +@Service +public class XzdJsqdTzServiceImpl extends ServiceImpl implements IXzdJsqdTzService { + + private final XzdJsqdTzMapper baseMapper; + + /** + * 查询决算清单(调整) + * + * @param id 主键 + * @return 决算清单(调整) + */ + @Override + public XzdJsqdTzVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询决算清单(调整)列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 决算清单(调整)分页列表 + */ + @Override + public TableDataInfo queryPageList(XzdJsqdTzBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的决算清单(调整)列表 + * + * @param bo 查询条件 + * @return 决算清单(调整)列表 + */ + @Override + public List queryList(XzdJsqdTzBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(XzdJsqdTzBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(XzdJsqdTz::getId); + lqw.eq(bo.getMainId() != null, XzdJsqdTz::getMainId, bo.getMainId()); + lqw.eq(StringUtils.isNotBlank(bo.getType()), XzdJsqdTz::getType, bo.getType()); + lqw.eq(StringUtils.isNotBlank(bo.getBm()), XzdJsqdTz::getBm, bo.getBm()); + lqw.eq(StringUtils.isNotBlank(bo.getHtqdmc()), XzdJsqdTz::getHtqdmc, bo.getHtqdmc()); + lqw.eq(StringUtils.isNotBlank(bo.getJldw()), XzdJsqdTz::getJldw, bo.getJldw()); + lqw.eq(bo.getYjssl() != null, XzdJsqdTz::getYjssl, bo.getYjssl()); + lqw.eq(bo.getTzhjssl() != null, XzdJsqdTz::getTzhjssl, bo.getTzhjssl()); + lqw.eq(bo.getYjshsdj() != null, XzdJsqdTz::getYjshsdj, bo.getYjshsdj()); + lqw.eq(bo.getTzhjsjsdj() != null, XzdJsqdTz::getTzhjsjsdj, bo.getTzhjsjsdj()); + lqw.eq(bo.getYjshshj() != null, XzdJsqdTz::getYjshshj, bo.getYjshshj()); + lqw.eq(bo.getTzhjsjshj() != null, XzdJsqdTz::getTzhjsjshj, bo.getTzhjsjshj()); + lqw.eq(bo.getYjsdj() != null, XzdJsqdTz::getYjsdj, bo.getYjsdj()); + lqw.eq(bo.getTzhjsdj() != null, XzdJsqdTz::getTzhjsdj, bo.getTzhjsdj()); + lqw.eq(bo.getYjsje() != null, XzdJsqdTz::getYjsje, bo.getYjsje()); + lqw.eq(bo.getTzhjsje() != null, XzdJsqdTz::getTzhjsje, bo.getTzhjsje()); + lqw.eq(bo.getYsl() != null, XzdJsqdTz::getYsl, bo.getYsl()); + lqw.eq(bo.getTzhsl() != null, XzdJsqdTz::getTzhsl, bo.getTzhsl()); + lqw.eq(bo.getTzhse() != null, XzdJsqdTz::getTzhse, bo.getTzhse()); + lqw.eq(bo.getTzhjsse() != null, XzdJsqdTz::getTzhjsse, bo.getTzhjsse()); + lqw.eq(StringUtils.isNotBlank(bo.getYwbs()), XzdJsqdTz::getYwbs, bo.getYwbs()); + lqw.eq(StringUtils.isNotBlank(bo.getWbs()), XzdJsqdTz::getWbs, bo.getWbs()); + lqw.eq(StringUtils.isNotBlank(bo.getSjly()), XzdJsqdTz::getSjly, bo.getSjly()); + lqw.eq(bo.getSszj() != null, XzdJsqdTz::getSszj, bo.getSszj()); + lqw.eq(bo.getSdzj() != null, XzdJsqdTz::getSdzj, bo.getSdzj()); + lqw.eq(bo.getJssj() != null, XzdJsqdTz::getJssj, bo.getJssj()); + return lqw; + } + + /** + * 新增决算清单(调整) + * + * @param bo 决算清单(调整) + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(XzdJsqdTzBo bo) { + XzdJsqdTz add = MapstructUtils.convert(bo, XzdJsqdTz.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改决算清单(调整) + * + * @param bo 决算清单(调整) + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(XzdJsqdTzBo bo) { + XzdJsqdTz update = MapstructUtils.convert(bo, XzdJsqdTz.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(XzdJsqdTz entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除决算清单(调整)信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}