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

11-24-修复

Browse Source
This commit is contained in:
青云
2025-11-24 10:22:00 +08:00
parent d5f1c22bd4
commit 9bb41d903e
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java
View File

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
/** /**
@ -99,14 +100,14 @@ public class XzdDeductionItems extends BaseEntity {
private LocalDate changeReturnTime; private LocalDate changeReturnTime;
/** /**
* 申请扣除（0：否，1：是） * 申请扣除（0：否，1：是）(改为金额)
*/ */
private Long applyDeduction; private BigDecimal applyDeduction;
/** /**
* 变更申请扣除（0：否，1：是） * 变更申请扣除（0：否，1：是）(改为金额)
*/ */
private Long changeApplyDeduction; private BigDecimal changeApplyDeduction;
/** /**
* 备注 * 备注

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdDeductionItemsBo.java
View File

@ -10,6 +10,7 @@ import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdDeductionItems; import org.dromara.xzd.domain.XzdDeductionItems;
import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
/** /**
@ -98,12 +99,12 @@ public class XzdDeductionItemsBo extends BaseEntity {
/** /**
* 申请扣除（0：否，1：是） * 申请扣除（0：否，1：是）
*/ */
private Long applyDeduction; private BigDecimal applyDeduction;
/** /**
* 变更申请扣除（0：否，1：是） * 变更申请扣除（0：否，1：是）
*/ */
private Long changeApplyDeduction; private BigDecimal changeApplyDeduction;
/** /**
* 备注 * 备注

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdDeductionItemsVo.java
View File

@ -10,6 +10,7 @@ import org.dromara.xzd.domain.XzdDeductionItems;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
@ -116,14 +117,14 @@ public class XzdDeductionItemsVo implements Serializable {
*/ */
@ExcelProperty(value = "申请扣除", converter = ExcelDictConvert.class) @ExcelProperty(value = "申请扣除", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：否，1：是") @ExcelDictFormat(readConverterExp = "0=：否，1：是")
private Long applyDeduction; private BigDecimal applyDeduction;
/** /**
* 变更申请扣除（0：否，1：是） * 变更申请扣除（0：否，1：是）
*/ */
@ExcelProperty(value = "变更申请扣除", converter = ExcelDictConvert.class) @ExcelProperty(value = "变更申请扣除", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：否，1：是") @ExcelDictFormat(readConverterExp = "0=：否，1：是")
private Long changeApplyDeduction; private BigDecimal changeApplyDeduction;
/** /**
* 备注 * 备注

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

@ -25,7 +25,6 @@ import org.dromara.xzd.domain.*;
import org.dromara.xzd.domain.bo.XzdContractDetailsBo; import org.dromara.xzd.domain.bo.XzdContractDetailsBo;
import org.dromara.xzd.domain.vo.XzdContractChangeVo; import org.dromara.xzd.domain.vo.XzdContractChangeVo;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
import org.dromara.xzd.enums.XzdClassEnum; import org.dromara.xzd.enums.XzdClassEnum;
import org.dromara.xzd.mapper.XzdContractDetailsMapper; import org.dromara.xzd.mapper.XzdContractDetailsMapper;
import org.dromara.xzd.service.IXzdContractDetailsService; import org.dromara.xzd.service.IXzdContractDetailsService;
@ -510,13 +509,14 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
} }
info.setSealNameDetail(xzdBusinessInfos); info.setSealNameDetail(xzdBusinessInfos);
} }
//签约组织(供应商) //签约组织(供应商)
if (info.getSigningOrganization() != null) { // if (info.getSigningOrganization() != null) {
XzdSupplierInfoVo xzdSupplierInfoVo2 = xzdSupplierInfoService.queryById(info.getSigningOrganization()); // XzdSupplierInfoVo xzdSupplierInfoVo2 = xzdSupplierInfoService.queryById(info.getSigningOrganization());
if (xzdSupplierInfoVo2 != null) { // if (xzdSupplierInfoVo2 != null) {
info.setSigningOrganizationName(xzdSupplierInfoVo2.getUnitName()); // info.setSigningOrganizationName(xzdSupplierInfoVo2.getUnitName());
} // }
} // }
//合同文本-预收款项 //合同文本-预收款项
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();