From 892e5a07fcf11f6acfd813d7be182c1f84d161cf Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 4 Jun 2025 16:42:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8C=85=E6=B4=BB=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkOrderBaohuoController.java | 19 +++++++++++-------- .../pay/domain/bo/PayWorkOrderBaohuoBo.java | 1 + .../ruoyi/pay/domain/vo/ExportBaohuoVo.java | 2 ++ .../pay/domain/vo/PayWorkOrderBaohuoVo.java | 4 ++-- .../pay/mapper/PayWorkOrderBaohuoMapper.java | 3 ++- .../service/IPayWorkOrderBaohuoService.java | 3 ++- .../impl/PayWorkOrderBaohuoServiceImpl.java | 4 ++-- .../mapper/pay/PayWorkOrderBaohuoMapper.xml | 9 +++++++-- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java index 5153e72..cc864fb 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java @@ -2,14 +2,14 @@ package com.ruoyi.pay.controller; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Arrays; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.TimeUnit; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.pay.domain.PaySalaryReport; +import com.ruoyi.pay.domain.vo.ExportBaohuoVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -69,7 +69,7 @@ public class PayWorkOrderBaohuoController extends BaseController { @GetMapping("/sum") public R> sum(@RequestParam(name = "date")String date, @RequestParam(name = "deptId", required = false) Long deptId, - @RequestParam(name = "tenantId", required = true) Long tenantId + @RequestParam(name = "tenantId") Long tenantId ) { return iPayWorkOrderBaohuoService.baohuoSum(date, deptId,tenantId); } @@ -80,13 +80,16 @@ public class PayWorkOrderBaohuoController extends BaseController { @SaCheckPermission("pay:workOrderBaohuo:export") @Log(title = "包活派工单", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(PayWorkOrderBaohuoBo bo, HttpServletResponse response) { - List list = iPayWorkOrderBaohuoService.getWorkOrderListByDate(bo.getExportDate()); + public void export(@RequestParam(name = "exportDate") String exportDate, + @RequestParam(name = "tenantId") Long tenantId, HttpServletResponse response) throws ParseException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + Date exportDate1 = sdf.parse(exportDate); + List list = iPayWorkOrderBaohuoService.getWorkOrderListByDate(tenantId,exportDate1); list.stream().parallel().forEach(vo -> { vo.setAvgAmount(vo.getAmount().divide(new BigDecimal(vo.getWorkerNum()), 2, RoundingMode.HALF_UP)); vo.setWorkTime(vo.getWorkTime().divide(new BigDecimal(vo.getWorkerNum()), 2,RoundingMode.HALF_UP)); }); - ExcelUtil.exportExcel(list, "包活派工单", PayWorkOrderBaohuoVo.class, response); + ExcelUtil.exportExcel(list, "包活派工单", ExportBaohuoVo.class, response); } /** diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java index 75e3d23..0b9a19b 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java @@ -181,6 +181,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity { private String workDate; // 导出日期 + @JsonFormat(pattern = "yyyy-MM") private Date exportDate; private ArrayList woids; // 待查询的工单ID集合 diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java index 4cd6ad8..02c8d99 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java @@ -1,5 +1,7 @@ package com.ruoyi.pay.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.alibaba.excel.converters.localdate.LocalDateDateConverter; import com.fasterxml.jackson.annotation.JsonFormat; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java index c3c7dd9..ab197f4 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java @@ -165,8 +165,8 @@ public class PayWorkOrderBaohuoVo { /** * 删除标志（0-可用 1-删除） */ - @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=-可用,1=-删除") + // @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class) + // @ExcelDictFormat(readConverterExp = "0=-可用,1=-删除") private Integer deleted; /** diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java index 590e23b..5618962 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.pay.mapper; import com.ruoyi.pay.domain.PayWorkOrderBaohuo; +import com.ruoyi.pay.domain.vo.ExportBaohuoVo; import com.ruoyi.pay.domain.vo.PayWorkOrderBaohuoVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Delete; @@ -27,7 +28,7 @@ public interface PayWorkOrderBaohuoMapper extends BaseMapperPlus getWorkOrderListByDate(Date exportDate); + List getWorkOrderListByDate(@Param("tenantId")Long tenantId, @Param("exportDate")Date exportDate); HashSet getWoIdSet(@Param("workDate")String workDate, @Param("empId") Long empId); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayWorkOrderBaohuoService.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayWorkOrderBaohuoService.java index 0853e2a..c2df8ee 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayWorkOrderBaohuoService.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayWorkOrderBaohuoService.java @@ -3,6 +3,7 @@ package com.ruoyi.pay.service; import com.ruoyi.common.core.domain.R; import com.ruoyi.pay.domain.PaySalaryReport; import com.ruoyi.pay.domain.PayWorkOrderBaohuo; +import com.ruoyi.pay.domain.vo.ExportBaohuoVo; import com.ruoyi.pay.domain.vo.PayWorkOrderBaohuoVo; import com.ruoyi.pay.domain.bo.PayWorkOrderBaohuoBo; import com.ruoyi.common.core.page.TableDataInfo; @@ -53,7 +54,7 @@ public interface IPayWorkOrderBaohuoService { R> baohuoSum(String date, Long deptId,Long tenantId); - List getWorkOrderListByDate(Date exportDate); + List getWorkOrderListByDate(Long tenantId, Date exportDate); HashSet getWoIdSet(String workDate, Long empId); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java index 5ff209e..516e07c 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java @@ -611,8 +611,8 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService } @Override - public List getWorkOrderListByDate(Date exportDate) { - return sgrWorkOrderBaohuoMapper.getWorkOrderListByDate(exportDate); + public List getWorkOrderListByDate(Long tenantId,Date exportDate) { + return sgrWorkOrderBaohuoMapper.getWorkOrderListByDate(tenantId,exportDate); } @Override diff --git a/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml b/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml index d111bdf..cdbef20 100644 --- a/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml +++ b/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml @@ -48,14 +48,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT b.instorage_time, b.`name`, a.product_name,b.content,a.unit,a.product_num,a.price,a.amount,a.wo_id, (SELECT count(*) FROM pay_baohuo_employee WHERE wo_id = b.id) as worker_num, (SELECT sum(valid_hours) FROM pay_baohuo_worktime WHERE wo_id = b.id) AS work_time, (SELECT GROUP_CONCAT(emp_name) FROM pay_baohuo_employee WHERE wo_id = b.id) AS works_name FROM pay_baohuo_product a LEFT JOIN pay_work_order_baohuo b ON a.wo_id = b.id - WHERE date_format(#{exportDate},'%y%m') = date_format(b.instorage_time,'%y%m') + + + date_format(#{exportDate},'%y-%m') = date_format(b.instorage_time,'%y-%m') + + and b.tenant_id=#{tenantId} + ORDER BY a.wo_id ASC From 2a9fc638373684b995b70597c953830a20ed3d21 Mon Sep 17 00:00:00 2001 From: hshansha Date: Thu, 5 Jun 2025 08:12:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=A7=9F?= =?UTF-8?q?=E6=88=B7id=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controller/PayEmployeeInfoController.java | 12 ++++++++++-- .../com/ruoyi/pay/mapper/PayEmployeeInfoMapper.java | 10 ++++++++-- .../ruoyi/pay/service/IPayEmployeeInfoService.java | 4 +++- .../pay/service/impl/PayDayWorkHoursServiceImpl.java | 6 +++--- .../pay/service/impl/PayEmployeeInfoServiceImpl.java | 9 +++++++-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayEmployeeInfoController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayEmployeeInfoController.java index 4460ef4..ddb5000 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayEmployeeInfoController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayEmployeeInfoController.java @@ -48,6 +48,14 @@ public class PayEmployeeInfoController extends BaseController { public TableDataInfo list(PayEmployeeInfoBo bo, PageQuery pageQuery) { return iPayEmployeeInfoService.queryPageList(bo, pageQuery); } + /** + * 获取内外贸人员列表 + */ + @SaCheckPermission("pay:employeeInfo:list") + @GetMapping("/salesman") + public List getSalesmanList(PayEmployeeInfoBo bo) { + return iPayEmployeeInfoService.getSalesmanList(bo); + } /** * 导出员工信息列表 @@ -112,9 +120,9 @@ public class PayEmployeeInfoController extends BaseController { @SaCheckPermission("pay:empinfo:edithour") @Log(title = "员工信息", businessType = BusinessType.UPDATE) @PutMapping("/edithour") - public R edit(@RequestParam("oldHour") String oldHour, @RequestParam("newHour") String newHour) + public R edit(@RequestParam("oldHour") String oldHour, @RequestParam("newHour") String newHour,@RequestParam("tenantId") Long tenantId) { - return toAjax(iPayEmployeeInfoService.updateSgrEmployeeHour(oldHour,newHour)); + return toAjax(iPayEmployeeInfoService.updateSgrEmployeeHour(oldHour,newHour,tenantId)); } /** diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayEmployeeInfoMapper.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayEmployeeInfoMapper.java index abc1445..014865e 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayEmployeeInfoMapper.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayEmployeeInfoMapper.java @@ -4,8 +4,11 @@ import com.ruoyi.pay.domain.PayEmployeeInfo; import com.ruoyi.pay.domain.vo.PayEmployeeInfoVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; +import java.util.List; + /** * 员工信息Mapper接口 * @@ -13,6 +16,9 @@ import org.apache.ibatis.annotations.Update; * @date 2025-05-12 */ public interface PayEmployeeInfoMapper extends BaseMapperPlus { - @Update("update pay_employee_info e set e.hours_per_day = #{newHour} where e.hours_per_day = #{oldHour}") - int updateSgrEmployeeHour(@Param("oldHour") String oldHour, @Param("newHour")String newHour); + @Update("update pay_employee_info e set e.hours_per_day = #{newHour} where e.hours_per_day = #{oldHour} and tenant_id = #{tenantId}") + int updateSgrEmployeeHour(@Param("oldHour") String oldHour, @Param("newHour")String newHour,@Param("tenantId") Long tenantId); + + @Select("select * from pay_employee_info e ,sys_dept d where e.dept_id=d.dept_id and deleted = 0 and (d.dept_name='外贸' or d.dept_name='内贸') and tenant_id = #{tenantId}") + List getSalesmanList(@Param("tenantId") Long tenantId); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayEmployeeInfoService.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayEmployeeInfoService.java index fc268c0..f88352a 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayEmployeeInfoService.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayEmployeeInfoService.java @@ -47,5 +47,7 @@ public interface IPayEmployeeInfoService { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - int updateSgrEmployeeHour(String oldHour, String newHour); + int updateSgrEmployeeHour(String oldHour, String newHour,Long tenantId); + + List getSalesmanList(PayEmployeeInfoBo bo); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java index 1a68a51..47fa799 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java @@ -50,7 +50,7 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { */ @Override public PayDayWorkHoursVo queryById(Long id){ - return baseMapper.selectVoById(id); + return baseMapper.selectDetailById(id); } /** @@ -157,7 +157,7 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { if (result > 0) { List sgrDwHoursContrasts = sgrDayWorkHoursQuery.getDwHoursContrasts(); sgrDwHoursContrasts.parallelStream().forEachOrdered(sgrDwHoursContrast -> { - sgrDwHoursContrast.setDwHoursId(sgrDayWorkHoursQuery.getId()); + sgrDwHoursContrast.setDwHoursId(payDayWorkHour.getId()); if (sgrDwHoursContrast.getIsHelper() == 0) {//当不是帮工时 直接存员工的部门 sgrDwHoursContrast.setDeptId(sgrDayWorkHoursQuery.getDeptId()); sgrDwHoursContrast.setDeptName(sgrDayWorkHoursQuery.getDeptName()); @@ -217,7 +217,7 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { //重新插入时间段 List sgrDwHoursContrasts = sgrDayWorkHoursQuery.getDwHoursContrasts(); sgrDwHoursContrasts.parallelStream().forEachOrdered(sgrDwHoursContrast -> { - sgrDwHoursContrast.setDwHoursId(sgrDayWorkHoursQuery.getId()); + sgrDwHoursContrast.setDwHoursId(payDayWorkHour.getId()); if (sgrDwHoursContrast.getIsHelper() == 0) {//当不是帮工时 直接存员工的部门 sgrDwHoursContrast.setDeptId(sgrDayWorkHoursQuery.getDeptId()); sgrDwHoursContrast.setDeptName(sgrDayWorkHoursQuery.getDeptName()); diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java index e7318bb..1b7101d 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java @@ -176,7 +176,12 @@ public class PayEmployeeInfoServiceImpl implements IPayEmployeeInfoService { } @Override - public int updateSgrEmployeeHour(String oldHour, String newHour) { - return baseMapper.updateSgrEmployeeHour(oldHour,newHour); + public int updateSgrEmployeeHour(String oldHour, String newHour,Long tenantId) { + return baseMapper.updateSgrEmployeeHour(oldHour,newHour,tenantId); + } + + @Override + public List getSalesmanList(PayEmployeeInfoBo bo) { + return baseMapper.getSalesmanList(bo.getTenantId()); } } From a4e780138561b21b226a0447dd0ce1d2dcc1640e Mon Sep 17 00:00:00 2001 From: hshansha Date: Thu, 5 Jun 2025 08:14:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A5=E5=B7=A5=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/pay/mapper/PayDayWorkHoursMapper.java | 2 ++ .../src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayDayWorkHoursMapper.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayDayWorkHoursMapper.java index 9e75dbc..93916c8 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayDayWorkHoursMapper.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayDayWorkHoursMapper.java @@ -22,4 +22,6 @@ public interface PayDayWorkHoursMapper extends BaseMapperPlus selectPayDayWorkHoursList2(PayDayWorkHoursQuery sgrDayWorkHoursQuery); Page selectVoPage2(@Param("page") Page page, @Param(Constants.WRAPPER)LambdaQueryWrapper ew); + + PayDayWorkHoursVo selectDetailById(Long id); } diff --git a/ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml b/ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml index f382dda..a82cc39 100644 --- a/ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml +++ b/ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml @@ -61,4 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + From 759f029a6de8a2bcb72cfc67f02c84bd260fe1f2 Mon Sep 17 00:00:00 2001 From: hshansha Date: Thu, 5 Jun 2025 08:37:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=A5=E5=B7=A5=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java index 564fa7e..c641ffd 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursExport.java @@ -1,13 +1,15 @@ package com.ruoyi.pay.domain.vo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; - -public class PayDayWorkHoursExport { +@ExcelIgnoreUnannotated +public class PayDayWorkHoursExport { /** 主键 */ private Long id; @@ -65,7 +67,7 @@ public class PayDayWorkHoursExport { private String isHelper; /** 工时部门 */ - //@ExcelProperty(value= "工时部门") + @ExcelProperty(value= "工时部门") private String deptName2; public String getDeptName2() {