Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/model/AfterIncomegroup.java

@@ -52,6 +52,23 @@ public class AfterIncomegroup implements Serializable {
      * 责任中心名称
      */
     private String responsibilityName;
+    /**
+     * 责任中心代码
+     */
+    private String openResponsibilityCode;
+    /**
+     * 责任中心名称
+     */
+    private String openResponsibilityName;
+    /**
+     * 责任中心代码
+     */
+    private String startResponsibilityCode;
+    /**
+     * 责任中心名称
+     */
+    private String startResponsibilityName;
+
     /**
      * 是直接还是间接 1直接 2 间接
      */

src/main/java/com/imed/costaccount/model/dto/CollectDTO.java

@@ -18,7 +18,7 @@ public class CollectDTO {
 
     private String  responsibilityCode;
 
-    private String accountingCode;
+    private String product;
 
     private Long hospId;
 }

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

@@ -405,6 +405,8 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         afterIncomegroup.setOpenDepartmentCode(openDepartmentCode);
                         afterIncomegroup.setOpenDepartmentName(openDepartmentName);
                         afterIncomegroup.setOpenDepartmentStatus(responsibility.getResponsibilityType());
+                        afterIncomegroup.setOpenResponsibilityCode(responsibility.getResponsibilityName());
+                        afterIncomegroup.setOpenResponsibilityName(responsibility.getResponsibilityName());
                     }
                 }
             } else {
@@ -438,6 +440,8 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         afterIncomegroup.setStartDepartmentCode(startDepartmentCode);
                         afterIncomegroup.setStartDepartmentName(startDepartmentName);
                         afterIncomegroup.setStartDepartmentStatus(responsibility.getResponsibilityType());
+                        afterIncomegroup.setStartResponsibilityCode(responsibility.getResponsibilityName());
+                        afterIncomegroup.setStartResponsibilityName(responsibility.getResponsibilityName());
                     }
                 }
             } else {
@@ -495,12 +499,6 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         afterIncomegroup.setResponsibilityCode(responsibility.getResponsibilityCode());
                         afterIncomegroup.setResponsibilityName(responsibility.getResponsibilityName());
                     }
-                }else if (NumberConstant.ONE.equals(openDepartmentStatus) && NumberConstant.TWO.equals(startDepartmentStatus)){
-                    afterIncomegroup.setResponsibilityCode(costIncomeGroup.getOpenResponsibilityCode());
-                    afterIncomegroup.setResponsibilityName(costIncomeGroup.getOpenResponsibilityName());
-                }if (NumberConstant.TWO.equals(openDepartmentStatus) && NumberConstant.ONE.equals(startDepartmentStatus)){
-                    afterIncomegroup.setResponsibilityCode(costIncomeGroup.getStartResponsibilityCode());
-                    afterIncomegroup.setResponsibilityName(costIncomeGroup.getStartResponsibilityName());
                 }
                 costIncomeGroup.setAfterIncomeGroup(JSON.toJSONString(afterIncomegroup));
             }

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

@@ -121,7 +121,7 @@ public class IncomeCollectionServiceImpl
                 );
                 // 根据会计科目和成本项目归纳所有数据
                 Map<String, List<CostIncomeGroup>> collectMap = costIncomeGroups.stream()
-                        .collect(Collectors.groupingBy(i -> i.getAccountCode() + "cost" + i.getProductCode()));
+                        .collect(Collectors.groupingBy(i -> i.getOpenDepartmentCode() + "cost" + i.getStartDepartmentCode() + "cost" + i.getProductCode()));
 
                 // 遍历map 组装成List保存
                 List<IncomeCollection> list = new LinkedList<>();
@@ -248,7 +248,7 @@ public class IncomeCollectionServiceImpl
         }
 
         // 所有的数据格式
-        List<CodeAndNameVO> realData = this.baseMapper.getAccount(hospId, collectDTO.getAccountingCode(), date);
+        List<CodeAndNameVO> realData = this.baseMapper.getAccount(hospId, collectDTO.getProduct(), date);
         if (realData.isEmpty()) {
             return new CollectDataFormVO();
         }

src/main/resources/mapper/IncomeCollectionMapper.xml

@@ -33,8 +33,8 @@
         <if test="collectDTO.responsibilityCode != null and collectDTO.responsibilityCode != ''">
             and responsibility_code = #{collectDTO.responsibilityCode}
         </if>
-        <if test="collectDTO.accountingCode != null and collectDTO.accountingCode != ''">
-            and accounting_code = #{collectDTO.accountingCode}
+        <if test="collectDTO.productCode != null and collectDTO.productCode != ''">
+            and product_code = #{collectDTO.productCode}
         </if>
         limit #{collectDTO.current},#{collectDTO.pageSize};
     </select>
@@ -48,8 +48,8 @@
         <if test="collectDTO.responsibilityCode != null and collectDTO.responsibilityCode != ''">
             and responsibility_code = #{collectDTO.responsibilityCode}
         </if>
-        <if test="collectDTO.accountingCode != null and collectDTO.accountingCode != ''">
-            and accounting_code = #{collectDTO.accountingCode}
+        <if test="collectDTO.productCode != null and collectDTO.productCode != ''">
+            and product_code = #{collectDTO.productCode}
         </if>
     </select>
 
@@ -62,8 +62,8 @@
         <if test="collectDTO.responsibilityCode != null and collectDTO.responsibilityCode != ''">
             and responsibility_code = #{collectDTO.responsibilityCode}
         </if>
-        <if test="collectDTO.accountingCode != null and collectDTO.accountingCode != ''">
-            and accounting_code = #{collectDTO.accountingCode}
+        <if test="collectDTO.productCode != null and collectDTO.productCode != ''">
+            and product_code = #{collectDTO.productCode}
         </if>
     </select>
 
@@ -93,8 +93,8 @@
     <select id="getAccount" resultType="com.imed.costaccount.model.vo.CodeAndNameVO">
         select accounting_code as code ,accounting_name as name from cost_income_collection
         where delete_time = 0 and hosp_id = #{hospId}
-        <if test="accountingCode != null and accountingCode != ''">
-            and accounting_code = #{accountingCode}
+        <if test="productCode != null and productCode != ''">
+            and product_code = #{productCode}
         </if>
         <if test="date != null and date != ''">
             and `year` = YEAR(concat(#{date},'01')) and `month` = MONTH(concat(#{date},'01'))