Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/CostCostingGroupMapper.xml

@@ -53,10 +53,10 @@
         and ccg.date_month = #{month}
         and ccg.hosp_id = #{hospId}
         <if test="responsibilityCode != null and responsibilityCode != ''">
-            and responsibility_code = #{responsibilityCode}
+            and ccg.responsibility_code = #{responsibilityCode}
         </if>
         <if test="accountCode != null and accountCode != ''">
-            and account_code #{accountCode}
+            and ccg.account_code #{accountCode}
         </if>
         and sd.delete_time = 0
         and cr.delete_time = 0
@@ -79,10 +79,10 @@
         and ccg.date_month = #{month}
         and ccg.hosp_id = #{hospId}
         <if test="responsibilityCode != null and responsibilityCode != ''">
-            and responsibility_code = #{responsibilityCode}
+            and ccg.responsibility_code = #{responsibilityCode}
         </if>
         <if test="accountCode != null and accountCode != ''">
-            and account_code #{accountCode}
+            and ccg.account_code #{accountCode}
         </if>
         and sd.delete_time = 0
         and cr.delete_time = 0
@@ -104,10 +104,10 @@
         and ccg.date_month = #{month}
         and ccg.hosp_id = #{hospId}
         <if test="responsibilityCode != null and responsibilityCode != ''">
-            and responsibility_code = #{responsibilityCode}
+            and ccg.responsibility_code = #{responsibilityCode}
         </if>
         <if test="accountCode != null and accountCode != ''">
-            and account_code #{accountCode}
+            and ccg.account_code #{accountCode}
         </if>
         and sd.delete_time = 0
         and cr.delete_time = 0