moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会薪资流水明细fixed

Browse Source
This commit is contained in:
hokli
2025-08-13 17:33:48 +08:00
parent b78f5afc1e
commit a027f4c4ba
7 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guildpolicy2/GuildPolicy2AdminService.java
View File

@@ -64,7 +64,7 @@ public class GuildPolicy2AdminService {
if (diamondWagePolicy2 == null) {
continue;
}
record.setAnchorMicSalary(diamondWagePolicy2.getAnchorMicSalary());
record.setAnchorDiamondSalary(diamondWagePolicy2.getAnchorDiamondSalary());
record.setOwnerSalary(diamondWagePolicy2.getOwnerSalary());
record.setAnchorMicSalary(diamondWagePolicy2.getAnchorMicSalary());
}

2
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guildpolicy/GuildPolicy2AdminController.java
View File

@@ -52,7 +52,7 @@ public class GuildPolicy2AdminController {
@ApiOperation(value = "查询公会成员薪资明细导出", httpMethod = "GET")
@GetMapping("/queryMemberExport")
public void queryMemberExport(HttpServletResponse response, Long ownerErbanNo, Integer guildId, Long erbanNo,
Integer partitionId, String startDate, String endDate) throws IOException {
@RequestParam(defaultValue = "8") Integer partitionId, String startDate, String endDate) throws IOException {
PageResult<GuildPolicy2MemberAdminVo> pageResult = guildPolicy2AdminService
.queryMemberPage(ownerErbanNo, guildId, erbanNo, partitionId, startDate, endDate, -1, -1);
response.setContentType("application/vnd.ms-excel");