修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceServiceImpl.java

@@ -957,7 +957,17 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                     p.field1 = p.field1.setScale(2, BigDecimal.ROUND_HALF_UP);
                     p.field2 = p.field2.setScale(2, BigDecimal.ROUND_HALF_UP);
                     p.field3 = p.field3.setScale(2, BigDecimal.ROUND_HALF_UP);
-
+                    BigDecimal pActual=new BigDecimal(0).add(p.salary.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.bonus.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.allowance.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.old.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.medical.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.loseJob.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.injury.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.house.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.field1.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.field2.setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .add(p.field3.setScale(2, BigDecimal.ROUND_HALF_UP));
                     //组装写入excel文件的数据，从项目开始，项目下面挂成员
                     List<String> rowData = new ArrayList<String>();
                     rowData.add(p.projectCode);
@@ -982,7 +992,8 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                     if (cusColList.size() > 2) {
                         rowData.add(p.field3.toPlainString());
                     }
-                    rowData.add(p.cost.toPlainString());
+                    rowData.add(pActual.toPlainString());
+                    /*rowData.add(p.cost.toPlainString());*/
                     allList.add(rowData);
 
                     //获取成员
@@ -1040,25 +1051,37 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                                 }
                             }
                             membRowData.add(workingTime+"");
-                            membRowData.add(salary.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                            membRowData.add(bonus.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                            membRowData.add(allowance.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                            membRowData.add(old.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                            membRowData.add(medical.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                            membRowData.add(loseJob.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                            membRowData.add(injury.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                            membRowData.add(house.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            membRowData.add(salary.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            membRowData.add(bonus.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            membRowData.add(allowance.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            membRowData.add(old.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            membRowData.add(medical.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            membRowData.add(loseJob.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            membRowData.add(injury.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            membRowData.add(house.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                             //自定义字段
                             if (cusColList.size() > 0) {
-                                membRowData.add(field1.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                membRowData.add(field1.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                             }
                             if (cusColList.size() > 1) {
-                                membRowData.add(field2.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                membRowData.add(field2.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                             }
                             if (cusColList.size() > 2) {
-                                membRowData.add(field3.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                membRowData.add(field3.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                             }
-                            membRowData.add(cost.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                            BigDecimal actual=new BigDecimal(0).add(salary.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(bonus.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(allowance.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(old.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(medical.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(loseJob.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(injury.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(house.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(field1.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(field2.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                    .add(field3.setScale(2, BigDecimal.ROUND_HALF_UP));
+                            /*membRowData.add(cost.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());*/
+                            membRowData.add(actual.toPlainString());
                             allList.add(membRowData);
                         }
                     }
@@ -1118,25 +1141,37 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                                         }
                                     }
                                     membRowData.add(workingTime+"");
-                                    membRowData.add(salary.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                                    membRowData.add(bonus.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                                    membRowData.add(allowance.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                                    membRowData.add(old.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                                    membRowData.add(medical.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                                    membRowData.add(loseJob.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                                    membRowData.add(injury.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
-                                    membRowData.add(house.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    membRowData.add(salary.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    membRowData.add(bonus.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    membRowData.add(allowance.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    membRowData.add(old.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    membRowData.add(medical.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    membRowData.add(loseJob.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    membRowData.add(injury.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    membRowData.add(house.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                                     //自定义字段
                                     if (cusColList.size() > 0) {
-                                        membRowData.add(field1.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                        membRowData.add(field1.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                                     }
                                     if (cusColList.size() > 1) {
-                                        membRowData.add(field2.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                        membRowData.add(field2.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                                     }
                                     if (cusColList.size() > 2) {
-                                        membRowData.add(field3.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                        membRowData.add(field3.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                                     }
-                                    membRowData.add(cost.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
+                                    BigDecimal actual=new BigDecimal(0).add(salary.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(bonus.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(allowance.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(old.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(medical.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(loseJob.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(injury.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(house.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(field1.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(field2.setScale(2, BigDecimal.ROUND_HALF_UP))
+                                            .add(field3.setScale(2, BigDecimal.ROUND_HALF_UP));
+                                    /*membRowData.add(cost.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());*/
+                                    membRowData.add(actual.toPlainString());
                                     allList.add(membRowData);
                                 }
                             }