优化代码

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -2214,7 +2214,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
 
         Calendar calendarEndTime = Calendar.getInstance();
         calendarEndTime.setTime(endTime);
-        calendarEndTime.set(Calendar.DAY_OF_MONTH,1);
+        //calendarEndTime.set(Calendar.DAY_OF_MONTH,1);
 
 
         Calendar calendarOrate = Calendar.getInstance();

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

@@ -289,7 +289,14 @@ public class DataFeeManualCollectionAdapt implements IExportDataAdapt {
             cell1.setCellValue(squarePrice);
             cell1.setCellStyle(cellStyle);
             cell2 = row.createCell(2);
+            //todo 不能只展示面积
             cell2.setCellValue(roomDto.getBuiltUpArea());
+            if (!StringUtil.isEmpty(feeObj.getString("curDegrees"))) {
+                BigDecimal degrees = new BigDecimal(feeObj.getString("curDegrees"))
+                        .subtract(new BigDecimal(feeObj.getString("preDegrees")));
+                cell2.setCellValue(degrees.doubleValue());
+            }
+
             cell2.setCellStyle(cellStyle);
             cell3 = row.createCell(3);
             if (feeObj.containsKey("curDegrees")) {

springboot/src/main/resources/application-dev.yml

@@ -26,20 +26,6 @@ spring:
       max-idle: 50
       min-idle: 20
       timeout: 0
-# 集群模式
-#  redis:
-#    timeout: 5000
-#    database: 0
-#    password: hc
-#    cluster:
-#      nodes: 148.70.139.121:7000,148.70.139.121:7001,148.70.139.121:7002,148.70.139.121:7003,148.70.139.121:7004,148.70.139.121:7005
-#      max-redirects: 3
-#    jedis:
-#      pool:
-#        max-active: 8
-#        max-wait: -1
-#        max-idle: 8
-#        min-idle: 0
 
   activiti:
     database-schema-update: false