费用报销修改

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

@@ -79,6 +79,8 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
     WxCorpInfoMapper wxCorpInfoMapper;
     @Resource
     ExcelExportService excelExportService;
+    @Resource
+    UserCustomMapper userCustomMapper;
 
     @Resource
     private ProjectMapper projectMapper;
@@ -471,6 +473,7 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
             boolean isSecret = timeType.getIsSecretSalary()==1?true:false;
             final List<FinanceTblcuscol> cusColList = financeTblcuscolMapper.selectList(new QueryWrapper<FinanceTblcuscol>().eq("company_id", companyId));
             List<Project> allProjects = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", companyId));
+            List<UserCustom> userCustoms = userCustomMapper.selectList(new QueryWrapper<UserCustom>().eq("company_id", companyId));
             Map<String, Object> resultMap = new HashMap<>();
             double totalCostTime = 0;
             BigDecimal totalMoneyCost = BigDecimal.valueOf(0);
@@ -495,13 +498,15 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                 headList.add(MessageUtils.message("entry.projectName"));
                 //headList.add("人员");
                 headList.add(MessageUtils.message("entry.personnel"));
+                for (UserCustom userCustom : userCustoms) {
+                    headList.add(userCustom.getName());
+                }
                 //headList.add("工时(h)");
                 headList.add(MessageUtils.message("entry.workHours")+"(h)");
             } else {
                 //headList.add("项目分类");
                 headList.add(MessageUtils.message("entry.projectType"));
             }
-
             FinanceFixedcolname fixedItem = financeFixedcolnameService.getFixed(companyId);
             headList.add(fixedItem.getMonthCost()+"(元)");
             headList.add(fixedItem.getBonus()+"(元)");
@@ -847,6 +852,7 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                     rowData.add(p.projectCode);
                     rowData.add(p.project);
                     rowData.add("");
+                    userCustoms.forEach(userCustom -> {rowData.add("");});
                     rowData.add(p.workingTime+"");
                     rowData.add(p.salary.toPlainString());
                     rowData.add(p.bonus.toPlainString());
@@ -903,6 +909,25 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                             }else {
                                 membRowData.add(us.getName());
                             }
+                            for (int i = 0; i < userCustoms.size(); i++) {
+                                switch (i){
+                                    case 0:
+                                        membRowData.add(us.getPlate1()==null?"":us.getPlate1());
+                                        break;
+                                    case 1:
+                                        membRowData.add(us.getPlate2()==null?"":us.getPlate2());
+                                        break;
+                                    case 2:
+                                        membRowData.add(us.getPlate3()==null?"":us.getPlate3());
+                                        break;
+                                    case 3:
+                                        membRowData.add(us.getPlate4()==null?"":us.getPlate4());
+                                        break;
+                                    case 4:
+                                        membRowData.add(us.getPlate5()==null?"":us.getPlate5());
+                                        break;
+                                }
+                            }
                             membRowData.add(workingTime+"");
                             membRowData.add(salary.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
                             membRowData.add(bonus.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
@@ -1076,6 +1101,7 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
             if (groupByCategory == 0) {
                 sumRow.add("");
                 sumRow.add("");
+                userCustoms.forEach(userCustom ->{sumRow.add("");});
                 sumRow.add(""+totalCostTime);
             }
             sumRow.add(totalSalary.toString());