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

Compare commits

base: lcj:584304e7441bac5b2d1cfc1e908ed6571f92ac4b
Branches Tags
lcj:dev lcj:prod
...
compare: lcj:56fc4ff83ee2bddc3f75ad660615608b0eece773
Branches Tags
lcj:dev lcj:prod

3 Commits
584304e744 ... 56fc4ff83e

Author SHA1 Message Date
屈展航
56fc4ff83e 10-24-修复 2025-10-24 22:16:26 +08:00
屈展航
524ed30728 Merge remote-tracking branch 'origin/dev' into dev 2025-10-24 22:16:13 +08:00
屈展航
40e57b18cb 10-24-修复 2025-10-24 20:05:45 +08:00
18 changed files with 181 additions and 146 deletions
Expand all files Collapse all files

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

@ -1,16 +1,15 @@
package org.dromara.xzd.domain;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.io.Serial;
import java.util.Date;
/**
* 承包合同进度结算对象 xzd_contract_progress_settlement
@ -92,7 +91,7 @@ public class XzdContractProgressSettlement extends BaseEntity {
/**
* 统计周期
*/
private Long contractProgressId;
private String contractProgressId;
/**
* 计量开始日期

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

@ -32,6 +32,11 @@ public class XzdContractTermination extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码
*/

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

@ -1,16 +1,16 @@
package org.dromara.xzd.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdBusinessChange;
import org.dromara.xzd.domain.XzdContractProgressSettlement;
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.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdBusinessChange;
import org.dromara.xzd.domain.XzdContractProgressSettlement;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
@ -105,7 +105,7 @@ public class XzdContractProgressSettlementBo extends BaseEntity {
/**
* 统计周期
*/
private Long contractProgressId;
private String contractProgressId;
/**
* 计量开始日期

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

@ -31,6 +31,11 @@ public class XzdContractTerminationBo extends BaseEntity {
*/
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码
*/

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

@ -1,15 +1,12 @@
package org.dromara.xzd.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdBusinessChange;
import org.dromara.xzd.domain.XzdContractProgressSettlement;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.xzd.domain.XzdBusinessChange;
import org.dromara.xzd.domain.XzdContractProgressSettlement;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
@ -17,6 +14,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -127,7 +126,7 @@ public class XzdContractProgressSettlementVo implements Serializable {
* 统计周期
*/
@ExcelProperty(value = "统计周期")
private Long contractProgressId;
private String contractProgressId;
/**
* 统计周期名称

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

@ -36,6 +36,11 @@ public class XzdContractTerminationVo implements Serializable {
@ExcelProperty(value = "")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码
*/

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

@ -151,6 +151,7 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
lqw.eq(bo.getContractCumulativeChangeAmount() != null, XzdContractChange::getContractCumulativeChangeAmount, bo.getContractCumulativeChangeAmount());
lqw.eq(StringUtils.isNotBlank(bo.getFileId()), XzdContractChange::getFileId, bo.getFileId());
lqw.eq(bo.getDanjuId() != null, XzdContractChange::getDanjuId, bo.getDanjuId());
lqw.eq(bo.getDeptId() != null, XzdContractChange::getDeptId, bo.getDeptId());
return lqw;
}

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

@ -167,6 +167,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
lqw.eq(bo.getCumulativeSettlementAmount() != null, XzdContractDetails::getCumulativeSettlementAmount, bo.getCumulativeSettlementAmount());
lqw.eq(bo.getDanjuId() != null, XzdContractDetails::getDanjuId, bo.getDanjuId());
lqw.eq(StringUtils.isNotBlank(bo.getFileId()), XzdContractDetails::getFileId, bo.getFileId());
lqw.eq(bo.getDeptId() != null, XzdContractDetails::getDeptId, bo.getDeptId());
return lqw;
}

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

@ -1,27 +1,28 @@
package org.dromara.xzd.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.system.domain.vo.SysDeptVo;
import org.dromara.system.service.impl.SysDeptServiceImpl;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.XzdBusinessChange;
import org.dromara.xzd.domain.XzdDeductionItems;
import org.dromara.xzd.domain.XzdSettlementRules;
import org.dromara.xzd.domain.XzdContractProgressSettlement;
import org.dromara.xzd.domain.bo.XzdContractProgressSettlementBo;
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
import org.dromara.xzd.domain.vo.*;
import org.dromara.xzd.mapper.XzdContractProgressSettlementMapper;
import org.dromara.xzd.service.IXzdContractProgressSettlementService;
import org.dromara.xzd.service.IXzdCorrespondentList;
import org.dromara.xzd.service.IXzdSolutionSelectionService;
import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
import org.dromara.xzd.settlement.domain.XzdContractInventory;
import org.dromara.xzd.settlement.domain.XzdJsDeductionItems;
@ -30,17 +31,12 @@ import org.dromara.xzd.settlement.service.impl.XzdContractInventoryServiceImpl;
import org.dromara.xzd.settlement.service.impl.XzdJsDeductionItemsServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.xzd.domain.bo.XzdContractProgressSettlementBo;
import org.dromara.xzd.domain.XzdContractProgressSettlement;
import org.dromara.xzd.mapper.XzdContractProgressSettlementMapper;
import org.dromara.xzd.service.IXzdContractProgressSettlementService;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 承包合同进度结算Service业务层处理
@ -457,14 +453,16 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl<XzdCon
XzdContractDetailsVo contractVo = xzdContractDetailsService.queryById(vo.getContractId());
if (contractVo != null){
//装填信息
List<XzdContractDetailsVo> contractVo1 = List.of(contractVo);
xzdContractDetailsService.setValue(contractVo1);
contractVo = contractVo1.getFirst();
// List<XzdContractDetailsVo> contractVo1 = List.of(contractVo);
// xzdContractDetailsService.setValue(contractVo1);
// contractVo = contractVo1.getFirst();
vo.setContractName(contractVo.getContractName());
//合同编码
vo.setContractCode(contractVo.getContractCode());
//项目名称
vo.setProjectName(contractVo.getProjectName());
//项目id
vo.setProjectId(contractVo.getProject());
//合同金额
vo.setContractAmount(contractVo.getContractAmount());
//单据日期
@ -472,12 +470,12 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl<XzdCon
}
}
//统计周期名称
if (vo.getContractProgressId() != null){
XzdContractProgressSettlementDateVo settlementDateVo = xzdContractProgressSettlementDateService.queryById(vo.getContractProgressId());
if (settlementDateVo != null){
vo.setContractProgressName(settlementDateVo.getName());
}
}
// if (vo.getContractProgressId() != null){
// XzdContractProgressSettlementDateVo settlementDateVo = xzdContractProgressSettlementDateService.queryById(vo.getContractProgressId());
// if (settlementDateVo != null){
// vo.setContractProgressName(settlementDateVo.getName());
// }
// }
//结算单位名称(客户)
if (vo.getSettlementUnit() != null) {
R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getSettlementUnit());

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

@ -94,6 +94,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
lqw.eq(StringUtils.isNotBlank(bo.getProjectCategory()), XzdContractTermination::getProjectCategory, bo.getProjectCategory());
lqw.eq(StringUtils.isNotBlank(bo.getFileId()), XzdContractTermination::getFileId, bo.getFileId());
lqw.eq(bo.getDanjuId() != null, XzdContractTermination::getDanjuId, bo.getDanjuId());
lqw.eq(bo.getDeptId() != null, XzdContractTermination::getDeptId, bo.getDeptId());
return lqw;
}

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

@ -30,7 +30,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
/**
* 供应商信息Service业务层处理
@ -349,41 +348,12 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
if (old.getQualifications() != null && !old.getQualifications().isEmpty()){
xzdSupplierQualificationService.removeByIds(old.getQualifications());
}
List<Long> nowFile = new ArrayList<>();
List<Long> oldFile = new ArrayList<>();
for (XzdSupplierQualification businessChange : bo.getQualifications()) {
businessChange.setSupplierId(update.getId());
for (String s : businessChange.getFileId().split(",")) {
nowFile.add(Long.valueOf(s));
}
}
for (XzdSupplierQualification qualification : old.getQualifications()) {
if (qualification.getFileId() != null){
String[] split = qualification.getFileId().split(",");
List<Long> fileIdList = Arrays.stream(split)
.map(Long::valueOf)
.toList();
oldFile.addAll(fileIdList);
}
}
for (Long l : oldFile) {
if (!nowFile.contains(l)) {
sysOssService.deleteWithValidByIds(List.of(l), false);
}
for (XzdSupplierQualification qualification : bo.getQualifications()) {
qualification.setSupplierId(update.getId());
}
xzdSupplierQualificationService.saveBatch(bo.getQualifications());
}else {
if (old.getQualifications() != null && !old.getQualifications().isEmpty()){
//删除绑定的文件
for (XzdSupplierQualification qualification : old.getQualifications()) {
if (qualification.getFileId() != null){
String[] split = qualification.getFileId().split(",");
List<Long> fileIdList = Arrays.stream(split)
.map(Long::valueOf)
.collect(Collectors.toList());
sysOssService.deleteWithValidByIds(fileIdList, false);
}
}
xzdSupplierQualificationService.removeByIds(old.getQualifications());
}
}
@ -397,29 +367,50 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
//处理地址信息
if (bo.getAddresses() != null && !bo.getAddresses().isEmpty()){
if (old.getAddresses() != null && !old.getAddresses().isEmpty()){
xzdAddressInfoService.removeByIds(old.getAddresses());
}
for (XzdAddressInfo address : bo.getAddresses()) {
address.setType("2");
address.setCustomerinformationId(update.getId());
}
xzdAddressInfoService.saveOrUpdateBatch(bo.getAddresses());
xzdAddressInfoService.saveBatch(bo.getAddresses());
}else {
if (old.getAddresses() != null && !old.getAddresses().isEmpty()){
xzdAddressInfoService.removeByIds(old.getAddresses());
}
}
//处理联系人信息
if (bo.getContacts() != null && !bo.getContacts().isEmpty()){
if (old.getContacts() != null && !old.getContacts().isEmpty()){
xzdContactService.removeByIds(old.getContacts());
}
for (XzdContact contact : bo.getContacts()) {
contact.setType("2");
contact.setCustomerinformationId(update.getId());
}
xzdContactService.saveOrUpdateBatch(bo.getContacts());
xzdContactService.saveBatch(bo.getContacts());
}else {
if (old.getContacts() != null && !old.getContacts().isEmpty()){
xzdContactService.removeByIds(old.getContacts());
}
}
//处理证照信息
if (bo.getCertificates() != null && !bo.getCertificates().isEmpty()){
if (old.getCertificates() != null && !old.getCertificates().isEmpty()){
xzdCertificateInfoService.removeByIds(old.getCertificates());
}
for (XzdCertificateInfo certificate : bo.getCertificates()) {
certificate.setType("2");
certificate.setCustomerinformationId(update.getId());
}
xzdCertificateInfoService.saveOrUpdateBatch(bo.getCertificates());
xzdCertificateInfoService.saveBatch(bo.getCertificates());
}else {
if (old.getCertificates() != null && !old.getCertificates().isEmpty()){
xzdCertificateInfoService.removeByIds(old.getCertificates());
}
}
//处理结算信息
@ -459,52 +450,81 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
//处理供应商类型
if (bo.getCustomerTypes() != null && !bo.getCustomerTypes().isEmpty()){
//删除原来的再新增
LambdaQueryWrapper<XzdCustomertypeInfo> xzdCustomertypeInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
xzdCustomertypeInfoLambdaQueryWrapper.eq(XzdCustomertypeInfo::getType,"2");
xzdCustomertypeInfoLambdaQueryWrapper.eq(XzdCustomertypeInfo::getCustomerinformationId, update.getId());
xzdCustomertypeInfoService.remove(xzdCustomertypeInfoLambdaQueryWrapper);
if (old.getCustomerTypes() != null && !old.getCustomerTypes().isEmpty()){
xzdCustomertypeInfoService.removeByIds(old.getCustomerTypes());
}
for (XzdCustomertypeInfo customerType : bo.getCustomerTypes()) {
customerType.setType("2");
customerType.setCustomerinformationId(update.getId());
}
xzdCustomertypeInfoService.saveBatch(bo.getCustomerTypes());
}else {
if (old.getCustomerTypes() != null && !old.getCustomerTypes().isEmpty()){
xzdCustomertypeInfoService.removeByIds(old.getCustomerTypes());
}
}
//处理供应物料
if (bo.getMaterials() != null && !bo.getMaterials().isEmpty()){
for (XzdSupplyMaterials material : bo.getMaterials()) {
material.setSupplierId(update.getId());
if (old.getMaterials() != null && !old.getMaterials().isEmpty()){
xzdSupplyMaterialsService.removeByIds(old.getMaterials());
}
for (XzdSupplyMaterials customerType : bo.getMaterials()) {
customerType.setSupplierId(update.getId());
}
xzdSupplyMaterialsService.saveBatch(bo.getMaterials());
}else {
if (old.getMaterials() != null && !old.getMaterials().isEmpty()){
xzdSupplyMaterialsService.removeByIds(old.getMaterials());
}
xzdSupplyMaterialsService.saveOrUpdateBatch(bo.getMaterials());
}
//供应商评价
if (bo.getEvaluations() != null && !bo.getEvaluations().isEmpty()){
for (XzdSupplierEvaluation evaluation : bo.getEvaluations()) {
evaluation.setSupplierId(update.getId());
if (old.getEvaluations() != null && !old.getEvaluations().isEmpty()){
xzdSupplierEvaluationService.removeByIds(old.getEvaluations());
}
for (XzdSupplierEvaluation customerType : bo.getEvaluations()) {
customerType.setSupplierId(update.getId());
}
xzdSupplierEvaluationService.saveBatch(bo.getEvaluations());
}else {
if (old.getEvaluations() != null && !old.getEvaluations().isEmpty()){
xzdSupplierEvaluationService.removeByIds(old.getEvaluations());
}
xzdSupplierEvaluationService.saveOrUpdateBatch(bo.getEvaluations());
}
//项目信息
if (bo.getProjects() != null && !bo.getProjects().isEmpty()){
if (old.getProjects() != null && !old.getProjects().isEmpty()){
xzdProjectInfoService.removeByIds(old.getProjects());
}
for (XzdProjectInfo project : bo.getProjects()) {
project.setCustomerinformationId(update.getId());
project.setType("2");
}
xzdProjectInfoService.saveOrUpdateBatch(bo.getProjects());
xzdProjectInfoService.saveBatch(bo.getProjects());
}else {
if (old.getProjects() != null && !old.getProjects().isEmpty()){
xzdProjectInfoService.removeByIds(old.getProjects());
}
}
//合同信息
if (bo.getContracts() != null && !bo.getContracts().isEmpty()){
if (old.getContracts() != null && !old.getContracts().isEmpty()){
xzdContractInfoService.removeByIds(old.getContracts());
}
for (XzdContractInfo contract : bo.getContracts()) {
contract.setType("2");
contract.setCustomerinformationId(update.getId());
}
xzdContractInfoService.saveOrUpdateBatch(bo.getContracts());
xzdContractInfoService.saveBatch(bo.getContracts());
}else {
if (old.getContracts() != null && !old.getContracts().isEmpty()){
xzdContractInfoService.removeByIds(old.getContracts());
}
}
return b;

3
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"));
@ -314,7 +315,7 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl<XzdW
// xzdContractAccountService.setValue(accountVo);
// xzdContractAccountVo = accountVo.getFirst();
//竣工决算
vo.setContractAccount(xzdContractAccountVo);
// vo.setContractAccount(xzdContractAccountVo);
//决算标题
vo.setFinalAccountTitle(xzdContractAccountVo.getTitle());
//从竣工获取合同

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;
}

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/domain/vo/XzdSpykpSjsqdVo.java
View File

@ -1,22 +1,17 @@
package org.dromara.xzd.spykp.sjsqd.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.xzd.domain.vo.XzdProjectVo;
import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.xzd.spykp.sjsqd.domain.XzdSpykpSjsqd;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -131,6 +126,11 @@ public class XzdSpykpSjsqdVo implements Serializable {
@ExcelProperty(value = "合同编号")
private String htbh;
/**
* 合同金额
*/
private BigDecimal htje;
/**
* 付款单位id(客户)
*/

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java
View File

@ -250,6 +250,8 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
vo.setHtmc(xzdContractDetailsVo.getContractName());
//合同编号
vo.setHtbh(xzdContractDetailsVo.getContractCode());
//合同金额
vo.setHtje(xzdContractDetailsVo.getContractAmount());
}
}
//付款单位名称