java110 3 年 前
コミット
d65162883f

+ 4 - 4
java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml

@@ -187,10 +187,10 @@
         <if test="payTime !=null and payTime != ''">
             and t.pay_time= #{payTime}
         </if>
-        <if test="startTime !=null ">
+        <if test="startTime !=null  and startTime !=''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null ">
+        <if test="endTime !=null  and endTime !='' ">
             and t.create_time &lt;= #{endTime}
         </if>
         <if test="detailId !=null and detailId != ''">
@@ -495,10 +495,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null ">
+        <if test="startTime !=null  and startTime !=''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null ">
+        <if test="endTime !=null  and endTime !='' ">
             and t.create_time &lt;= #{endTime}
         </if>
     </select>

+ 4 - 4
springboot/pom.xml

@@ -165,10 +165,10 @@
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.quartz-scheduler</groupId>-->
+<!--            <artifactId>quartz</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>

+ 13 - 0
springboot/src/main/resources/java110.properties

@@ -2,3 +2,16 @@ java110.mappingPath=classpath:mapper/*/*.xml
 java110.testSwitch=ON
 
 
+# Single file max size
+java110.ftp.multipart.maxFileSize=100Mb
+# All files max size
+java110.ftp.multipart.maxRequestSize=100Mb
+
+#ftp use
+java110.ftpServer = 121.4.123.73
+java110.ftpPort = 6069
+java110.ftpUserName = hcftp
+java110.ftpUserPassword = 123456
+java110.ftpPath = hc/
+
+