Browse Source

no message

FengChaoYu 8 months ago
parent
commit
abb1ef626e

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/DailyTransferLogic.java

@@ -56,9 +56,9 @@ public class DailyTransferLogic {
             summaryNumberList = new ArrayList<>();
             List<Map<String, Object>> summaryMap;
             if (isMonth) {
-                summaryMap = dailyMapper.querySummaryMonthNumber(summaryBatchNo, adminUser.getAdminCompanyWechat().getCompanyWechatId());
+                summaryMap = dailyMapper.querySummaryMonthNumber(adminUser.getAdminCompanyWechat().getCompanyWechatId(), summaryBatchNo);
             } else {
-                summaryMap = dailyMapper.querySummaryNumber(summaryBatchNo, adminUser.getAdminCompanyWechat().getCompanyWechatId());
+                summaryMap = dailyMapper.querySummaryNumber(adminUser.getAdminCompanyWechat().getCompanyWechatId(), summaryBatchNo);
             }
 
             if (CollectionUtil.isEmpty(summaryMap)) {

+ 1 - 1
mall-server-api/src/main/resources/mapper/DailyMapper.xml

@@ -324,7 +324,7 @@
                 and  a.issue_salary_id = #{issueSalaryId}
             </if>
         </where>
-        GROUP BY a.worker_number
+        GROUP BY a.id, a.worker_number
     </select>
 
     <select id="cwSummaryMonthList" resultType="com.gree.mall.manager.bean.settle.repair.DailyNotMonthSummaryCountBean">