wuxw il y a 1 an
Parent
commit
28f5842cfd

+ 3 - 3
service-job/src/main/java/com/java110/job/export/adapt/DataFeeManualCollectionAdapt.java

@@ -84,7 +84,7 @@ public class DataFeeManualCollectionAdapt implements IExportDataAdapt {
         feePrintSpecDto.setRow(1);
         List<FeePrintSpecDto> feePrintSpecDtos = feePrintSpecInnerServiceSMOImpl.queryFeePrintSpecs(feePrintSpecDto);
 
-        if (feePrintSpecDtos == null || feePrintSpecDtos.isEmpty()) {
+        if (ListUtil.isNull(feePrintSpecDtos)) {
             feePrintSpecDto = null;
         } else {
             feePrintSpecDto = feePrintSpecDtos.get(0);
@@ -106,7 +106,7 @@ public class DataFeeManualCollectionAdapt implements IExportDataAdapt {
         }
         for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) {
             //todo 有可能房屋下没有欠费
-            if (roomDtos.get(roomIndex).getFees() == null) {
+            if (ListUtil.isNull(roomDtos.get(roomIndex).getFees())) {
                 continue;
             }
             Map<String, Object> info = generatorRoomOweFee(sheet, workbook, roomDtos.get(roomIndex), line, totalPageHeight, patriarch, feePrintSpecDto);
@@ -367,7 +367,7 @@ public class DataFeeManualCollectionAdapt implements IExportDataAdapt {
     private RoomDto getTmpRoomDtos(RoomDto tmpRoomDto, String configIds, JSONObject reqJson) {
         FeeDto tmpFeeDto = null;
         tmpFeeDto = new FeeDto();
-        tmpFeeDto.setArrearsEndTime(DateUtil.getCurrentDate());
+       // tmpFeeDto.setArrearsEndTime(DateUtil.getCurrentDate());
         tmpFeeDto.setState(FeeDto.STATE_DOING);
         tmpFeeDto.setPayerObjId(tmpRoomDto.getRoomId());
         tmpFeeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);

+ 1 - 1
springboot/src/main/resources/application-debug.yml

@@ -29,7 +29,7 @@ spring:
   activiti:
     database-schema-update: false
   datasource:
-    url: jdbc:mysql://36.40.95.159:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://192.168.100.108:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
     username: TT
     password: hc12345678
     type: com.alibaba.druid.pool.DruidDataSource