Merge remote-tracking branch 'origin/dev' into dev

xinnengyuan/ruoyi-admin/src/main/resources/application.yml

@@ -306,8 +306,12 @@ xss:
     - /project/project
     - /xzd/contractDetails/**
     - /xzd/contractChange/**
-    - /comprehensive/csContractChange
+    - /comprehensive/csContractChange/**
-    - /comprehensive/csContractInformation
+    - /comprehensive/csContractInformation/**
+    - /hetongbiangeng/**
+    - /fenbaohetongbiangg/**
+    - /fenbaohetongxinxi/**
+    - /contractManagement/**
 
 # 全局线程池相关配置
 # 如使用JDK21请直接使用虚拟线程 不要开启此配置

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

@@ -149,7 +149,7 @@ public class XzdPurchaseContractAlteration extends BaseEntity {
     /**
      * 变更后合同备注
      */
-    private Long changeContractRemarks;
+    private String changeContractRemarks;
 
     /**
      * 项目大类
@@ -211,6 +211,11 @@ public class XzdPurchaseContractAlteration extends BaseEntity {
     private String auditStatus;
 
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
 
 
 }

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

@@ -154,7 +154,7 @@ public class XzdPurchaseContractAlterationBo extends BaseEntity {
     /**
      * 变更后合同备注
      */
-    private Long changeContractRemarks;
+    private String changeContractRemarks;
 
     /**
      * 项目大类
@@ -220,6 +220,11 @@ public class XzdPurchaseContractAlterationBo extends BaseEntity {
 
     private LocalDate endDate;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
 
 
     /**

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

@@ -53,6 +53,13 @@ public class XzdPurchaseContractAlterationVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "合=同编码")
     private Long contractInformationId;
 
+    /**
+     * 采购合同信息ID（合同编码）
+     */
+    @ExcelProperty(value = "采购合同信息ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "合=同编码")
+    private String contractInformationName;
+
     /**
      * 单据编码
      */
@@ -223,7 +230,7 @@ public class XzdPurchaseContractAlterationVo implements Serializable {
      * 变更后现场经理
      */
     @ExcelProperty(value = "变更后合同备注")
-    private Long changeContractRemarks;
+    private String changeContractRemarks;
 
     /**
      * 项目大类
@@ -304,11 +311,22 @@ public class XzdPurchaseContractAlterationVo implements Serializable {
     @ExcelProperty(value = "审核状态")
     private String auditStatus;
 
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
     /**
      * 变更价税合计
      */
     private String changeInTotalAmount;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 变更后价税合计
      */

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

@@ -111,6 +111,14 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
                     item.setArtyBUnitName(unitName);
                 }
             }
+//            合同编码
+            if (item.getContractInformationId() != null){
+                XzdPurchaseContractInformationVo vo = iXzdPurchaseContractInformationService.queryById(item.getContractInformationId());
+                if (vo != null){
+                    item.setContractInformationName(vo.getContractCode());
+                }
+
+            }
 
             //合同文本-预收款项
             LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -162,6 +170,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
     public TableDataInfo<XzdPurchaseContractAlterationVo> queryPageList(XzdPurchaseContractAlterationBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<XzdPurchaseContractAlteration> lqw = buildQueryWrapper(bo);
         Page<XzdPurchaseContractAlterationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        setValue(result.getRecords());
         return TableDataInfo.build(result);
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/XzdSubcontractChange.java

@@ -44,6 +44,11 @@ public class XzdSubcontractChange extends BaseEntity {
      */
     private LocalDate documentDate;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 合同编码
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/domain/bo/XzdSubcontractChangeBo.java

@@ -68,6 +68,10 @@ public class XzdSubcontractChangeBo extends BaseEntity {
      */
     private String changeType;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
     /**
      * 项目
      */

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

@@ -64,6 +64,11 @@ public class XzdSubcontractChangeVo implements Serializable {
     @ExcelProperty(value = "单据日期")
     private LocalDate documentDate;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 合同编码
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java

@@ -58,6 +58,11 @@ public class XzdSubcontract extends BaseEntity {
      */
     private String businessModel;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 原合同造价
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java

@@ -58,6 +58,11 @@ public class XzdSubcontractBo extends BaseEntity {
      */
     private Long project;
 
+
+    /**
+     * 合同文本
+     */
+    private String contractText;
     /**
      * 经营模式
      */

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

@@ -69,6 +69,11 @@ public class XzdSubcontractVo implements Serializable {
     @ExcelProperty(value = "合同类型")
     private String contractType;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 项目
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java

@@ -126,6 +126,11 @@ public class XzdPurchaseContractInformation extends BaseEntity {
      */
     private String paymentTerms;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 集采模式
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java

@@ -317,6 +317,11 @@ public class XzdPurchaseContractInformationBo extends BaseEntity {
      */
     private List<XzdHtglHtbgqd> htbgqds;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 汇总数据
      */

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

@@ -58,6 +58,11 @@ public class XzdPurchaseContractInformationVo implements Serializable {
     @ExcelProperty(value = "合同名称")
     private String contractName;
 
+    /**
+     * 合同文本
+     */
+    private String contractText;
+
     /**
      * 单据日期
      */

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

@@ -108,6 +108,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
             informationVo = List.of(xzdPurchaseContractInformationVo);
 //        装填数据
             setValue(informationVo);
+        }else {
+            return null;
         }
         return informationVo.getFirst();
     }