Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/service/impl/CostCostingGroupServiceImpl.java

@@ -343,16 +343,16 @@ public class CostCostingGroupServiceImpl extends ServiceImpl<CostCostingGroupMap
                     BigDecimal combined = new BigDecimal(data.get(data.size() - 1).toString());
                     if (!BigDecimal.ZERO.equals(combined) && NumberConstant.ZERO.equals(emptyStatus)) {
                         // 这条数据是保存到其他责任中心的
-                        CostCostingGroup costCostingGroup = costCostingGroupRequest;
-                        AfterCostGroup afterCostGroup = BeanUtil.convertObj(afterCostGroupRequest, AfterCostGroup.class);
+                        CostCostingGroup costCostingGroup = BeanUtil.convertObj(afterCostGroupRequest, CostCostingGroup.class);
+//                        AfterCostGroup afterCostGroup = BeanUtil.convertObj(afterCostGroupRequest, AfterCostGroup.class);
                         // TODO 设置其他责任中心
                         Responsibility responsibilityServiceOne = responsibilityService.getOne(new QueryWrapper<Responsibility>().lambda().eq(Responsibility::getHospId, UserContext.getHospId()).eq(Responsibility::getIsDefault, NumberConstant.ONE));
                         if (Objects.nonNull(responsibilityServiceOne)) {
                             costCostingGroup.setResponsibilityCode(responsibilityServiceOne.getResponsibilityCode());
                             costCostingGroup.setResponsibilityName(responsibilityServiceOne.getResponsibilityName());
                             // 设置统计数据
-                            afterCostGroup.setOtherResponsibilityCode(responsibilityServiceOne.getResponsibilityCode());
-                            afterCostGroup.setOtherResponsibilityName(responsibilityServiceOne.getResponsibilityName());
+//                            afterCostGroup.setOtherResponsibilityCode(responsibilityServiceOne.getResponsibilityCode());
+//                            afterCostGroup.setOtherResponsibilityName(responsibilityServiceOne.getResponsibilityName());
                         } else {
                             IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
                             incomeErrorMessage.setTotal(row);
@@ -368,7 +368,7 @@ public class CostCostingGroupServiceImpl extends ServiceImpl<CostCostingGroupMap
                         costCostingGroup.setCreateTime(System.currentTimeMillis());
                         costCostingGroup.setDateYear(year);
                         costCostingGroup.setDateMonth(month);
-                        afterCostGroup.setAmount(combined);
+//                        afterCostGroup.setAmount(combined);
 //                    String s = -JsonUtil.toJSONString(afterCostGroup);
                         String s = JacksonUtil.obj2Str(combined);
                         costCostingGroup.setAfterCostGroup(s);
@@ -392,10 +392,10 @@ public class CostCostingGroupServiceImpl extends ServiceImpl<CostCostingGroupMap
                                         costCostingGroup.setDepartmentName(departmentName);
                                         costCostingGroup.setResponsibilityCode(responsibility.getResponsibilityCode());
                                         costCostingGroup.setResponsibilityName(responsibility.getResponsibilityName());
-                                        afterCostGroup.setResponsibilityCode(responsibility.getResponsibilityCode());
-                                        afterCostGroup.setResponsibilityName(responsibility.getResponsibilityName());
-                                        afterCostGroup.setDepartmentCode(departmentCode);
-                                        afterCostGroup.setDepartmentName(departmentName);
+//                                        afterCostGroup.setResponsibilityCode(responsibility.getResponsibilityCode());
+//                                        afterCostGroup.setResponsibilityName(responsibility.getResponsibilityName());
+//                                        afterCostGroup.setDepartmentCode(departmentCode);
+//                                        afterCostGroup.setDepartmentName(departmentName);
                                     } else {
                                         IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
                                         incomeErrorMessage.setTotal(j);
@@ -421,8 +421,8 @@ public class CostCostingGroupServiceImpl extends ServiceImpl<CostCostingGroupMap
                             costCostingGroup.setDateMonth(month);
                             afterCostGroup.setAmount(new BigDecimal((Objects.isNull(data.get(j)) || "0".equals(data.get(j).toString())) ? "0.00" : data.get(j).toString()));
 //                        String s = JsonUtil.toJSONString(afterCostGroup);
-                            String s = JacksonUtil.obj2Str(afterCostGroup);
-                            costCostingGroup.setAfterCostGroup(s);
+//                            String s = JacksonUtil.obj2Str(afterCostGroup);
+//                            costCostingGroup.setAfterCostGroup(s);
                             costCostingGroupArrayList.add(costCostingGroup);
                         }
                     }