bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

月计划与月计划异常导出添加头部条件

This commit is contained in:
fl 2025-02-12 09:56:53 +08:00
parent 803298ae60
commit de8a9f61aa
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttDetailByMonthController.java
View File

@ -134,6 +134,7 @@ public class AttDetailByMonthController extends BaseController {
*/ */
@Resource(name = "attendanceDetailsService") @Resource(name = "attendanceDetailsService")
private AttendanceDetailsService attendanceDetailsService; private AttendanceDetailsService attendanceDetailsService;
@RequiresPermissions("att:detail:export") @RequiresPermissions("att:detail:export")
@GetMapping("/export") @GetMapping("/export")
public void export(HttpServletResponse response, AttDetailByMonthBean bean) { public void export(HttpServletResponse response, AttDetailByMonthBean bean) {
@ -207,6 +208,7 @@ public class AttDetailByMonthController extends BaseController {
AttDetailBean dayTable = new AttDetailBean(); AttDetailBean dayTable = new AttDetailBean();
dayTable.setStartDate(monthFirstAndLast.get(0)); dayTable.setStartDate(monthFirstAndLast.get(0));
dayTable.setEndDate(monthFirstAndLast.get(1)); dayTable.setEndDate(monthFirstAndLast.get(1));
dayTable.setName(bean.getName());
if (bean.getOrgId() != null) { if (bean.getOrgId() != null) {
dayTable.setOrgId(String.valueOf(bean.getOrgId())); dayTable.setOrgId(String.valueOf(bean.getOrgId()));
} else { } else {
@ -215,7 +217,6 @@ public class AttDetailByMonthController extends BaseController {
dayTable.setOrgList(bean.getOrgList()); dayTable.setOrgList(bean.getOrgList());
} }
} }
dayTable.setName(bean.getName());
headers.entrySet() headers.entrySet()
.forEach(entry -> { .forEach(entry -> {
if ("99".equals(entry.getKey())) { if ("99".equals(entry.getKey())) {

1
bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
View File

@ -727,7 +727,6 @@ public class ExportFileController {
dayTable.setOrgList(bean.getOrgList()); dayTable.setOrgList(bean.getOrgList());
} }
} }
dayTable.setName(bean.getUserName());
headers.entrySet() headers.entrySet()
.forEach(entry -> { .forEach(entry -> {
if ("99".equals(entry.getKey())) { if ("99".equals(entry.getKey())) {

3
bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
View File

@ -453,6 +453,9 @@
<if test="bean.userName != null and bean.userName != ''"> <if test="bean.userName != null and bean.userName != ''">
and locate(#{bean.userName},awa.user_name) and locate(#{bean.userName},awa.user_name)
</if> </if>
<if test="bean.orgId != null and bean.orgId != ''">
and so.id = #{bean.orgId}
</if>
<if test='bean.orgList != null and bean.orgList.size() > 0'> <if test='bean.orgList != null and bean.orgList.size() > 0'>
and so.id in ( and so.id in (
<foreach collection="bean.orgList" item="item" separator=","> <foreach collection="bean.orgList" item="item" separator=",">