Selaa lähdekoodia

添加是否月累计及审计月的标志控制

JammeyJiang 1 kuukausi sitten
vanhempi
commit
aa70eb8cda

+ 1 - 0
src/main/java/com/kcim/service/impl/CostDepartmentProfitServiceImpl.java

@@ -2161,6 +2161,7 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
                     response.setComputeDate(String.format("%s至%s", beginComputeDate, endComputeDate));
                     response.setProfitVoList(costProfitVos);
                     response.setAllowDrillDown(false);
+                    response.setMonthlyAccumulation(true);
                     responses.add(NumberConstant.ZERO,response);
                 }
                 return responses;

+ 7 - 0
src/main/java/com/kcim/service/impl/HospProfitAndLossServiceImpl.java

@@ -1587,10 +1587,15 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
             allCostProfitVo.addAll(costProfitVos);
             //生成出参样式
             BatchCostProfitResponse response = new BatchCostProfitResponse();
+            //第13月为审计月份
             if(hospProfitAndLossList.get(0).getDateMonth()==13){
                 response.setComputeDate(String.format("%s-%s", hospProfitAndLossList.get(0).getDateYear(), "12A"));
+                response.setAuditMonth(true);
+                response.setMonthlyAccumulation(false);
             }else {
                 response.setComputeDate(entry.getKey());
+                response.setAuditMonth(false);
+                response.setMonthlyAccumulation(false);
             }
             response.setProfitVoList(costProfitVos);
             response.setAllowDrillDown(false);
@@ -1605,6 +1610,8 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
                 response.setComputeDate(String.format("%s至%s", beginComputeDate, endComputeDate));
                 response.setProfitVoList(costProfitVos);
                 response.setAllowDrillDown(false);
+                response.setMonthlyAccumulation(true);
+                response.setAuditMonth(false);
                 responses.add(NumberConstant.ZERO,response);
             }
         }

+ 11 - 1
src/main/java/com/kcim/web/reponse/BatchCostProfitResponse.java

@@ -25,5 +25,15 @@ public class BatchCostProfitResponse {
     /**
      * 是否允许下钻
      */
-    private boolean allowDrillDown;
+    private boolean allowDrillDown=false;
+
+    /**
+     * 是否月累计
+     */
+    private boolean isMonthlyAccumulation=false;
+
+    /**
+     * 是否审计月
+     */
+    private boolean isAuditMonth=false;
 }