1、oracle

Former-commit-id: c44320d2c1dcd1e3419ac02cfc585497c03c99c4

src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl

@@ -28,6 +28,16 @@ public class ${table.getCName()}FindRequest extends BaseFindRequest {
     private ${field.fieldType.javaType()} ${field.getFName()};
 </#if>
 </#list>
+
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
 <#list table.fields as field>
 <#if field.isQuery>
 
@@ -40,4 +50,20 @@ public class ${table.getCName()}FindRequest extends BaseFindRequest {
     }
 </#if>
 </#list>
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_DeptMapper.xml

@@ -51,6 +51,12 @@
         <if test="request.valid != null">
             AND `VALID` = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="dept">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_DictItemMapper.xml

@@ -50,6 +50,12 @@
         <if test="request.valid != null">
             AND `VALID` = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="dictItem">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_DictMapper.xml

@@ -40,6 +40,12 @@
         <if test="request.valid != null">
             AND `VALID` = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="dict">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_FileMapper.xml

@@ -46,6 +46,12 @@
         <if test="request.attribute2 != null and request.attribute2 != ''">
             AND `ATTRIBUTE2` = ${r"#"}{request.attribute2}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="file">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_LogErrMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.logErrResult != null and request.logErrResult != ''">
             AND `LOG_ERR_RESULT` = ${r"#"}{request.logErrResult}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="logErr">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ProfilesMapper.xml

@@ -36,6 +36,12 @@
         <if test="request.key != null and request.key != ''">
             AND `KEY` = ${r"#"}{request.key}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="profiles">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml

@@ -62,6 +62,12 @@
         <if test="request.valid != null">
             AND `VALID` = ${r'#'}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="load" resultMap="res">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_RoleMapper.xml

@@ -39,6 +39,12 @@
         <if test="request.comment != null and request.comment != ''">
             AND `COMMENT` = ${r"#"}{request.comment}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="role">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_RoleResMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.resCode != null and request.resCode != ''">
             AND `RES_CODE` = ${r'#'}{request.resCode}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="roleRes">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_TaskSqlMapper.xml

@@ -45,6 +45,12 @@
         <if test="request.valid != null">
             AND `VALID` = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="taskSql">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_TokensMapper.xml

@@ -75,6 +75,12 @@
         <if test="request.terminalInfo != null and request.terminalInfo != ''">
             AND `TERMINAL_INFO` = ${r"#"}{request.terminalInfo}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="tokens">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_UserMapper.xml

@@ -69,6 +69,12 @@
         <if test="request.deptName != null and request.deptName != ''">
             AND t1.`DEPT_NAME` = ${r"#"}{request.deptName}
         </if>
+        <if test="request.startDate != null">
+            AND t1.`CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  t1.${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="user">

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_UserRoleMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.roleCode != null and request.roleCode != ''">
             AND `ROLE_CODE` = ${r'#'}{request.roleCode}
         </if>
+        <if test="request.startDate != null">
+            AND `CREATE_TIME` >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= `CREATE_TIME`
+        </if>
     </select>
 
     <select id="search" resultMap="userRole">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_DeptMapper.xml

@@ -51,6 +51,12 @@
         <if test="request.valid != null">
             AND "VALID" = ${r'#'}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="dept">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_DeveloperMapper.xml

@@ -44,6 +44,12 @@
         <if test="request.valid != null">
             AND "VALID" = ${r'#'}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="developer">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_DictItemMapper.xml

@@ -44,6 +44,12 @@
         <if test="request.valid != null">
             AND "VALID" = ${r'#'}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="dictItem">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_DictMapper.xml

@@ -40,6 +40,12 @@
         <if test="request.valid != null">
             AND "VALID" = ${r'#'}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="dict">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_FileMapper.xml

@@ -46,6 +46,12 @@
         <if test="request.attribute2 != null and request.attribute2 != ''">
             AND "ATTRIBUTE2" = ${r'#'}{request.attribute2}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="file">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_LogErrMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.logErrResult != null and request.logErrResult != ''">
             AND "LOG_ERR_RESULT" = ${r'#'}{request.logErrResult}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="logErr">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_ProfilesMapper.xml

@@ -36,6 +36,12 @@
         <if test="request.key != null and request.key != ''">
             AND "KEY" = ${r'#'}{request.key}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="profiles">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_ResMapper.xml

@@ -59,6 +59,12 @@
         <if test="request.valid != null">
             AND "VALID" = ${r'#'}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="load" resultMap="res">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_RoleMapper.xml

@@ -39,6 +39,12 @@
         <if test="request.comment != null and request.comment != ''">
             AND "COMMENT" = ${r'#'}{request.comment}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="role">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_RoleResMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.resCode != null and request.resCode != ''">
             AND "RES_CODE" = ${r'#'}{request.resCode}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="roleRes">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_TaskSqlMapper.xml

@@ -45,6 +45,12 @@
         <if test="request.valid != null">
             AND "VALID" = ${r'#'}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="taskSql">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_TokensMapper.xml

@@ -75,6 +75,12 @@
         <if test="request.terminalInfo != null and request.terminalInfo != ''">
             AND "TERMINAL_INFO" = ${r'#'}{request.terminalInfo}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="tokens">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_UserMapper.xml

@@ -67,6 +67,12 @@
         <if test="request.deptName != null and request.deptName != ''">
             AND t1."DEPT_NAME" = ${r'#'}{request.deptName}
         </if>
+        <if test="request.startDate != null">
+            AND t1."CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  t1.${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="user">

src/main/resources/modules/SpringBoot/java/module/system/mpr/Oracle_UserRoleMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.roleCode != null and request.roleCode != ''">
             AND "ROLE_CODE" = ${r'#'}{request.roleCode}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="userRole">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DeptMapper.xml

@@ -51,6 +51,12 @@
         <if test="request.valid != null">
             AND VALID = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="dept">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictItemMapper.xml

@@ -44,6 +44,12 @@
         <if test="request.valid != null">
             AND VALID = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="dictItem">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictMapper.xml

@@ -40,6 +40,12 @@
         <if test="request.valid != null">
             AND VALID = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="dict">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_FileMapper.xml

@@ -46,6 +46,12 @@
         <if test="request.attribute2 != null and request.attribute2 != ''">
             AND ATTRIBUTE2 = ${r"#"}{request.attribute2}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="file">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_LogErrMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.logErrResult != null and request.logErrResult != ''">
             AND LOG_ERR_RESULT = ${r"#"}{request.logErrResult}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="logErr">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ProfilesMapper.xml

@@ -36,6 +36,12 @@
         <if test="request.key != null and request.key != ''">
             AND KEY = ${r"#"}{request.key}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="profiles">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml

@@ -59,6 +59,12 @@
         <if test="request.valid != null">
             AND VALID = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="load" resultMap="res">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleMapper.xml

@@ -39,6 +39,12 @@
         <if test="request.comment != null and request.comment != ''">
             AND COMMENT = ${r"#"}{request.comment}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="role">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleResMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.resCode != null and request.resCode != ''">
             AND RES_CODE = ${r"#"}{request.resCode}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="roleRes">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_TaskSqlMapper.xml

@@ -45,6 +45,12 @@
         <if test="request.valid != null">
             AND VALID = ${r"#"}{request.valid}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="taskSql">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_TokensMapper.xml

@@ -75,6 +75,12 @@
         <if test="request.terminalInfo != null and request.terminalInfo != ''">
             AND TERMINAL_INFO = ${r"#"}{request.terminalInfo}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="tokens">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml

@@ -67,6 +67,12 @@
         <if test="request.deptName != null and request.deptName != ''">
             AND t1."DEPT_NAME" = ${r'#'}{request.deptName}
         </if>
+        <if test="request.startDate != null">
+            AND t1."CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND t1.${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="user">

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserRoleMapper.xml

@@ -43,6 +43,12 @@
         <if test="request.roleCode != null and request.roleCode != ''">
             AND ROLE_CODE = ${r"#"}{request.roleCode}
         </if>
+        <if test="request.startDate != null">
+            AND "CREATE_TIME" >= ${r"#"}{request.startDate}
+        </if>
+        <if test="request.endDate != null">
+            AND  ${r"#"}{request.endDate} >= "CREATE_TIME"
+        </if>
     </select>
 
     <select id="search" resultMap="userRole">

src/main/resources/modules/SpringBoot/java/module/system/req/DeptFindRequest.java

@@ -2,6 +2,8 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseFindRequest;
 
+import java.util.Date;
+
 /**
  * DeptFindRequest -  部门查询
  *
@@ -41,6 +43,16 @@ public class DeptFindRequest extends BaseFindRequest {
      */
     private Boolean valid;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getDeptCode() {
         return this.deptCode;
     }
@@ -88,4 +100,20 @@ public class DeptFindRequest extends BaseFindRequest {
     public void setValid(Boolean valid) {
         this.valid = valid;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/DictFindRequest.java

@@ -2,6 +2,8 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseFindRequest;
 
+import java.util.Date;
+
 /**
  * DictFindRequest -  字典查询
  *
@@ -30,6 +32,16 @@ public class DictFindRequest extends BaseFindRequest {
      */
     private Boolean valid;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public Long getId() {
         return id;
     }
@@ -61,4 +73,20 @@ public class DictFindRequest extends BaseFindRequest {
     public void setValid(Boolean valid) {
         this.valid = valid;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/DictItemFindRequest.java

@@ -2,6 +2,8 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseFindRequest;
 
+import java.util.Date;
+
 /**
  * DictItemFindRequest -  字典项查询
  *
@@ -41,6 +43,16 @@ public class DictItemFindRequest extends BaseFindRequest {
      */
     private Boolean valid;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public Long getId() {
         return id;
     }
@@ -88,4 +100,20 @@ public class DictItemFindRequest extends BaseFindRequest {
     public void setValid(Boolean valid) {
         this.valid = valid;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/FileFindRequest.java

@@ -3,6 +3,8 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
+import java.util.Date;
+
 /**
  * FileFindRequest -  文件查询
  *
@@ -33,6 +35,16 @@ public class FileFindRequest extends BaseFindRequest {
      */
     private String attribute2;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getName() {
         return this.name;
     }
@@ -64,4 +76,20 @@ public class FileFindRequest extends BaseFindRequest {
     public void setAttribute2(String attribute2) {
         this.attribute2 = attribute2;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/LogErrFindRequest.java

@@ -3,6 +3,8 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
+import java.util.Date;
+
 /**
  * LogErrFindRequest - 错误日志查询
  *
@@ -29,6 +31,16 @@ public class LogErrFindRequest extends BaseFindRequest {
     @Dict(name = "LOG_ERR_RESULT")
     private String logErrResult;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getLogErrType() {
         return this.logErrType;
     }
@@ -52,4 +64,20 @@ public class LogErrFindRequest extends BaseFindRequest {
     public void setLogErrResult(String logErrResult) {
         this.logErrResult = logErrResult;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/ProfilesFindRequest.java

@@ -2,6 +2,8 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseFindRequest;
 
+import java.util.Date;
+
 /**
  * ProfilesFindRequest - 系统配置查询
  *
@@ -21,6 +23,16 @@ public class ProfilesFindRequest extends BaseFindRequest {
      */
     private String key;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getActive() {
         return this.active;
     }
@@ -36,4 +48,20 @@ public class ProfilesFindRequest extends BaseFindRequest {
     public void setKey(String key) {
         this.key = key;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/ResFindRequest.java

@@ -3,6 +3,8 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
+import java.util.Date;
+
 /**
  * ResFindRequest -  资源查询
  *
@@ -53,6 +55,16 @@ public class ResFindRequest extends BaseFindRequest {
      */
     private Boolean valid;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getResCode() {
         return this.resCode;
     }
@@ -116,4 +128,20 @@ public class ResFindRequest extends BaseFindRequest {
     public void setValid(Boolean valid) {
         this.valid = valid;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/RoleFindRequest.java

@@ -2,6 +2,8 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseFindRequest;
 
+import java.util.Date;
+
 /**
  * RoleFindRequest -  角色查询
  *
@@ -26,6 +28,16 @@ public class RoleFindRequest extends BaseFindRequest {
      */
     private String comment;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getCode() {
         return this.code;
     }
@@ -49,4 +61,20 @@ public class RoleFindRequest extends BaseFindRequest {
     public void setComment(String comment) {
         this.comment = comment;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/RoleResFindRequest.java

@@ -2,6 +2,8 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseFindRequest;
 
+import java.util.Date;
+
 /**
  * RoleResFindRequest -  角色资源关系查询
  *
@@ -31,6 +33,16 @@ public class RoleResFindRequest extends BaseFindRequest {
      */
     private String resCode;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public Long getRoleId() {
         return this.roleId;
     }
@@ -62,4 +74,20 @@ public class RoleResFindRequest extends BaseFindRequest {
     public void setResCode(String resCode) {
         this.resCode = resCode;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/TaskSqlFindRequest.java

@@ -3,6 +3,8 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
+import java.util.Date;
+
 /**
  * TaskSqlFindRequest - SQL任务查询
  *
@@ -33,6 +35,16 @@ public class TaskSqlFindRequest extends BaseFindRequest {
      */
     private Boolean valid;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getTaskName() {
         return this.taskName;
     }
@@ -64,4 +76,20 @@ public class TaskSqlFindRequest extends BaseFindRequest {
     public void setValid(Boolean valid) {
         this.valid = valid;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/TokensFindRequest.java

@@ -4,6 +4,8 @@ import ${basePackage}.frame.base.BaseFindRequest;
 import java.util.Date;
 import ${basePackage}.frame.validation.Dict;
 
+import java.util.Date;
+
 /**
  * TokensFindRequest -  通行证查询
  *
@@ -74,6 +76,16 @@ public class TokensFindRequest extends BaseFindRequest {
      */
     private String terminalInfo;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getToken() {
         return this.token;
     }
@@ -169,4 +181,20 @@ public class TokensFindRequest extends BaseFindRequest {
     public void setTerminalInfo(String terminalInfo) {
         this.terminalInfo = terminalInfo;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/UserFindRequest.java

@@ -3,6 +3,8 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
+import java.util.Date;
+
 /**
  * UserFindRequest -  用户查询
  *
@@ -48,6 +50,16 @@ public class UserFindRequest extends BaseFindRequest {
      */
     private String deptName;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public String getUserName() {
         return this.userName;
     }
@@ -103,4 +115,20 @@ public class UserFindRequest extends BaseFindRequest {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/java/module/system/req/UserRoleFindRequest.java

@@ -2,6 +2,8 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseFindRequest;
 
+import java.util.Date;
+
 /**
  * UserRoleFindRequest -  用户角色授权查询
  *
@@ -31,6 +33,16 @@ public class UserRoleFindRequest extends BaseFindRequest {
      */
     private String roleCode;
 
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
     public Long getUserId() {
         return this.userId;
     }
@@ -62,4 +74,20 @@ public class UserRoleFindRequest extends BaseFindRequest {
     public void setRoleCode(String roleCode) {
         this.roleCode = roleCode;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl

@@ -110,7 +110,7 @@
         var fd = new FormData();
         fd.append("file", data.data);
         data.data = fd;
-        return uploadService.request(data)
+        return importService.request(data)
                 .then(function (response) {
                     nav.tipClose();
                     if (!response.data) {
@@ -324,7 +324,9 @@
                 }.bind(this))
             },
             onExport: function () {
-                new Ajax(this.module, this.target).method("exports").post(this.vm, function (response) {
+                var req = JSON.parse(JSON.stringify(this.vm));
+                req.pageSize = 0;
+                new Ajax(this.module, this.target).method("exports").post(req, function (response) {
                     if (response.errors.length > 0) {
                         nav.e(response.errors[0].message);
                     }

src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl

@@ -65,6 +65,12 @@
         </#if>
     </#if>
 </#list>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -339,6 +345,9 @@
                 ${item.getFName()}: "",
 </#if>
 </#list>
+                startDate: '',
+                endDate: '',
+                pageNumber: 1,
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl

@@ -27,6 +27,12 @@
                             <el-radio :label="false">否</el-radio>
                         </el-radio-group>
                     </el-form-item>
+                    <el-form-item label="开始日期" prop="startDate">
+                        <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="结束日期" prop="endDate">
+                        <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+                    </el-form-item>
                     <el-form-item>
                         <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                         <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置
@@ -243,6 +249,8 @@
                 supCode: "",
                 supName: "",
                 valid: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl

@@ -14,6 +14,12 @@
                     <el-radio :label="false">否</el-radio>
                 </el-radio-group>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -173,6 +179,8 @@
                 dictName: '',
                 dictComment: '',
                 valid: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl

@@ -17,6 +17,12 @@
                     <el-radio :label="false">否</el-radio>
                 </el-radio-group>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -169,6 +175,8 @@
                 key: '',
                 value: '',
                 valid: '',
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl

@@ -15,6 +15,12 @@
             <el-form-item label="扩展属性2" prop="attribute2">
                 <el-input v-model="vm.attribute2" clearable size="mini" placeholder="请输入扩展属性2"></el-input>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -165,6 +171,8 @@
                 fileType: "",
                 attribute1: "",
                 attribute2: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl

@@ -12,6 +12,12 @@
                 <el-input-dict v-model="vm.logErrResult" clearable size="mini" placeholder="请输入处理结果"
                                dict-name="LOG_ERR_RESULT"></el-input-dict>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -139,6 +145,8 @@
                 logAttr1: "",
                 logAttr2: "",
                 logAttr3: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/profiles.ftl

@@ -7,6 +7,12 @@
             <el-form-item label="键" prop="key">
                 <el-input v-model="vm.key" clearable size="mini" placeholder="请输入键"></el-input>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -147,6 +153,8 @@
             vm: {//条件及分页参数
                 active: "",
                 key: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl

@@ -30,6 +30,12 @@
                             <el-radio :label="false">否</el-radio>
                         </el-radio-group>
                     </el-form-item>
+                    <el-form-item label="开始日期" prop="startDate">
+                        <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="结束日期" prop="endDate">
+                        <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+                    </el-form-item>
                     <el-form-item>
                         <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                         <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置
@@ -265,6 +271,8 @@
                 resValue: "",
                 free: "",
                 valid: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl

@@ -10,6 +10,12 @@
             <el-form-item label="角色描述" prop="comment">
                 <el-input v-model="vm.comment" clearable size="mini" placeholder="请输入角色描述"></el-input>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -168,6 +174,8 @@
                 code: "",
                 name: "",
                 comment: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/taskSql.ftl

@@ -16,6 +16,12 @@
                     <el-radio :label="false">否</el-radio>
                 </el-radio-group>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -196,6 +202,8 @@
                 taskNote: "",
                 taskType: "",
                 valid: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl

@@ -30,6 +30,12 @@
             <el-form-item label="终端类型" prop="terminalType">
                 <el-input-dict v-model="vm.terminalType" clearable size="mini" placeholder="请输入终端类型" dict-name="TERMINAL_TYPE"></el-input-dict>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -187,6 +193,8 @@
                 terminalType: "",
                 terminalIp: "",
                 terminalInfo: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl

@@ -17,6 +17,12 @@
             <el-form-item label="所属部门" prop="deptCode">
                 <el-input-dept v-model="vm.deptCode" clearable size="mini" placeholder="请选择所属部门"></el-input-dept>
             </el-form-item>
+            <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+                <el-input v-model="vm.endDate" clearable size="mini" placeholder="请输入结束日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="mini" icon="el-icon-search" @click="onSearch">搜索</el-button>
                 <el-button type="warning" size="mini" icon="el-icon-refresh-left" @click="onReset('vm')">重置</el-button>
@@ -189,6 +195,8 @@
                 userAlias: "",
                 userStatus: "",
                 deptCode: "",
+                startDate: '',
+                endDate: '',
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,