lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10-24-修复

Browse Source
This commit is contained in:
青云
2025-10-24 22:16:26 +08:00
parent 524ed30728
commit 56fc4ff83e
5 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java
View File

@ -101,6 +101,7 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
LambdaQueryWrapper<XzdWorkcontractCompletionAdjust> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(XzdWorkcontractCompletionAdjust::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), XzdWorkcontractCompletionAdjust::getDocumentNumber, bo.getDocumentNumber());
lqw.eq(bo.getDeptId() != null, XzdWorkcontractCompletionAdjust::getDeptId, bo.getDeptId());
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdWorkcontractCompletionAdjust::getTitle, bo.getTitle());
lqw.between(params.get("beginDocumentDate") != null && params.get("endDocumentDate") != null,
XzdWorkcontractCompletionAdjust::getDocumentDate ,params.get("beginDocumentDate"), params.get("endDocumentDate"));

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java
View File

@ -1,14 +1,13 @@
package org.dromara.xzd.settlement.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 变更增加清单对象 xzd_alteration_inventory
@ -170,7 +169,9 @@ public class XzdAlterationInventory extends BaseEntity {
*/
private String auditStatus;
/**
* 本期结算百分比
*/
private BigDecimal bqjsbfb;
}

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java
View File

@ -1,16 +1,14 @@
package org.dromara.xzd.settlement.domain.bo;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 变更增加清单业务对象 xzd_alteration_inventory
@ -169,7 +167,9 @@ public class XzdAlterationInventoryBo extends BaseEntity {
*/
private String auditStatus;
/**
* 本期结算百分比
*/
private BigDecimal bqjsbfb;
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java
View File

@ -1,19 +1,14 @@
package org.dromara.xzd.settlement.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
@ -203,7 +198,9 @@ public class XzdAlterationInventoryVo implements Serializable {
@ExcelProperty(value = "审核状态")
private String auditStatus;
/**
* 本期结算百分比
*/
private BigDecimal bqjsbfb;
}

20
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java
View File

@ -1,16 +1,15 @@
package org.dromara.xzd.skyfk.cbhtsc.service.impl;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
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.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.ctr.domain.vo.ContractPaymentClauseVo;
import org.dromara.ctr.service.impl.ContractPaymentClauseServiceImpl;
@ -30,19 +29,19 @@ import org.dromara.xzd.service.impl.XzdContractDetailsServiceImpl;
import org.dromara.xzd.service.impl.XzdContractSkxxServiceImpl;
import org.dromara.xzd.service.impl.XzdProjectServiceImpl;
import org.dromara.xzd.service.impl.XzdSupplierOpenBankServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment;
import org.dromara.xzd.skyfk.cbhtsc.domain.bo.XzdContractPaymentBo;
import org.dromara.xzd.skyfk.cbhtsc.domain.vo.XzdContractPaymentVo;
import org.dromara.xzd.skyfk.cbhtsc.domain.XzdContractPayment;
import org.dromara.xzd.skyfk.cbhtsc.mapper.XzdContractPaymentMapper;
import org.dromara.xzd.skyfk.cbhtsc.service.IXzdContractPaymentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 承包合同收款Service业务层处理
@ -142,6 +141,7 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
lqw.eq(bo.getHthsje() != null, XzdContractPayment::getHthsje, bo.getHthsje());
lqw.eq(bo.getHtljsjskje() != null, XzdContractPayment::getHtljsjskje, bo.getHtljsjskje());
lqw.eq(bo.getLjjsje() != null, XzdContractPayment::getLjjsje, bo.getLjjsje());
lqw.eq(bo.getDeptId() != null, XzdContractPayment::getDeptId, bo.getDeptId());
return lqw;
}