bug修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/XzdBidPreProject.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -102,7 +103,7 @@ public class XzdBidPreProject extends BaseEntity {
     /**
      * 单据日期
      */
-    private LocalDateTime billDate;
+    private LocalDate billDate;
 
     /**
      * 联投单位

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -62,7 +63,7 @@ public class XzdBidPreProjectBo extends BaseEntity {
     /**
      * 单据日期
      */
-    private LocalDateTime billDate;
+    private LocalDate billDate;
 
     /**
      * 联投单位

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biaoqianlixiang/domain/vo/XzdBidPreProjectVo.java

@@ -12,6 +12,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 
@@ -134,7 +135,7 @@ public class XzdBidPreProjectVo implements Serializable {
     /**
      * 单据日期
      */
-    private LocalDateTime billDate;
+    private LocalDate billDate;
 
     /**
      * 联投单位

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/XzdBiddingFileEstimate.java

@@ -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;
 
@@ -37,7 +39,7 @@ public class XzdBiddingFileEstimate extends BaseEntity {
     /**
      * 单据日期
      */
-    private Date documentDate;
+    private LocalDate documentDate;
 
     /**
      * 项目名称
@@ -72,7 +74,7 @@ public class XzdBiddingFileEstimate extends BaseEntity {
     /**
      * 开标时间
      */
-    private Date startDate;
+    private LocalDate startDate;
 
     /**
      * 工程概况
@@ -82,7 +84,7 @@ public class XzdBiddingFileEstimate extends BaseEntity {
     /**
      * 投标时间
      */
-    private Date biddingDate;
+    private LocalDate biddingDate;
 
     /**
      * 投标地址

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/bo/XzdBiddingFileEstimateBo.java

@@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -29,18 +31,16 @@ public class XzdBiddingFileEstimateBo extends BaseEntity {
     /**
      * 单据编码
      */
-    @NotBlank(message = "单据编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String documentCode;
 
     /**
      * 单据日期
      */
-    private Date documentDate;
+    private LocalDate documentDate;
 
     /**
      * 项目名称
      */
-    @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String projectName;
 
     /**
@@ -71,7 +71,7 @@ public class XzdBiddingFileEstimateBo extends BaseEntity {
     /**
      * 开标时间
      */
-    private Date startDate;
+    private LocalDate startDate;
 
     /**
      * 工程概况
@@ -81,7 +81,7 @@ public class XzdBiddingFileEstimateBo extends BaseEntity {
     /**
      * 投标时间
      */
-    private Date biddingDate;
+    private LocalDate biddingDate;
 
     /**
      * 投标地址

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocument/domain/vo/XzdBiddingFileEstimateVo.java

@@ -1,5 +1,6 @@
 package org.dromara.xzd.biddingManagement.biddingDocument.domain.vo;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -48,7 +49,7 @@ public class XzdBiddingFileEstimateVo implements Serializable {
      * 单据日期
      */
     @ExcelProperty(value = "单据日期")
-    private Date documentDate;
+    private LocalDate documentDate;
 
     /**
      * 项目名称
@@ -92,7 +93,7 @@ public class XzdBiddingFileEstimateVo implements Serializable {
      * 开标时间
      */
     @ExcelProperty(value = "开标时间")
-    private Date startDate;
+    private LocalDate startDate;
 
     /**
      * 工程概况
@@ -104,7 +105,7 @@ public class XzdBiddingFileEstimateVo implements Serializable {
      * 投标时间
      */
     @ExcelProperty(value = "投标时间")
-    private Date biddingDate;
+    private LocalDate biddingDate;
 
     /**
      * 投标地址

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/XzdBiddingDocument.java

@@ -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;
 
@@ -42,7 +44,7 @@ public class XzdBiddingDocument extends BaseEntity {
     /**
      * 投标时间
      */
-    private Date biddingTime;
+    private LocalDate biddingTime;
 
     /**
      * 项目名称
@@ -62,7 +64,7 @@ public class XzdBiddingDocument extends BaseEntity {
     /**
      * 单据日期
      */
-    private Date documentDate;
+    private LocalDate documentDate;
 
     /**
      * 项目经理

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/XzdTbwjBusinessBidRequirements.java

@@ -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;
 
@@ -42,7 +44,7 @@ public class XzdTbwjBusinessBidRequirements extends BaseEntity {
     /**
      * 提供时间
      */
-    private Date provideTime;
+    private LocalDate provideTime;
 
     /**
      * 备注

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/XzdTbwjQualificationRequirements.java

@@ -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;
 
@@ -42,7 +44,7 @@ public class XzdTbwjQualificationRequirements extends BaseEntity {
     /**
      * 提供时间
      */
-    private Date provideTime;
+    private LocalDate provideTime;
 
     /**
      * 备注

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/XzdTbwjTechnicalBidRequirements.java

@@ -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;
 
@@ -42,7 +44,7 @@ public class XzdTbwjTechnicalBidRequirements extends BaseEntity {
     /**
      * 提供时间
      */
-    private Date provideTime;
+    private LocalDate provideTime;
 
     /**
      * 备注

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/bo/XzdBiddingDocumentBo.java

@@ -7,6 +7,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdBiddingDocument;
@@ -41,7 +43,7 @@ public class XzdBiddingDocumentBo extends BaseEntity {
      * 投标时间
      */
     @NotNull(message = "投标时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date biddingTime;
+    private LocalDate biddingTime;
 
     /**
      * 项目名称
@@ -63,7 +65,7 @@ public class XzdBiddingDocumentBo extends BaseEntity {
      * 单据日期
      */
     @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date documentDate;
+    private LocalDate documentDate;
 
     /**
      * 项目经理

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/bo/XzdTbwjBusinessBidRequirementsBo.java

@@ -7,6 +7,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdTbwjBusinessBidRequirements;
@@ -43,7 +45,7 @@ public class XzdTbwjBusinessBidRequirementsBo extends BaseEntity {
      * 提供时间
      */
     @NotNull(message = "提供时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date provideTime;
+    private LocalDate provideTime;
 
     /**
      * 备注

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/bo/XzdTbwjQualificationRequirementsBo.java

@@ -7,6 +7,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdTbwjQualificationRequirements;
@@ -43,7 +45,7 @@ public class XzdTbwjQualificationRequirementsBo extends BaseEntity {
      * 提供时间
      */
     @NotNull(message = "提供时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date provideTime;
+    private LocalDate provideTime;
 
     /**
      * 备注

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/bo/XzdTbwjTechnicalBidRequirementsBo.java

@@ -7,6 +7,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdTbwjTechnicalBidRequirements;
@@ -43,7 +45,7 @@ public class XzdTbwjTechnicalBidRequirementsBo extends BaseEntity {
      * 提供时间
      */
     @NotNull(message = "提供时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date provideTime;
+    private LocalDate provideTime;
 
     /**
      * 备注

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java

@@ -1,5 +1,6 @@
 package org.dromara.xzd.biddingManagement.biddingDocumentList.domain.vo;
 
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -59,7 +60,7 @@ public class XzdBiddingDocumentVo implements Serializable {
      * 投标时间
      */
     @ExcelProperty(value = "投标时间")
-    private Date biddingTime;
+    private LocalDate biddingTime;
 
     /**
      * 项目名称
@@ -83,7 +84,7 @@ public class XzdBiddingDocumentVo implements Serializable {
      * 单据日期
      */
     @ExcelProperty(value = "单据日期")
-    private Date documentDate;
+    private LocalDate documentDate;
 
     /**
      * 项目经理

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/domain/XzdBiddingAgencyFeePayment.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -39,7 +40,7 @@ public class XzdBiddingAgencyFeePayment extends BaseEntity {
     /**
      * 单据日期
      */
-    private LocalDateTime documentDate;
+    private LocalDate documentDate;
 
     /**
      * 标题
@@ -69,7 +70,7 @@ public class XzdBiddingAgencyFeePayment extends BaseEntity {
     /**
      * 投标时间
      */
-    private LocalDateTime biddingDate;
+    private LocalDate biddingDate;
 
     /**
      * 代理机构名称

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/domain/bo/XzdBiddingAgencyFeePaymentBo.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -36,7 +37,7 @@ public class XzdBiddingAgencyFeePaymentBo extends BaseEntity {
      * 单据日期
      */
     @NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
-    private LocalDateTime documentDate;
+    private LocalDate documentDate;
 
     /**
      * 标题
@@ -67,7 +68,7 @@ public class XzdBiddingAgencyFeePaymentBo extends BaseEntity {
     /**
      * 投标时间
      */
-    private LocalDateTime biddingDate;
+    private LocalDate biddingDate;
 
     /**
      * 代理机构名称

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/paymentapplication/domain/vo/XzdBiddingAgencyFeePaymentVo.java

@@ -1,5 +1,6 @@
 package org.dromara.xzd.biddingManagement.paymentapplication.domain.vo;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -48,7 +49,7 @@ public class XzdBiddingAgencyFeePaymentVo implements Serializable {
      * 单据日期
      */
     @ExcelProperty(value = "单据日期")
-    private Date documentDate;
+    private LocalDate documentDate;
 
     /**
      * 标题
@@ -84,7 +85,7 @@ public class XzdBiddingAgencyFeePaymentVo implements Serializable {
      * 投标时间
      */
     @ExcelProperty(value = "投标时间")
-    private Date biddingDate;
+    private LocalDate biddingDate;
 
     /**
      * 代理机构名称

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/XzdPostBidAnalysis.java

@@ -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;
 
@@ -67,7 +69,7 @@ public class XzdPostBidAnalysis extends BaseEntity {
     /**
      * 开标日期
      */
-    private Date bidOpeningDate;
+    private LocalDate bidOpeningDate;
 
     /**
      * 经营模式

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/bo/XzdPostBidAnalysisBo.java

@@ -7,6 +7,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -68,7 +70,7 @@ public class XzdPostBidAnalysisBo extends BaseEntity {
     /**
      * 开标日期
      */
-    private Date bidOpeningDate;
+    private LocalDate bidOpeningDate;
 
     /**
      * 经营模式

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/vo/XzdPostBidAnalysisVo.java

@@ -1,5 +1,6 @@
 package org.dromara.xzd.biddingManagement.postAnalysis.domain.vo;
 
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -83,7 +84,7 @@ public class XzdPostBidAnalysisVo implements Serializable {
      * 开标日期
      */
     @ExcelProperty(value = "开标日期")
-    private Date bidOpeningDate;
+    private LocalDate bidOpeningDate;
 
     /**
      * 经营模式

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/domain/vo/XzdPurchaseContractAlterationVo.java

@@ -119,6 +119,13 @@ public class XzdPurchaseContractAlterationVo implements Serializable {
     @ExcelProperty(value = "甲方单位")
     private Long partyAUnit;
 
+    /**
+     * 甲方单位
+     */
+    @ExcelProperty(value = "甲方单位")
+    private String partyAUnitName;
+
+
     /**
      * 集采模式
      */
@@ -131,6 +138,12 @@ public class XzdPurchaseContractAlterationVo implements Serializable {
     @ExcelProperty(value = "乙方单位")
     private Long artyBUnit;
 
+    /**
+     * 乙方单位
+     */
+    @ExcelProperty(value = "乙方单位")
+    private String artyBUnitName;
+
     /**
      * 警示信息
      */
@@ -173,18 +186,39 @@ public class XzdPurchaseContractAlterationVo implements Serializable {
     @ExcelProperty(value = "变更后项目经理")
     private Long changeProjectManager;
 
+    /**
+     * 变更后项目经理
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "changeProjectManager")
+    @ExcelProperty(value = "变更后项目经理")
+    private String changeProjectManageName;
+
     /**
      * 变更后项目责任人
      */
     @ExcelProperty(value = "变更后项目责任人")
     private Long changeProjectResponsible;
 
+    /**
+     * 变更后项目责任人
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "changeProjectResponsible")
+    @ExcelProperty(value = "变更后项目责任人")
+    private String changeProjectResponsibleName;
+
     /**
      * 变更后现场经理
      */
     @ExcelProperty(value = "变更后现场经理")
     private Long changeSiteManager;
 
+    /**
+     * 变更后现场经理
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "changeSiteManager")
+    @ExcelProperty(value = "变更后现场经理")
+    private String changeSiteManagerName;
+
     /**
      * 变更后现场经理
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java

@@ -97,6 +97,21 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
 
         for (XzdPurchaseContractAlterationVo item : infos) {
 
+            //甲方单位(客户信息列表)
+            R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(item.getPartyAUnit());
+            if (byid!=null){
+                if (byid.getData().getXzdCustomerinformation() != null){
+                    item.setPartyAUnitName(byid.getData().getXzdCustomerinformation().getUnitName());
+                }
+            }
+            //乙方单位(供应商信息列表)
+            if (item.getArtyBUnit() != null){
+                String unitName = xzdSupplierInfoService.queryNameById(item.getArtyBUnit());
+                if (unitName != null){
+                    item.setArtyBUnitName(unitName);
+                }
+            }
+
             //合同文本-预收款项
             LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());

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

@@ -141,7 +141,7 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
             if (unitName != null){
                 item.setManagementOrganizationName(unitName);
             }
-            //开票单位名称(供应商名称)
+            //开票单位名称
             R<QuerCorrespondentDto> byidtemp = iXzdCorrespondentList.getCustomerByid((item.getInvoicingUnit()));
             if (byidtemp!=null){
                 if (byidtemp.getData().getXzdCustomerinformation() != null){

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java

@@ -440,12 +440,10 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
             if (unitName1 != null){
                 item.setInvoiceIssuingUnitName(unitName1);
             }
-            //收票单位名称(客户名称)
+            //收票单位名称
-            R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(item.getInvoiceReceivingUnit());
+            String unitNametemp = xzdSupplierInfoService.queryNameById(item.getInvoiceReceivingUnit());
-            if (byid2!=null){
+            if (unitNametemp!=null){
-                if (byid2.getData().getXzdCustomerinformation() != null){
+                    item.setInvoiceReceivingUnitName(unitNametemp);
-                    item.setInvoiceReceivingUnitName(byid2.getData().getXzdCustomerinformation().getUnitName());
-                }
             }
             //签约组织(供应商)
             String unitName2 = xzdSupplierInfoService.queryNameById(item.getInvoiceIssuingUnit());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdCustomerDetail.java

@@ -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,12 +79,12 @@ public class XzdCustomerDetail extends BaseEntity {
     /**
      * 冻结开始时间
      */
-    private Date freezeStartTime;
+    private LocalDate freezeStartTime;
 
     /**
      * 冻结结束时间
      */
-    private Date freezeEndTime;
+    private LocalDate freezeEndTime;
 
     /**
      * 经销商类型

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java

@@ -61,12 +61,12 @@ public class XzdSettlementInfo extends BaseEntity {
     /**
      * 开户银行
      */
-//    private Long openingBank;
+    private Long openingBank;
 
     /**
      * 账号
      */
-//    private String accountNumber;
+    private String accountNumber;
 
     /**
      * 折扣方式
@@ -81,22 +81,22 @@ public class XzdSettlementInfo extends BaseEntity {
     /**
      * 开户行户名
      */
-//    private String accountName;
+    private String accountName;
 
     /**
      * 开户行省
      */
-//    private String openingBankProvince;
+    private String openingBankProvince;
 
     /**
      * 开户行市
      */
-//    private String openingBankCity;
+    private String openingBankCity;
 
     /**
      * 开户行区县
      */
-//    private String openingBankCountyDistrict;
+    private String openingBankCountyDistrict;
 
     /**
      * 财务类型

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomerDetailBo.java

@@ -78,12 +78,12 @@ public class XzdCustomerDetailBo extends BaseEntity {
     /**
      * 冻结开始时间
      */
-    private LocalDateTime freezeStartTime;
+    private LocalDate freezeStartTime;
 
     /**
      * 冻结结束时间
      */
-    private LocalDateTime freezeEndTime;
+    private LocalDate freezeEndTime;
 
     /**
      * 经销商类型

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/dto/QuerCorrespondentDto.java

@@ -16,7 +16,7 @@ public class QuerCorrespondentDto {
     private XzdCustomerinformationVo xzdCustomerinformation;
 
     //    tab客户信息
-    private XzdCustomerDetail xzdCustomerDetail;
+    private XzdCustomerDetailVo xzdCustomerDetail;
 
     //    地址信息
     private List<XzdAddressInfo> xzdAddressInfo;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdCustomerDetailVo.java

@@ -1,7 +1,13 @@
 package org.dromara.xzd.domain.vo;
 
+import java.time.LocalDate;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.xzd.domain.XzdCustomerDetail;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -95,13 +101,13 @@ public class XzdCustomerDetailVo implements Serializable {
      * 冻结开始时间
      */
     @ExcelProperty(value = "冻结开始时间")
-    private Date freezeStartTime;
+    private LocalDate freezeStartTime;
 
     /**
      * 冻结结束时间
      */
     @ExcelProperty(value = "冻结结束时间")
-    private Date freezeEndTime;
+    private LocalDate freezeEndTime;
 
     /**
      * 经销商类型
@@ -147,4 +153,22 @@ public class XzdCustomerDetailVo implements Serializable {
     private String branchCity;
 
 
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/AppreciationInvoiceController.java

@@ -61,7 +61,7 @@ public class AppreciationInvoiceController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zengzhishui:invoice:query")
+//    @SaCheckPermission("zengzhishui:invoice:query")
     @GetMapping("/{id}")
     public R<AppreciationInvoiceVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/controller/TaxInfoController.java

@@ -39,7 +39,7 @@ public class TaxInfoController extends BaseController {
     /**
      * 查询征税项目列表
      */
-    @SaCheckPermission("zengzhishui:info:list")
+//    @SaCheckPermission("zengzhishui:info:list")
     @GetMapping("/list")
     public TableDataInfo<TaxInfoVo> list(TaxInfoBo bo, PageQuery pageQuery) {
         return taxInfoService.queryPageList(bo, pageQuery);

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 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.PageQuery;
 import org.dromara.common.satoken.utils.LoginHelper;
@@ -18,10 +19,7 @@ import org.dromara.xzd.domain.bo.*;
 import org.dromara.xzd.domain.dto.AddCorrespondentDto;
 import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
 import org.dromara.xzd.domain.dto.XzdClienteleListDto;
-import org.dromara.xzd.domain.vo.XzdClienteleListSumVo;
+import org.dromara.xzd.domain.vo.*;
-import org.dromara.xzd.domain.vo.XzdClienteleListVo;
-import org.dromara.xzd.domain.vo.XzdCustomerinformationVo;
-import org.dromara.xzd.domain.vo.XzdPoiAreaVo;
 import org.dromara.xzd.enums.ZxdEnum;
 import org.dromara.xzd.mapper.XzdCustomerinformationMapper;
 import org.dromara.xzd.service.*;
@@ -86,6 +84,8 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
     private final XzdCustomerinformationMapper xzdCustomerinformationMapper;
 
+    private final IXzdCustomertypeService iXzdCustomertypeService; ;
+
 
 
 
@@ -116,11 +116,44 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
         long id =  dto.getXzdCustomerinformation().getId();
 
+        //     客户类型添加
+
+        List<XzdCustomertypeInfoBo> xzdCustomertypeInfo = dto.getXzdCustomertypeInfo();
+        String customertype = null;
+        if (xzdCustomertypeInfo != null && xzdCustomertypeInfo.size() > 0) {
+            List<XzdCustomertypeInfo> collect = xzdCustomertypeInfo.stream().map(item -> {
+                item.setCustomerinformationId(id);
+                item.setCreateDept(LoginHelper.getDeptId());
+                item.setCreateBy((LoginHelper.getUserId()));
+                item.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+                XzdCustomertypeInfo info = new XzdCustomertypeInfo();
+
+                BeanUtil.copyProperties(item, info);
+                return info;
+            }).collect(Collectors.toList());
+            xzdCustomertypeInfoService.saveBatch(collect);
+
+            for (XzdCustomertypeInfo customertypeInfo : collect) {
+                if (customertypeInfo.getPrimaryClass() == "1"){
+                    XzdCustomertype xzdCustomertype = iXzdCustomertypeService.getBaseMapper().selectById(customertypeInfo.getCustomertypeId());
+                    if (xzdCustomertype != null){
+                        customertype = xzdCustomertype.getCustomerType();
+                    }
+                }
+            }
+
+
+        }
+
 //        tab客户信息添加
         if (dto.getXzdCustomerDetail() != null){
             dto.getXzdCustomerDetail().setCustomerinformationId(id);
             dto.getXzdCustomerDetail().setCreateDept(LoginHelper.getDeptId());
             dto.getXzdCustomerDetail().setCreateBy((LoginHelper.getUserId()));
+            if(customertype != null){
+                dto.getXzdCustomerDetail().setCustomerType(customertype);
+            }
+
 //            dto.getXzdCustomerDetail().setCreateTime(LocalDateTime.now());
             xzdCustomerDetailService.insertByBo(dto.getXzdCustomerDetail());
         }
@@ -202,10 +235,10 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
             xzdSettlementInfo.setCustomerinformationId(id);
             xzdSettlementInfo.setCreateDept(LoginHelper.getDeptId());
             xzdSettlementInfo.setCreateBy((LoginHelper.getUserId()));
-//            xzdSettlementInfo.setCreateTime(LocalDateTime.now());
             xzdSettlementInfo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
             XzdSettlementInfo info = new XzdSettlementInfo();
             BeanUtil.copyProperties(xzdSettlementInfo, info);
+            System.out.println(info);
             xzdSettlementInfoService.save(info);
             }
 
@@ -260,22 +293,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
         }
 
 
-        //     客户类型添加
 
-        List<XzdCustomertypeInfoBo> xzdCustomertypeInfo = dto.getXzdCustomertypeInfo();
-        if (xzdCustomertypeInfo != null && xzdCustomertypeInfo.size() > 0) {
-            List<XzdCustomertypeInfo> collect = xzdCustomertypeInfo.stream().map(item -> {
-                item.setCustomerinformationId(id);
-                item.setCreateDept(LoginHelper.getDeptId());
-                item.setCreateBy((LoginHelper.getUserId()));
-//                item.setCreateTime(LocalDateTime.now());
-                item.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-                XzdCustomertypeInfo info = new XzdCustomertypeInfo();
-                BeanUtil.copyProperties(item, info);
-                return info;
-            }).collect(Collectors.toList());
-            xzdCustomertypeInfoService.saveBatch(collect);
-        }
         return R.ok("添加成功");
     }
 
@@ -319,113 +337,8 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
         if( dto.getXzdCustomerinformation() != null){
             xzdCustomerinformationService.updateByBo(dto.getXzdCustomerinformation());
         }
-//        tab客户信息
-        if (dto.getXzdCustomerDetail() != null){
-            xzdCustomerDetailService.updateByBo(dto.getXzdCustomerDetail());
-        }
-        //        地址信息
-        List<XzdAddressInfoBo> xzdAddressInfo = dto.getXzdAddressInfo();
-        if (xzdAddressInfo != null && xzdAddressInfo.size() > 0) {
-            List<XzdAddressInfo> collect = xzdAddressInfo.stream().map(xzdAddressInfoBo -> {
-                xzdAddressInfoBo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-                XzdAddressInfo res = new XzdAddressInfo();
-                BeanUtils.copyProperties(xzdAddressInfoBo, res);
-                return res;
-
-            }).collect(Collectors.toList());
-
-            xzdAddressInfoService.saveOrUpdateBatch(collect);
-        }
-
-
-        //        联系人信息
-        List<XzdContactBo> xzdContact = dto.getXzdContact();
-        if (xzdContact != null && xzdContact.isEmpty()) {
-            xzdContact.forEach(xzdContactBo -> {
-                XzdContact xzdContact1 = new XzdContact();
-                xzdContact1.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-                BeanUtils.copyProperties(xzdContactBo, xzdContact1);
-                xzdContactService.saveOrUpdate(xzdContact1);
-            });
-        }
-
-        //      证件信息
-        List<XzdCertificateInfoBo> xzdCertificateInfo = dto.getXzdCertificateInfo();
-        if (xzdCertificateInfo != null && xzdCertificateInfo.size() > 0) {
-            List<XzdCertificateInfo> collect = xzdCertificateInfo.stream().map(xzdCertificateInfoBo -> {
-                XzdCertificateInfo info = new XzdCertificateInfo();
-                BeanUtils.copyProperties(xzdCertificateInfoBo, info);
-                info.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-                return info;
-            }).collect(Collectors.toList());
-
-
-            xzdCertificateInfoService.saveOrUpdateBatch(collect);
-        }
-
-
-        //       资质信息
-        List<XzdQualificationInfoBo> xzdQualificationInfo = dto.getXzdQualificationInfo();
-        if (xzdQualificationInfo != null && xzdQualificationInfo.size() > 0) {
-            List<XzdQualificationInfo> collect = xzdQualificationInfo.stream().map(xzdQualificationInfoBo -> {
-                XzdQualificationInfo info = new XzdQualificationInfo();
-                BeanUtils.copyProperties(xzdQualificationInfoBo, info);
-                info.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-                return info;
-            }).collect(Collectors.toList());
-            xzdQualificationInfoService.saveOrUpdateBatch(collect);
-
-
-        }
-
-
-        //      结算信息
-        XzdSettlementInfoBo xzdSettlementInfo = dto.getXzdSettlementInfo();
-        if (xzdSettlementInfo != null) {
-            xzdSettlementInfo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-            xzdSettlementInfoService.updateByBo(xzdSettlementInfo);
-        }
-
-
-        //      业务信息
-        XzdBusinessInfoBo xzdBusinessInfo = dto.getXzdBusinessInfo();
-        if (xzdBusinessInfo != null) {
-
-            xzdBusinessInfo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-             xzdBusinessInfoService.updateByBo(xzdBusinessInfo);
-        }
-
-
-        //      项目信息
-
-        List<XzdProjectInfoBo> xzdProjectInfo = dto.getXzdProjectInfo();
-        if (xzdProjectInfo != null) {
-            Collection<XzdProjectInfo> collect = xzdProjectInfo.stream().map(item -> {
-                XzdProjectInfo xzdProjectInfoBo = new XzdProjectInfo();
-                BeanUtil.copyProperties(item, xzdProjectInfoBo);
-                xzdProjectInfoBo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-                return xzdProjectInfoBo;
-            }).collect(Collectors.toList());
-
-            xzdProjectInfoService.saveOrUpdateBatch(collect);
-        }
-
-
-        //      合同信息
-        List<XzdContractInfoBo> xzdContractInfo = dto.getXzdContractInfo();
-        if (xzdContractInfo != null) {
-
-            List<XzdContractInfo> collect = xzdContractInfo.stream().map(item -> {
-                XzdContractInfo xzdContractInfoBo = new XzdContractInfo();
-                BeanUtil.copyProperties(item, xzdContractInfoBo);
-                xzdContractInfoBo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
-                return xzdContractInfoBo;
-            }).collect(Collectors.toList());
-            xzdContractInfoService.saveOrUpdateBatch(collect);
-        }
-
-
         //     客户类型
+        String customertype = null;
 
         List<XzdCustomertypeInfoBo> xzdCustomertypeInfo = dto.getXzdCustomertypeInfo();
         if (xzdCustomertypeInfo != null && xzdCustomertypeInfo.size() > 0) {
@@ -439,7 +352,127 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
             }).collect(Collectors.toList());
             xzdCustomertypeInfoService.saveBatch(collect);
+            for (XzdCustomertypeInfo customertypeInfo : collect) {
+                if (customertypeInfo.getPrimaryClass() == "1"){
+                    XzdCustomertype xzdCustomertype = iXzdCustomertypeService.getBaseMapper().selectById(customertypeInfo.getCustomertypeId());
+                    if (xzdCustomertype != null){
+                        customertype = xzdCustomertype.getCustomerType();
+                    }
+                }
+            }
         }
+//        tab客户信息
+        if (dto.getXzdCustomerDetail() != null){
+            dto.getXzdCustomerDetail().setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+            if(customertype != null){
+                dto.getXzdCustomerDetail().setCustomerType(customertype);
+            }
+            xzdCustomerDetailService.saveOrUpdate(MapstructUtils.convert(dto.getXzdCustomerDetail(), XzdCustomerDetail.class));
+        }
+        //        地址信息
+        List<XzdAddressInfoBo> xzdAddressInfo = dto.getXzdAddressInfo();
+        xzdAddressInfoService.getBaseMapper().delete(new LambdaQueryWrapper<XzdAddressInfo>().eq(XzdAddressInfo::getCustomerinformationId, dto.getXzdCustomerinformation().getId()));
+        if (xzdAddressInfo != null && xzdAddressInfo.size() > 0) {
+            List<XzdAddressInfo> collect = xzdAddressInfo.stream().map(xzdAddressInfoBo -> {
+                XzdAddressInfo res = new XzdAddressInfo();
+                xzdAddressInfoBo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+                xzdAddressInfoBo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+                BeanUtils.copyProperties(xzdAddressInfoBo, res);
+                return res;
+            }).collect(Collectors.toList());
+            xzdAddressInfoService.saveBatch(collect);
+        }
+
+
+        //        联系人信息
+        List<XzdContactBo> xzdContact = dto.getXzdContact();
+        xzdContactService.getBaseMapper().delete(new LambdaQueryWrapper<XzdContact>().eq(XzdContact::getCustomerinformationId, dto.getXzdCustomerinformation().getId()));
+        if (xzdContact != null && xzdContact.size() > 0) {
+            xzdContact.forEach(xzdContactBo -> {
+                xzdContactBo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+                xzdContactBo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+            });
+            xzdContactService.saveBatch(MapstructUtils.convert(xzdContact, XzdContact.class));
+        }
+
+        //      证件信息
+        List<XzdCertificateInfoBo> xzdCertificateInfo = dto.getXzdCertificateInfo();
+        xzdCertificateInfoService.getBaseMapper().delete(new LambdaQueryWrapper<XzdCertificateInfo>().eq(XzdCertificateInfo::getCustomerinformationId, dto.getXzdCustomerinformation().getId()));
+        if (xzdCertificateInfo != null && xzdCertificateInfo.size() > 0) {
+            xzdCertificateInfo.forEach(xzdCertificateInfoBo -> {
+                xzdCertificateInfoBo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+                xzdCertificateInfoBo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+            });
+            xzdCertificateInfoService.saveBatch(MapstructUtils.convert(xzdCertificateInfo, XzdCertificateInfo.class));
+        }
+
+
+        //       资质信息
+        List<XzdQualificationInfoBo> xzdQualificationInfo = dto.getXzdQualificationInfo();
+        xzdQualificationInfoService.getBaseMapper().delete(new LambdaQueryWrapper<XzdQualificationInfo>().eq(XzdQualificationInfo::getCustomerinformationId, dto.getXzdCustomerinformation().getId()));
+        if (xzdQualificationInfo != null && xzdQualificationInfo.size() > 0) {
+            List<XzdQualificationInfo> collect = xzdQualificationInfo.stream().map(xzdQualificationInfoBo -> {
+                XzdQualificationInfo info = new XzdQualificationInfo();
+                BeanUtils.copyProperties(xzdQualificationInfoBo, info);
+                info.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+                info.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+                return info;
+            }).collect(Collectors.toList());
+            xzdQualificationInfoService.saveBatch(collect);
+        }
+
+
+        //      结算信息
+        XzdSettlementInfoBo xzdSettlementInfo = dto.getXzdSettlementInfo();
+        if (xzdSettlementInfo != null) {
+            xzdSettlementInfo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+            xzdSettlementInfo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+            xzdSettlementInfoService.saveOrUpdate(MapstructUtils.convert(xzdSettlementInfo, XzdSettlementInfo.class));
+        }
+
+
+        //      业务信息
+        XzdBusinessInfoBo xzdBusinessInfo = dto.getXzdBusinessInfo();
+        if (xzdBusinessInfo != null) {
+            xzdBusinessInfo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+            xzdBusinessInfo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+             xzdBusinessInfoService.updateByBo(xzdBusinessInfo);
+        }
+
+
+        //      项目信息
+
+        List<XzdProjectInfoBo> xzdProjectInfo = dto.getXzdProjectInfo();
+        xzdProjectInfoService.getBaseMapper().delete(new LambdaQueryWrapper<XzdProjectInfo>().eq(XzdProjectInfo::getCustomerinformationId, dto.getXzdCustomerinformation().getId()));
+        if (xzdProjectInfo != null) {
+            List<XzdProjectInfo> collect = xzdProjectInfo.stream().map(item -> {
+                XzdProjectInfo xzdProjectInfoBo = new XzdProjectInfo();
+                BeanUtil.copyProperties(item, xzdProjectInfoBo);
+                xzdProjectInfoBo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+                xzdProjectInfoBo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+                return xzdProjectInfoBo;
+            }).collect(Collectors.toList());
+
+            xzdProjectInfoService.saveBatch(collect);
+        }
+
+
+        //      合同信息
+        List<XzdContractInfoBo> xzdContractInfo = dto.getXzdContractInfo();
+        xzdContractInfoService.getBaseMapper().delete(new LambdaQueryWrapper<XzdContractInfo>().eq(XzdContractInfo::getCustomerinformationId, dto.getXzdCustomerinformation().getId()));
+        if (xzdContractInfo != null) {
+            List<XzdContractInfo> collect = xzdContractInfo.stream().map(item -> {
+                XzdContractInfo xzdContractInfoBo = new XzdContractInfo();
+                BeanUtil.copyProperties(item, xzdContractInfoBo);
+                xzdContractInfoBo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
+                xzdContractInfoBo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
+                return xzdContractInfoBo;
+            }).collect(Collectors.toList());
+            xzdContractInfoService.saveBatch(collect);
+        }
+
+
+
         return R.ok("修改成功");
 
     }
@@ -458,7 +491,7 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
         XzdCustomerDetail xzdCustomerDetails = xzdCustomerDetailService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdCustomerDetail>().eq(XzdCustomerDetail::getCustomerinformationId,id));
 
-        dto.setXzdCustomerDetail(xzdCustomerDetails);
+        dto.setXzdCustomerDetail(MapstructUtils.convert(xzdCustomerDetails, XzdCustomerDetailVo.class));
 
 
         //        地址信息
@@ -468,7 +501,6 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
         //        联系人信息
 
-
         List<XzdContact> xzdContacts = xzdContactService.getBaseMapper().selectByMap(temp);
         dto.setXzdContact(xzdContacts);