暂存代码

JobService/pom.xml

@@ -80,7 +80,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.java110.job.Java110JobserviceApplication</mainClass>
+                    <mainClass>com.java110.job.JobServiceApplication</mainClass>
                 </configuration>
             </plugin>
         </plugins>

JobService/src/main/java/com/java110/job/Java110JobserviceApplication.java

@@ -28,8 +28,8 @@ import java.nio.charset.Charset;
 @EnableDiscoveryClient
 @EnableFeignClients(basePackages = {"com.java110.core.smo.community"})
 @EnableScheduling
-public class Java110JobserviceApplication {
-    private static Logger logger = LoggerFactory.getLogger(Java110JobserviceApplication.class);
+public class JobServiceApplication {
+    private static Logger logger = LoggerFactory.getLogger(JobServiceApplication.class);
 
     private static final String LISTENER_PATH = "java110.job.listeners";
 
@@ -47,7 +47,7 @@ public class Java110JobserviceApplication {
     }
 
     public static void main(String[] args) throws Exception {
-        ApplicationContext context = SpringApplication.run(Java110JobserviceApplication.class, args);
+        ApplicationContext context = SpringApplication.run(JobServiceApplication.class, args);
         ServiceStartInit.initSystemConfig(context);
         //加载业务侦听
         // SystemStartLoadBusinessConfigure.initSystemConfig(LISTENER_PATH);

JobService/src/main/java/com/java110/job/controller/JobController.java

@@ -20,7 +20,7 @@ import java.util.Date;
  * 师延俊
  */
 @Controller
-@RequestMapping(path = "/HcFtpToFileSystemConfigList")
+@RequestMapping(path = "/job")
 public class JobController extends BaseController {
 
     private static final Logger logger = LoggerFactory.getLogger(JobController.class);

JobService/src/main/resources/dataSource.yml

@@ -1,9 +1,9 @@
 dataSources:
   ds0: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8
-    username: hc_community
-    password: hc_community@12345678
+    url: jdbc:mysql://139.199.97.195:3306/hc_community?useUnicode=true&characterEncoding=utf-8
+    username: demowinqi
+    password: bCYXJpfSyHKhKxye
     minIdle: 5
     validationQuery: SELECT 1 FROM DUAL
     initialSize: 5
@@ -22,9 +22,9 @@ dataSources:
 #    maintenanceIntervalMilliseconds: 30000
   ds1: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-    username: TT
-    password: TT@12345678
+    url: jdbc:mysql://139.199.97.195:3306/TT?useUnicode=true&characterEncoding=utf-8
+    username: demowinqi
+    password: bCYXJpfSyHKhKxye
     minIdle: 5
     validationQuery: SELECT 1 FROM DUAL
     initialSize: 5

java110-bean/src/main/java/com/java110/dto/fee/BillDto.java

@@ -17,6 +17,7 @@ public class BillDto extends PageDto implements Serializable {
     private String billId;
     private String billName;
     private String receivable;
+    private String curReceivable;
     private String receipts;
     private String billTime;
     private String communityId;
@@ -104,4 +105,12 @@ public class BillDto extends PageDto implements Serializable {
     public void setCurBill(String curBill) {
         this.curBill = curBill;
     }
+
+    public String getCurReceivable() {
+        return curReceivable;
+    }
+
+    public void setCurReceivable(String curReceivable) {
+        this.curReceivable = curReceivable;
+    }
 }

java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml

@@ -411,6 +411,9 @@
         <if test="receivable !=null and receivable != ''">
             and t.receivable= #{receivable}
         </if>
+        <if test="curReceivable !=null and curReceivable != ''">
+            and t.cur_receivable= #{curReceivable}
+        </if>
         <if test="receipts !=null">
             and t.receipts= #{receipts}
         </if>