FengChaoYu 9 месяцев назад
Родитель
Сommit
3b274fd2b4

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

@@ -89,7 +89,7 @@ public interface DailyMapper {
                                               @Param("adminWebsitIds") List<String> adminWebsitIds);
 
     IPage<DailyWorkerIssueSalaryBean> workerDetailList(Page page,
-                                                       @Param("issueSalaryId") Integer issueSalaryId,
+                                                       @Param("issueSalaryId") String issueSalaryId,
                                                        @Param("companyWechatIds") List<String> companyWechatIds,
                                                        @Param("adminWebsitIds") List<String> adminWebsitIds);
 

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

@@ -443,7 +443,7 @@ public class DailyImportSummaryController {
     public ResponseHelper<IPage<DailyWorkerIssueSalaryBean>> workerDetailList(
             @ApiParam(required = true, value = "页号") @RequestParam Integer pageNo,
             @ApiParam(required = true, value = "页大小") @RequestParam Integer pageSize,
-            @ApiParam(required = true, value = "日结记录ID") @RequestParam Integer issueSalaryId
+            @ApiParam(required = true, value = "日结记录ID") @RequestParam String issueSalaryId
 
     ) {
         IPage<DailyWorkerIssueSalaryBean> page = dailyImportSummaryLogic.workerDetailList(issueSalaryId, pageNo, pageSize);

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

@@ -1321,7 +1321,7 @@ public class DailyImportSummaryLogic {
         return excelData;
     }
 
-    public IPage<DailyWorkerIssueSalaryBean> workerDetailList(Integer issueSalaryId, Integer pageNum, Integer pageSize) {
+    public IPage<DailyWorkerIssueSalaryBean> workerDetailList(String issueSalaryId, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         return dailyMapper.workerDetailList(new Page(pageNum, pageSize), issueSalaryId, adminUser.getCompanyWechatIds(), adminUser.getAdminWebsitIds());
     }