feat: contract add time field

WangXu10 · WangXu10 · commit 31d5db4e9deb · 2026-01-08T17:02:22.000+08:00
diff --git a/backend/crm/src/main/java/cn/cordys/common/constants/BusinessModuleField.java b/backend/crm/src/main/java/cn/cordys/common/constants/BusinessModuleField.java
@@ -258,6 +258,8 @@ public enum BusinessModuleField {
     CONTRACT_PRODUCT_SUM_AMOUNT("contractProductSumAmount", "amount", Set.of("rules.required", "mobile", "readable"), FormKey.CONTRACT.getKey()),
     CONTRACT_OWNER("contractOwner", "owner", Set.of("rules.required", "mobile", "readable"), FormKey.CONTRACT.getKey()),
     CONTRACT_NO("contractNo", "number", Set.of("rules.required", "mobile", "readable"), FormKey.CONTRACT.getKey()),
+    CONTRACT_START_TIME("contractStartTime", "startTime", Set.of("rules.required", "mobile", "readable"), FormKey.CONTRACT.getKey()),
+    CONTRACT_END_TIME("contractEndTime", "endTime", Set.of("rules.required", "mobile", "readable"), FormKey.CONTRACT.getKey()),
 
     /*------ end: CONTRACT ------*/
 
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/domain/Contract.java b/backend/crm/src/main/java/cn/cordys/crm/contract/domain/Contract.java
@@ -32,6 +32,12 @@ public class Contract extends BaseModel {
     @Schema(description = "合同阶段")
     private String stage;
 
+    @Schema(description = "合同开始时间")
+    private Long startTime;
+
+    @Schema(description = "合同结束时间")
+    private Long endTime;
+
     @Schema(description = "作废原因")
     private String voidReason;
 
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/dto/request/ContractAddRequest.java b/backend/crm/src/main/java/cn/cordys/crm/contract/dto/request/ContractAddRequest.java
@@ -4,9 +4,11 @@
 import cn.cordys.crm.system.dto.response.ModuleFormConfigDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 
+import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
 
@@ -28,6 +30,14 @@ public class ContractAddRequest {
     @Schema(description = "负责人", requiredMode = Schema.RequiredMode.REQUIRED)
     private String owner;
 
+    @Schema(description = "合同开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull
+    private Long startTime;
+
+    @Schema(description = "合同结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull
+    private Long endTime;
+
     @Schema(description = "自定义字段")
     private List<BaseModuleFieldValue> moduleFields;
 
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractMapper.xml b/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractMapper.xml
@@ -15,6 +15,8 @@
         ct.approval_status,
         ct.stage,
         ct.`owner`,
+        ct.start_time,
+        ct.end_time,
         ct.void_reason,
         ct.create_user,
         ct.create_time,
@@ -134,7 +136,7 @@
             <foreach collection="${conditions}" item="condition" index="i">
                 <if test="condition.name not in
                 {'name', 'owner', 'createTime', 'updateTime', 'customerId', 'createUser', 'updateUser',
-                 'departmentId', 'number', 'stage', 'amount', 'approvalStatus'}">
+                 'departmentId', 'number', 'stage', 'amount', 'approvalStatus', 'startTime', 'endTime'}">
                     <if test="condition.multipleValue">
                         left join contract_field_blob ${tablePrefix}_${i}
                         on ct.id = ${tablePrefix}_${i}.resource_id and ${tablePrefix}_${i}.field_id = #{condition.name}
@@ -155,7 +157,7 @@
     <sql id="fieldSortJoin">
         <if test="${sort} != null and ${sort}.valid() and ${sort}.name not in
                 {'name', 'owner', 'customer_id', 'amount', 'stage', 'update_user', 'create_time',
-                 'approval_status', 'update_time', 'create_user', 'department_id'}">
+                 'approval_status', 'update_time', 'create_user', 'department_id', 'startTime', 'endTime'}">
             <bind name="sortName" value="${sort}.name"/>
             left join contract_field sort_table
             on ct.id = sort_table.resource_id and sort_table.field_id = #{sortName}
@@ -223,6 +225,18 @@
                     <property name="column" value="ct.approval_status"/>
                 </include>
             </when>
+            <when test="condition.name == 'startTime'">
+                <include refid="cn.cordys.common.mapper.CommonMapper.condition">
+                    <property name="condition" value="condition"/>
+                    <property name="column" value="ct.start_time"/>
+                </include>
+            </when>
+            <when test="condition.name == 'endTime'">
+                <include refid="cn.cordys.common.mapper.CommonMapper.condition">
+                    <property name="condition" value="condition"/>
+                    <property name="column" value="ct.end_time"/>
+                </include>
+            </when>
             <when test="condition.name == 'departmentId'">
                 <include refid="cn.cordys.common.mapper.CommonMapper.condition">
                     <property name="condition" value="condition"/>
@@ -337,8 +351,15 @@
                         souc_sort.`id` ${sortType},  ct.id ASC
                     </when>
                     <when test="${sort}.name == 'approval_status'">
-                        ct.`id` ${sortType},  ct.id ASC
+                        ct.`approval_status` ${sortType},  ct.id ASC
+                    </when>
+                    <when test="${sort}.name == 'start_time'">
+                        ct.`start_time` ${sortType},  ct.id ASC
                     </when>
+                    <when test="${sort}.name == 'end_time'">
+                        ct.`end_time` ${sortType},  ct.id ASC
+                    </when>
+
 
                     <otherwise>
                         CASE
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractService.java b/backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractService.java
@@ -134,6 +134,8 @@ public Contract add(ContractAddRequest request, String operatorId, String orgId)
         contract.setStage(ContractStage.PENDING_SIGNING.name());
         contract.setOrganizationId(orgId);
         contract.setApprovalStatus(ContractApprovalStatus.APPROVING.name());
+        contract.setStartTime(request.getStartTime());
+        contract.setEndTime(request.getEndTime());
         contract.setCreateTime(System.currentTimeMillis());
         contract.setCreateUser(operatorId);
         contract.setUpdateTime(System.currentTimeMillis());
@@ -266,6 +268,8 @@ public Contract update(ContractUpdateRequest request, String userId, String orgI
 
             List<BaseModuleFieldValue> originFields = contractFieldService.getModuleFieldValuesByResourceId(request.getId());
             Contract contract = BeanUtils.copyBean(new Contract(), request);
+            contract.setStartTime(request.getStartTime());
+            contract.setEndTime(request.getEndTime());
             contract.setUpdateTime(System.currentTimeMillis());
             contract.setUpdateUser(userId);
             // 保留不可更改的字段
diff --git a/backend/crm/src/main/resources/form/field.json b/backend/crm/src/main/resources/form/field.json
@@ -1778,6 +1778,40 @@
           "key": "required"
         }
       ]
+    },
+    {
+      "name": "合同开始时间",
+      "internalKey": "contractStartTime",
+      "type": "DATE_TIME",
+      "dateType": "date",
+      "showLabel": true,
+      "readable": true,
+      "editable": true,
+      "fieldWidth": 1,
+      "rules": [
+        {
+          "key": "required"
+        }
+      ],
+      "mobile": true,
+      "ext_ver": "1.5.0"
+    },
+    {
+      "name": "合同结束时间",
+      "internalKey": "contractEndTime",
+      "type": "DATE_TIME",
+      "dateType": "date",
+      "showLabel": true,
+      "readable": true,
+      "editable": true,
+      "fieldWidth": 1,
+      "rules": [
+        {
+          "key": "required"
+        }
+      ],
+      "mobile": true,
+      "ext_ver": "1.5.0"
     }
   ],
   "invoice": [
diff --git a/backend/crm/src/main/resources/migration/1.5.0/dml/V1.5.0_2_2__modify_tel.sql b/backend/crm/src/main/resources/migration/1.5.0/dml/V1.5.0_2_2__modify_tel.sql
@@ -26,6 +26,10 @@ VALUES (UUID_SHORT(), 'business_name', true, '100001'),
        (UUID_SHORT(), 'company_size', false, '100001'),
        (UUID_SHORT(), 'registration_number', false, '100001');
 
+alter table contract
+    add start_time bigint not null comment '合同开始时间';
+alter table contract
+    add end_time bigint not null comment '合同结束时间';
 
 
 SET SESSION innodb_lock_wait_timeout = DEFAULT;
diff --git a/backend/crm/src/test/java/cn/cordys/crm/system/controller/AddNoticeExpireTests.java b/backend/crm/src/test/java/cn/cordys/crm/system/controller/AddNoticeExpireTests.java
@@ -129,6 +129,8 @@ void saveNotice() {
         contract.setStage(ContractStage.PENDING_SIGNING.name());
         contract.setCreateUser("admin");
         contract.setOwner("aaa");
+        contract.setStartTime(System.currentTimeMillis());
+        contract.setStartTime(System.currentTimeMillis());
         contract.setCreateTime(System.currentTimeMillis());
         contract.setUpdateUser("admin");
         contract.setUpdateTime(System.currentTimeMillis());
