1.1.33 合同变更同步合同新增框架合同、海外合同等字段

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java

@@ -80,6 +80,51 @@ public class ErpContractChangeInfo extends TenantEntity {
      */
     private Date contractDate;
 
+    /**
+     * 合同属地标识（1中国大陆 2其他）
+     */
+    private String contractTerritorialFlag;
+
+    /**
+     * 合同属地国家/地区（字典）
+     */
+    private String contractTerritorialCountry;
+
+    /**
+     * 结算币种（CNY/USD/EUR）
+     */
+    private String settlementCurrency;
+
+    /**
+     * 对人民币汇率
+     */
+    private BigDecimal rmbExchangeRate;
+
+    /**
+     * 已生效客户订单标识（1是 0否）
+     */
+    private String effectiveCustomerOrderFlag;
+
+    /**
+     * 合同状态(1暂存 2审批中 3可用)
+     */
+    private String contractStatus;
+
+    /**
+     * 是否关联框架合同（1是 0否）
+     */
+    private String isFrameworkContract;
+
+    /**
+     * 关联框架合同ID
+     */
+    private Long frameworkContractId;
+
+    /**
+     * 框架合同有效期
+     */
+    private Date frameworkValidPeriod;
+
     /**
      * 合同总价
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java

@@ -73,7 +73,7 @@ public class ErpContractInfo extends TenantEntity {
     private Long contractDeptId;
 
     /**
-     * 合同时间
+     * 合同签订日期
      */
     private Date contractDate;
 

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java

@@ -78,6 +78,51 @@ public class ErpContractChangeInfoBo extends BaseEntity {
      */
     private Date contractDate;
 
+    /**
+     * 合同属地标识（1中国大陆 2其他）
+     */
+    private String contractTerritorialFlag;
+
+    /**
+     * 合同属地国家/地区（字典）
+     */
+    private String contractTerritorialCountry;
+
+    /**
+     * 结算币种（CNY/USD/EUR）
+     */
+    private String settlementCurrency;
+
+    /**
+     * 对人民币汇率
+     */
+    private BigDecimal rmbExchangeRate;
+
+    /**
+     * 已生效客户订单标识（1是 0否）
+     */
+    private String effectiveCustomerOrderFlag;
+
+    /**
+     * 合同状态(1暂存 2审批中 3可用)
+     */
+    private String contractStatus;
+
+    /**
+     * 是否关联框架合同（1是 0否）
+     */
+    private String isFrameworkContract;
+
+    /**
+     * 关联框架合同ID
+     */
+    private Long frameworkContractId;
+
+    /**
+     * 框架合同有效期
+     */
+    private Date frameworkValidPeriod;
+
     /**
      * 合同总价
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java

@@ -76,7 +76,7 @@ public class ErpContractInfoBo extends BaseEntity {
     private Long contractDeptId;
 
     /**
-     * 合同时间
+     * 合同签订日期
      */
     private Date contractDate;
 

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java

@@ -13,9 +13,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
-
-
 
 /**
  * 合同变更信息视图对象 erp_contract_change_info
@@ -97,6 +94,60 @@ public class ErpContractChangeInfoVo implements Serializable {
     @ExcelProperty(value = "合同签订日期")
     private Date contractDate;
 
+    /**
+     * 合同属地标识（1中国大陆 2其他）
+     */
+    @ExcelProperty(value = "合同属地标识")
+    private String contractTerritorialFlag;
+
+    /**
+     * 合同属地国家/地区（字典）
+     */
+    @ExcelProperty(value = "合同属地国家/地区")
+    private String contractTerritorialCountry;
+
+    /**
+     * 结算币种
+     */
+    @ExcelProperty(value = "结算币种")
+    private String settlementCurrency;
+
+    /**
+     * 对人民币汇率
+     */
+    @ExcelProperty(value = "对人民币汇率")
+    private BigDecimal rmbExchangeRate;
+
+    /**
+     * 已生效客户订单标识（1是 0否）
+     */
+    @ExcelProperty(value = "已生效客户订单标识")
+    private String effectiveCustomerOrderFlag;
+
+    /**
+     * 合同状态
+     */
+    @ExcelProperty(value = "合同状态")
+    private String contractStatus;
+
+    /**
+     * 是否关联框架合同（1是 0否）
+     */
+    @ExcelProperty(value = "是否关联框架合同")
+    private String isFrameworkContract;
+
+    /**
+     * 关联框架合同ID
+     */
+    @ExcelProperty(value = "关联框架合同ID")
+    private Long frameworkContractId;
+
+    /**
+     * 框架合同有效期
+     */
+    @ExcelProperty(value = "框架合同有效期")
+    private Date frameworkValidPeriod;
+
     /**
      * 合同总价
      */

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractChangeInfoMapper.xml

@@ -7,7 +7,7 @@
     </resultMap>
 
     <select id="selectCustomErpContractChangeInfoVoList" resultMap="ErpContractChangeInfoResult">
-        select change_info_id, tenant_id, contract_change_id, contract_flag, customer_contract_code, contract_code, contract_name, contract_category, contract_type, business_direction, contract_dept_id, contract_date, total_price, one_customer_id, one_represent, one_date, two_customer_id, two_represent, two_date, contract_manager_id, template_id, oss_id, payment_account_id, payment_method, signature_appendix, warranty_period, internal_contract_code, external_contract_code, order_contract_code, project_contract_code, delivery_start, warranty_period_description, delivery_location, ship_method, tax_rate, signing_place, material_remark, contract_template_flag, capitalized_amount, remark, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_change_info t
+        select change_info_id, tenant_id, contract_change_id, contract_flag, customer_contract_code, contract_code, contract_name, contract_category, contract_type, business_direction, contract_dept_id, contract_date, contract_territorial_flag, contract_territorial_country, settlement_currency, rmb_exchange_rate, effective_customer_order_flag, contract_status, is_framework_contract, framework_contract_id, framework_valid_period, total_price, one_customer_id, one_represent, one_date, two_customer_id, two_represent, two_date, contract_manager_id, template_id, oss_id, payment_account_id, payment_method, signature_appendix, warranty_period, internal_contract_code, external_contract_code, order_contract_code, project_contract_code, delivery_start, warranty_period_description, delivery_location, ship_method, tax_rate, signing_place, material_remark, contract_template_flag, capitalized_amount, remark, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_change_info t
             ${ew.getCustomSqlSegment}
     </select>