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

bug修改

Browse Source
This commit is contained in:
lg
2025-10-22 15:08:30 +08:00
parent dbc09a62ea
commit 8d3853fe6b
19 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBqlxProjectInfo.java
View File

@ -5,6 +5,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -38,7 +40,7 @@ public class XzdBqlxProjectInfo extends BaseEntity {
/**
* 预计开工日期
*/
private Date expectedStartDate;
private LocalDate expectedStartDate;
/**
* 资质要求
@ -48,7 +50,7 @@ public class XzdBqlxProjectInfo extends BaseEntity {
/**
* 报名开始时间
*/
private Date bidStartDate;
private LocalDate bidStartDate;
/**
* 填报组织
@ -60,12 +62,12 @@ public class XzdBqlxProjectInfo extends BaseEntity {
/**
* 报名截止时间
*/
private Date bidEndDate;
private LocalDate bidEndDate;
/**
* 投标截止时间
*/
private Date submissionDeadline;
private LocalDate submissionDeadline;
/**
* 设计情况
@ -110,7 +112,7 @@ public class XzdBqlxProjectInfo extends BaseEntity {
/**
* 开标时间
*/
private Date startDate;
private LocalDate startDate;
/**
* 评标方式

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBidPreProjectBo.java
View File

@ -31,7 +31,6 @@ public class XzdBidPreProjectBo extends BaseEntity {
/**
* 项目编码
*/
@NotBlank(message = "项目编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String projectNumber;
/**

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/bo/XzdBqlxProjectInfoBo.java
View File

@ -10,6 +10,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@ -38,7 +39,7 @@ public class XzdBqlxProjectInfoBo extends BaseEntity {
/**
* 预计开工日期
*/
private LocalDateTime expectedStartDate;
private LocalDate expectedStartDate;
/**
* 资质要求
@ -48,18 +49,18 @@ public class XzdBqlxProjectInfoBo extends BaseEntity {
/**
* 报名开始时间
*/
private LocalDateTime bidStartDate;
private LocalDate bidStartDate;
/**
* 报名截止时间
*/
@NotNull(message = "报名截止时间不能为空", groups = { AddGroup.class, EditGroup.class })
private LocalDateTime bidEndDate;
private LocalDate bidEndDate;
/**
* 投标截止时间
*/
private LocalDateTime submissionDeadline;
private LocalDate submissionDeadline;
/**
* 设计情况
@ -111,7 +112,7 @@ public class XzdBqlxProjectInfoBo extends BaseEntity {
/**
* 开标时间
*/
private LocalDateTime startDate;
private LocalDate startDate;
/**
* 评标方式

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBqlxProjectInfoVo.java
View File

@ -1,5 +1,6 @@
package org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo;
import java.time.LocalDate;
import java.util.Date;
import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBqlxProjectInfo;
@ -44,7 +45,7 @@ public class XzdBqlxProjectInfoVo implements Serializable {
* 预计开工日期
*/
@ExcelProperty(value = "预计开工日期")
private Date expectedStartDate;
private LocalDate expectedStartDate;
/**
* 资质要求
@ -56,19 +57,19 @@ public class XzdBqlxProjectInfoVo implements Serializable {
* 报名开始时间
*/
@ExcelProperty(value = "报名开始时间")
private Date bidStartDate;
private LocalDate bidStartDate;
/**
* 报名截止时间
*/
@ExcelProperty(value = "报名截止时间")
private Date bidEndDate;
private LocalDate bidEndDate;
/**
* 投标截止时间
*/
@ExcelProperty(value = "投标截止时间")
private Date submissionDeadline;
private LocalDate submissionDeadline;
/**
@ -130,7 +131,7 @@ public class XzdBqlxProjectInfoVo implements Serializable {
* 开标时间
*/
@ExcelProperty(value = "开标时间")
private Date startDate;
private LocalDate startDate;
/**
* 评标方式

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

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@ -35,9 +36,9 @@ public class XzdProjectByVo {
private Long createBy;
private LocalDateTime startTime;
private LocalDate startTime;
private LocalDateTime endTime;
private LocalDate endTime;

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java
View File

@ -142,9 +142,11 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
item.setManagementOrganizationName(unitName);
}
//开票单位名称(供应商名称)
String unitName1 = xzdSupplierInfoService.queryNameById(item.getInvoicingUnit());
if (unitName1 != null){
item.setInvoicingUnitName(unitName1);
R<QuerCorrespondentDto> byidtemp = iXzdCorrespondentList.getCustomerByid((item.getInvoicingUnit()));
if (byidtemp!=null){
if (byidtemp.getData().getXzdCustomerinformation() != null){
item.setInvoicingUnitName(byidtemp.getData().getXzdCustomerinformation().getUnitName());
}
}
//收票单位名称(供应商名称)
String unitName2 = xzdSupplierInfoService.queryNameById(item.getTicketReceivingUnit());

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

@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -52,12 +54,12 @@ public class XzdCertificateInfo extends BaseEntity {
/**
* 生效日期
*/
private Date effectiveDate;
private LocalDate effectiveDate;
/**
* 截止日期
*/
private Date expirationDate;
private LocalDate expirationDate;
/**
* 停用标志（0：未停用，1：已停用）

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

@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -122,7 +124,7 @@ public class XzdCustomerinformation extends BaseEntity {
/**
* 工商变更时间
*/
private Date industrialCommercialChangeTime;
private LocalDate industrialCommercialChangeTime;
/**
* 备注
@ -162,7 +164,7 @@ public class XzdCustomerinformation extends BaseEntity {
/**
* 单位成立日期
*/
private Date establishmentDate;
private LocalDate establishmentDate;
/**
* 纳税身份类型
@ -207,7 +209,7 @@ public class XzdCustomerinformation extends BaseEntity {
/**
* 注册时间
*/
private Date registrationTime;
private LocalDate registrationTime;
/**
* 营业范围

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

@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -77,7 +79,7 @@ public class XzdProjectInfo extends BaseEntity {
/**
* 项目日期
*/
private Date projectDate;
private LocalDate projectDate;
/**
* 管理组织

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

@ -53,12 +53,12 @@ public class XzdCertificateInfoBo extends BaseEntity {
/**
* 生效日期
*/
private LocalDateTime effectiveDate;
private LocalDate effectiveDate;
/**
* 截止日期
*/
private LocalDateTime expirationDate;
private LocalDate expirationDate;
/**
* 停用标志（0：未停用，1：已停用）

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

@ -125,7 +125,7 @@ public class XzdCustomerinformationBo extends BaseEntity {
/**
* 工商变更时间
*/
private LocalDateTime industrialCommercialChangeTime;
private LocalDate industrialCommercialChangeTime;
/**
* 备注
@ -165,7 +165,7 @@ public class XzdCustomerinformationBo extends BaseEntity {
/**
* 单位成立日期
*/
private LocalDateTime establishmentDate;
private LocalDate establishmentDate;
/**
* 纳税身份类型
@ -210,7 +210,7 @@ public class XzdCustomerinformationBo extends BaseEntity {
/**
* 注册时间
*/
private LocalDateTime registrationTime;
private LocalDate registrationTime;
/**
* 营业范围

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

@ -78,7 +78,7 @@ public class XzdProjectInfoBo extends BaseEntity {
/**
* 项目日期
*/
private LocalDateTime projectDate;
private LocalDate projectDate;
/**
* 管理组织

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

@ -1,5 +1,6 @@
package org.dromara.xzd.domain.vo;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdCertificateInfo;
@ -64,13 +65,13 @@ public class XzdCertificateInfoVo implements Serializable {
* 生效日期
*/
@ExcelProperty(value = "生效日期")
private Date effectiveDate;
private LocalDate effectiveDate;
/**
* 截止日期
*/
@ExcelProperty(value = "截止日期")
private Date expirationDate;
private LocalDate expirationDate;
/**
* 停用标志（0：未停用，1：已停用）

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

@ -1,5 +1,6 @@
package org.dromara.xzd.domain.vo;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdCustomerinformation;
@ -149,7 +150,7 @@ public class XzdCustomerinformationVo implements Serializable {
* 工商变更时间
*/
@ExcelProperty(value = "工商变更时间")
private Date industrialCommercialChangeTime;
private LocalDate industrialCommercialChangeTime;
/**
* 备注
@ -202,7 +203,7 @@ public class XzdCustomerinformationVo implements Serializable {
* 单位成立日期
*/
@ExcelProperty(value = "单位成立日期")
private Date establishmentDate;
private LocalDate establishmentDate;
/**
* 纳税身份类型
@ -256,7 +257,7 @@ public class XzdCustomerinformationVo implements Serializable {
* 注册时间
*/
@ExcelProperty(value = "注册时间")
private Date registrationTime;
private LocalDate registrationTime;
/**
* 营业范围

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

@ -1,5 +1,6 @@
package org.dromara.xzd.domain.vo;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdProjectInfo;
@ -94,7 +95,7 @@ public class XzdProjectInfoVo implements Serializable {
* 项目日期
*/
@ExcelProperty(value = "项目日期")
private Date projectDate;
private LocalDate projectDate;
/**
* 管理组织

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/domain/vo/AppreciationInvoiceVo.java
View File

@ -13,6 +13,7 @@ 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.fapiaotaizhang.zengzhishui.domain.XzdXhqd;
import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.bo.XzdXhqdBo;
import java.io.Serial;
@ -295,7 +296,7 @@ public class AppreciationInvoiceVo implements Serializable {
/**
* 销货清单
*/
private List<XzdXhqdBo> xhqd;
private List<XzdXhqd> xhqd;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java
View File

@ -35,6 +35,7 @@ import org.dromara.xzd.fapiaotaizhang.zengzhishui.service.IAppreciationInvoiceSe
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* 增值税发票Service业务层处理
@ -98,7 +99,8 @@ public class AppreciationInvoiceServiceImpl extends ServiceImpl<AppreciationInvo
// xhqd
List<XzdXhqd> xzdXhqds = xzdXhqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdXhqd>().eq(XzdXhqd::getPrimaryMeterId, item.getId()));
if (xzdXhqds != null && xzdXhqds.size() > 0) {
item.setXhqd(MapstructUtils.convert(xzdXhqds, XzdXhqdBo.class));
item.setXhqd(xzdXhqds);
}
}

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

@ -47,8 +47,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
private final AreaUtil areaUtil;
// 客户信息service
// 客户信息service
private final IXzdCustomerinformationService xzdCustomerinformationService;
// 标签页客户信息service

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

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;