From 5788fe4045f1aba440f08eb0ba4bb5a49101d6fd Mon Sep 17 00:00:00 2001 From: hshansha Date: Sat, 7 Jun 2025 11:01:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=A5=E6=9C=9F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98=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/domain/PayDayWorkHours.java | 1 + .../java/com/ruoyi/pay/domain/bo/PayAttendanceBo.java | 6 ++++++ .../com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java | 11 ++++++++--- .../java/com/ruoyi/pay/domain/bo/PayProductsBo.java | 3 +++ .../com/ruoyi/pay/mapper/PayDayWorkHoursMapper.java | 3 ++- .../pay/service/impl/PayDayWorkHoursServiceImpl.java | 11 ++++++----- .../service/impl/PayWorkOrderCheckServiceImpl.java | 6 ++++++ .../resources/mapper/pay/PayDayWorkHoursMapper.xml | 5 +++-- 8 files changed, 35 insertions(+), 11 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDayWorkHours.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDayWorkHours.java index 84271b0..2c03127 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDayWorkHours.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDayWorkHours.java @@ -52,6 +52,7 @@ public class PayDayWorkHours extends BaseEntity { /** * 日工日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date date; /** * 日工年月 diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayAttendanceBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayAttendanceBo.java index 65ce23e..62f41fc 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayAttendanceBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayAttendanceBo.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 考勤业务对象 pay_attendance @@ -63,6 +64,7 @@ public class PayAttendanceBo extends BaseEntity { * 上午开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @NotNull(message = "上午开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date amStartTime; @@ -70,6 +72,7 @@ public class PayAttendanceBo extends BaseEntity { * 上午结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @NotNull(message = "上午结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date amEndTime; @@ -77,6 +80,7 @@ public class PayAttendanceBo extends BaseEntity { * 下午开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@NotNull(message = "下午开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date pmStartTime; @@ -84,6 +88,7 @@ public class PayAttendanceBo extends BaseEntity { * 下午结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // @NotNull(message = "下午结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date pmEndTime; @@ -91,6 +96,7 @@ public class PayAttendanceBo extends BaseEntity { * 考勤日期 */ @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @NotNull(message = "考勤日期不能为空", groups = { AddGroup.class, EditGroup.class }) private Date kaoqinDate; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java index 5bac233..4ba8593 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 日工工时业务对象 pay_day_work_hours @@ -26,13 +27,13 @@ public class PayDayWorkHoursBo extends BaseEntity { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + // @NotNull(message = "主键不能为空", groups = { EditGroup.class }) private Long id; /** * 租户id */ - @NotNull(message = "租户id不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotNull(message = "租户id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long tenantId; /** @@ -63,6 +64,7 @@ public class PayDayWorkHoursBo extends BaseEntity { * 日工日期 */ @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @NotNull(message = "日工日期不能为空", groups = { AddGroup.class, EditGroup.class }) private Date date; @@ -78,5 +80,8 @@ public class PayDayWorkHoursBo extends BaseEntity { // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String note; - + /** + * 为前端传值方便添加，查询时候专用字段 + */ + private String salesman; } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java index bdd96e0..e333696 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java @@ -12,6 +12,7 @@ import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 产品业务对象 pay_products @@ -106,6 +107,8 @@ public class PayProductsBo extends BaseEntity { * 入库时间 */ // @NotNull(message = "入库时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date storageTime; /** 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 0c9b0b1..afaa294 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.pay.domain.PayDayWorkHours; import com.ruoyi.pay.domain.PayDayWorkHoursQuery; +import com.ruoyi.pay.domain.bo.PayDayWorkHoursBo; import com.ruoyi.pay.domain.vo.PayDayWorkHoursVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; @@ -22,7 +23,7 @@ public interface PayDayWorkHoursMapper extends BaseMapperPlus selectPayDayWorkHoursList2(PayDayWorkHoursQuery sgrDayWorkHoursQuery); - Page selectVoPage2(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper ew); + Page selectVoPage2(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper ew); PayDayWorkHoursQuery selectDetailById(Long id); } 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 c70f081..90cb0ae 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 @@ -64,11 +64,11 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { return TableDataInfo.build(result); } /** - * 查询日工工时列表 + * 查询日工工时列表2 */ @Override public TableDataInfo queryPageList2(PayDayWorkHoursBo bo, PageQuery pageQuery) { - QueryWrapper lqw = buildQueryWrapper2(bo); + QueryWrapper lqw = buildQueryWrapper2(bo); Page result = baseMapper.selectVoPage2(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -82,16 +82,17 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { return baseMapper.selectVoList(lqw); } - private QueryWrapper buildQueryWrapper2(PayDayWorkHoursBo bo) { + private QueryWrapper buildQueryWrapper2(PayDayWorkHoursBo bo) { Map params = bo.getParams(); - QueryWrapper lqw = Wrappers.query();; + QueryWrapper lqw = Wrappers.query();; lqw.eq(bo.getTenantId() != null, "d.tenant_id", bo.getTenantId()); lqw.eq(bo.getDeptId() != null, "dept_id", bo.getDeptId()); lqw.like(StringUtils.isNotBlank(bo.getDeptName()), "dept_name", bo.getDeptName()); lqw.eq(bo.getEmployeeId() != null, "employee_id", bo.getEmployeeId()); lqw.like(StringUtils.isNotBlank(bo.getEmpName()), "emp_name", bo.getEmpName()); lqw.eq(bo.getDate() != null, "date", bo.getDate()); - lqw.eq(StringUtils.isNotBlank(bo.getDwYearMonth()), "year_month", bo.getDwYearMonth()); + lqw.eq(bo.getSalesman() != null, "c.`salesman`", bo.getSalesman()); + lqw.eq(StringUtils.isNotBlank(bo.getDwYearMonth()), "dw_year_month", bo.getDwYearMonth()); lqw.eq(StringUtils.isNotBlank(bo.getNote()), "note", bo.getNote()); return lqw; } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderCheckServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderCheckServiceImpl.java index 9e58843..41b111a 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderCheckServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderCheckServiceImpl.java @@ -40,6 +40,9 @@ public class PayWorkOrderCheckServiceImpl implements IPayWorkOrderCheckService { Map result = new HashMap<>(); //获取到员工信息 PayEmployeeInfo employeeInfo = payEmployeeInfoMapper.selectSgrEmployeeInfoByName(tenantId,empName); + if(employeeInfo==null){ + return null; + } //年月拆分 String year = date.split("-")[0]; String month = date.split("-")[1]; @@ -99,6 +102,9 @@ public class PayWorkOrderCheckServiceImpl implements IPayWorkOrderCheckService { Map result = new HashMap<>(); //获取到员工信息 PayEmployeeInfo employeeInfo = payEmployeeInfoMapper.selectSgrEmployeeInfoByName(tenantId,empName); + if(employeeInfo==null){ + return null; + } String year = date.split("-")[0]; String month = date.split("-")[1]; Date yearMonth=null; diff --git a/ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml b/ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml index 7fba2df..cf3a6df 100644 --- a/ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml +++ b/ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml @@ -54,10 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select d.*,c.start_time con_start,c.end_time con_end,c.is_helper con_helper,c.hours con_hours,c.salesman con_salesman from pay_day_work_hours d join pay_dw_hours_contrast c on d.id=c.dw_hours_id - ${ew.customSqlSegment} + ${ew.customSqlSegment} +