分摊

src/main/java/common/controller/ContractController.java

@@ -452,14 +452,14 @@ public class ContractController {
                 sb.append(c.getMyBodyName())
                         .append(c.getCustomerBody())
                         .append(c.getContractCode())
-                        .append(df.format(c.getMoney()))
-                        .append(df.format(c.getIncomeExcludingTax() * 1.0 / 100))
+                        .append("\"").append(df.format(c.getMoney())).append("\"")
+                        .append("\"").append(df.format(c.getIncomeExcludingTax() * 1.0 / 100)).append("\"")
                         .append(c.getStartDate())
                         .append(c.getEndDate())
                         .append(c.getIntervalUseDays())
-                        .append(df.format(c.getIntervaIncomeShare() * 1.0 / 100))
-                        .append(c.getAdjustmentFund())
-                        .append(df.format(c.getIncomeShareAll() * 1.0 / 100))
+                        .append("\"").append(df.format(c.getIntervaIncomeShare() * 1.0 / 100)).append("\"")
+                        .append("\"").append(df.format(c.getAdjustmentFund())).append("\"")
+                        .append("\"").append(df.format(c.getIncomeShareAll() * 1.0 / 100)).append("\"")
                         .append("\r\n");
             }
         }

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -2348,11 +2348,16 @@ public class ContractServiceImpl implements ContractService {
             contracts = contractRepository.findShareContranctByDate(startDate, endDate, platform);
         }
 
+        List<ContractBody> bodies = contractBodyRepository.findAll();
+        Map<String, String> bodiesNameMap = bodies.stream().collect(
+                Collectors.toMap(ContractBody::getCode, ContractBody::getName, (v1, v2) -> v1));
+
         DecimalFormat decimalFormat = new DecimalFormat("###,###.00");
         contracts.forEach(v -> {
 
-            //以下结果统一 *100
+            v.setMyBodyName(bodiesNameMap.get(v.getMyBodyCode()));
 
+            //以下结果统一 *100
             //不含稅收入
 //            Long excludTax = v.getMoney() * 6 / 100;
             Long excludTax = (long) (v.getMoney() * 100 * 0.06);
@@ -2417,7 +2422,7 @@ public class ContractServiceImpl implements ContractService {
 //        System.out.println(Days.daysBetween(new DateTime(dateStr2), new DateTime(dateStr1)).getDays());
 
         System.out.println(10023L * 1.0 / 100);
-        System.out.println((129 * 100 / 111)*1.0/100);
+        System.out.println((129 * 100 / 111) * 1.0 / 100);
 
         System.out.println();