DESKTOP-2K9OVK9\siwei 5 månader sedan
förälder
incheckning
c099062b5b

+ 24 - 0
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlApplicationRecord.java

@@ -175,6 +175,14 @@ public class TZymlApplicationRecord extends BaseEntity {
     @Excel(name = "服务KEY")
     private String fwKey;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
     public void setId(String id) {
         this.id = id;
     }
@@ -383,6 +391,22 @@ public class TZymlApplicationRecord extends BaseEntity {
         this.fwKey = fwKey;
     }
 
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("sqUserId", getSqUserId()).append("sqUserBy", getSqUserBy()).append("sqTime", getSqTime()).append("sqDepartmentId", getSqDepartmentId()).append("sqDepartmentBy", getSqDepartmentBy()).append("zymlId", getZymlId()).append("zymlBy", getZymlBy()).append("zymlTypeCode", getZymlTypeCode()).append("zymlTypeName", getZymlTypeName()).append("sqFw", getSqFw()).append("sqReason", getSqReason()).append("systemName", getSystemName()).append("callIp", getCallIp()).append("deadline", getDeadline()).append("attachment", getAttachment()).append("sqDeadline", getSqDeadline()).append("spUserId", getSpUserId()).append("spUserBy", getSpUserBy()).append("spTime", getSpTime()).append("spReason", getSpReason()).append("state", getState()).append("zymlUrl", getZymlUrl()).toString();

+ 2 - 0
onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/TZymlApplicationRecordMapper.xml

@@ -62,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spUserId != null  and spUserId != ''"> and sp_user_id = #{spUserId}</if>
             <if test="spUserBy != null  and spUserBy != ''"> and sp_user_by = #{spUserBy}</if>
             <if test="spTime != null "> and sp_time = #{spTime}</if>
+            <if test="startTime != null "> and sp_time &gt;= #{startTime}</if>
+            <if test="endTime != null "> and sp_time &lt;= #{endTime}</if>
             <if test="spReason != null  and spReason != ''"> and sp_reason = #{spReason}</if>
             <if test="state != null "> and state = #{state}</if>
             <if test="fwKey != null "> and fw_key = #{fwKey}</if>