no message

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -697,9 +697,12 @@ public interface CommonMapper {
      * 银行接口返回查询列表
      * @param page
      * @param zfireParamBean
+     * @param companyWechatIds
      * @return
      */
-    IPage<SettleDailyBankTransferRecordVO> transferList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
+    IPage<SettleDailyBankTransferRecordVO> transferList(Page page,
+                                                        @Param("ex") ZfireParamBean zfireParamBean,
+                                                        @Param("companyWechatIds") List<String> companyWechatIds);
 
     /**
      * 维修工单结算清单列表

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/DailyMapper.java

@@ -76,6 +76,7 @@ public interface DailyMapper {
                                               @Param("companyWechatIds") List<String> companyWechatIds,
                                               @Param("adminWebsitIds") List<String> adminWebsitIds);
 
+    @SqlParser(filter = true)
     IPage<DailySummaryDataBean> cwSummaryList(Page page,
                                               @Param("summaryBatchNo") String summaryBatchNo,
                                               @Param("summaryStartTime") String summaryStartTime,

mall-server-api/src/main/java/com/gree/mall/manager/controller/settle/repair/DailyImportSummaryController.java

@@ -340,7 +340,7 @@ public class DailyImportSummaryController {
 
     @GetMapping("/cw/list")
     @ApiOperation(value = "财务汇总发放管理-日结")
-    public ResponseHelper<IPage<DailySummaryDataBean>>  cwList(
+    public ResponseHelper<IPage<DailySummaryDataBean>> cwList(
             @ApiParam(required = true, value = "页号") @RequestParam Integer pageNo,
             @ApiParam(required = true, value = "页大小") @RequestParam Integer pageSize,
             @ApiParam(value = "汇总批次号") @RequestParam(required = false) String summaryBatchNo,
@@ -349,7 +349,7 @@ public class DailyImportSummaryController {
             @ApiParam(value = "发放时间段起始") @RequestParam(required = false) String issueStartTime,
             @ApiParam(value = "发放时间段结束") @RequestParam(required = false) String issueEndTime,
             @ApiParam(value = "发放状态1.未发放 2.已发放") @RequestParam(required = false) Integer status
-    ){
+    ) {
         IPage<DailySummaryDataBean> page = dailyImportSummaryLogic.cwSummaryList(summaryBatchNo, summaryStartTime, summaryEndTime,
                 issueStartTime, issueEndTime, status, pageNo, pageSize);
         return ResponseHelper.success(page);
@@ -394,7 +394,7 @@ public class DailyImportSummaryController {
     @ApiOperation(value = "结算网点汇总-日结")
     public ResponseHelper<List<DailySummaryDataBean>> summaryList(
             @ApiParam(required = true, value = "汇总批次号") @RequestParam String summaryBatchNo
-    ){
+    ) {
         List<DailySummaryDataBean> page = dailyImportSummaryLogic.summaryList(summaryBatchNo);
         return ResponseHelper.success(page);
     }
@@ -414,7 +414,7 @@ public class DailyImportSummaryController {
             @ApiParam(required = true, value = "页号") @RequestParam Integer pageNo,
             @ApiParam(required = true, value = "页大小") @RequestParam Integer pageSize
     ) {
-        IPage<SettleDailyIssueSummaryRecord> page = dailyImportSummaryLogic.workerSummaryList(summaryBatchNo,summaryNumber,month, status, websiteName, serviceName, idCard, mobile,websiteNumber, pageNo, pageSize);
+        IPage<SettleDailyIssueSummaryRecord> page = dailyImportSummaryLogic.workerSummaryList(summaryBatchNo, summaryNumber, month, status, websiteName, serviceName, idCard, mobile, websiteNumber, pageNo, pageSize);
         return ResponseHelper.success(page);
     }
 
@@ -433,7 +433,7 @@ public class DailyImportSummaryController {
             HttpServletRequest request,
             HttpServletResponse response
     ) throws Exception {
-        IPage<SettleDailyIssueSummaryRecord> page = dailyImportSummaryLogic.workerSummaryList(summaryBatchNo,summaryNumber,month, status, websiteName, serviceName, idCard, mobile, websiteNumber,1, -1);
+        IPage<SettleDailyIssueSummaryRecord> page = dailyImportSummaryLogic.workerSummaryList(summaryBatchNo, summaryNumber, month, status, websiteName, serviceName, idCard, mobile, websiteNumber, 1, -1);
         ExcelData excelData = dailyImportSummaryLogic.workerSummaryExport(page.getRecords());
         ExcelUtils.exportExcel(request, response, "师傅日结发放记录.xlsx", excelData);
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/RepairSettleAccountLogic.java

@@ -278,7 +278,7 @@ public class RepairSettleAccountLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.supplyParam(zfireParamBean, DailyBankAccountVO.class, adminUser);
 
-        return commonMapper.transferList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
+        return commonMapper.transferList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminUser.getCompanyWechatIds());
     }
 
     public IPage<SettleDailyBankCardBalance> companyAccountList(Integer pageNo, Integer pageSize) {