refactor(system): 重构合同签约相关实体和查询接口

-移除了 AppContractSignMapper.xml 中的创建时间范围查询条件
- 重构了 ContractSignDTO 类，增加了多个新字段并优化了日期格式注解
- 更新了 ContractSignVO 类，添加了日期格式注解

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/ContractSignDTO.java

@@ -1,22 +1,45 @@
 package org.jeecg.modules.system.app.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.modules.system.app.vo.ContractSignVO;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "用户签约合同列表查询入参")
 @Data
 @Accessors(chain = true)
-public class ContractSignDTO extends ContractSignVO {
+public class ContractSignDTO{
     public Integer pageNo;
     public Integer pageSize;
-    // 签约完成时间范围 (开始)
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @DateTimeFormat(pattern="MM-dd")
     private Date signTimeStart;
-    // 签约完成时间范围 (结束)
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @DateTimeFormat(pattern="MM-dd")
     private Date signTimeEnd;
+    @Schema(description = "关联产品名称")
+    private String productName;
+
+    @Schema(description = "家庭成员姓名")
+    private String fullName;
+
+    @Schema(description = "是否签署 0、未签 1、已签")
+    private Integer isSign;
+
+    @Schema(description = "联系电话")
+    private String phone;
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @DateTimeFormat(pattern="MM-dd")
+    @Schema(description = "创建时间（合同签约记录创建时间）")
+    private Date createTime;
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @DateTimeFormat(pattern="MM-dd")
+    @Schema(description = "签约完成时间")
+    private Date signTime;
+
+    @Schema(description = "sign_flow_id")
+    private String signFlowId;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppContractSignMapper.xml

@@ -36,14 +36,6 @@
                 AND a.is_sign = #{contractSignDTO.isSign}
             </if>
 
-            <!-- 创建时间范围查询 -->
-            <if test="contractSignDTO.createTimeStart != null">
-                AND a.create_time &gt;= #{contractSignDTO.createTimeStart}
-            </if>
-            <if test="contractSignDTO.createTimeEnd != null">
-                AND a.create_time &lt;= #{contractSignDTO.createTimeEnd}
-            </if>
-
             <!-- 签约完成时间范围查询 -->
             <if test="contractSignDTO.signTimeStart != null">
                 AND a.sign_time &gt;= #{contractSignDTO.signTimeStart}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/ContractSignVO.java

@@ -1,8 +1,10 @@
 package org.jeecg.modules.system.app.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -24,10 +26,12 @@ public class ContractSignVO {
 
     @Schema(description = "联系电话")
     private String phone;
-
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "创建时间（合同签约记录创建时间）")
     private Date createTime;
-
+    @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
+    @DateTimeFormat(pattern="MM-dd")
     @Schema(description = "签约完成时间")
     private Date signTime;