hansha
/
pay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wanglei 7 months ago
parent 2a6b0546cc 4b2f5e75dd
commit d1dc636b21
9 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File

1
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayDayWorkHours.java
Unescape View File

@ -52,6 +52,7 @@ public class PayDayWorkHours extends BaseEntity {
/**
* 日工日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date date;
/**
* 日工年月

6
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayAttendanceBo.java
Unescape View File

@ -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;

11
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayDayWorkHoursBo.java
Unescape View File

@ -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;
}

3
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java
Unescape View File

@ -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;
/**

5
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java
Unescape View File

@ -18,6 +18,7 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 包活派工单业务对象 pay_work_order_baohuo
@ -106,6 +107,7 @@ public class PayWorkOrderBaohuoBo 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 beginTime;
@ -113,6 +115,7 @@ public class PayWorkOrderBaohuoBo 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 endTime;
@ -132,6 +135,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
* 入库时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "入库时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date instorageTime;
@ -182,6 +186,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
// 导出日期
@JsonFormat(pattern = "yyyy-MM")
@DateTimeFormat(pattern = "yyyy-MM")
private Date exportDate;
private ArrayList<Long> woids; // 待查询的工单ID集合

3
ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayDayWorkHoursMapper.java
Unescape View File

@ -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<PayDayWorkHoursMap
List<PayDayWorkHoursQuery> selectPayDayWorkHoursList2(PayDayWorkHoursQuery sgrDayWorkHoursQuery);
Page<PayDayWorkHoursQuery> selectVoPage2(@Param("page") Page<Object> page, @Param(Constants.WRAPPER) QueryWrapper<PayDayWorkHours> ew);
Page<PayDayWorkHoursQuery> selectVoPage2(@Param("page") Page<Object> page, @Param(Constants.WRAPPER) QueryWrapper<PayDayWorkHoursBo> ew);
PayDayWorkHoursQuery selectDetailById(Long id);
}

11
ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java
Unescape View File

@ -64,11 +64,11 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService {
return TableDataInfo.build(result);
}
/**
* 查询日工工时列表
* 查询日工工时列表2
*/
@Override
public TableDataInfo<PayDayWorkHoursQuery> queryPageList2(PayDayWorkHoursBo bo, PageQuery pageQuery) {
QueryWrapper<PayDayWorkHours> lqw = buildQueryWrapper2(bo);
QueryWrapper<PayDayWorkHoursBo> lqw = buildQueryWrapper2(bo);
Page<PayDayWorkHoursQuery> 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<PayDayWorkHours> buildQueryWrapper2(PayDayWorkHoursBo bo) {
private QueryWrapper<PayDayWorkHoursBo> buildQueryWrapper2(PayDayWorkHoursBo bo) {
Map<String, Object> params = bo.getParams();
QueryWrapper<PayDayWorkHours> lqw = Wrappers.query();;
QueryWrapper<PayDayWorkHoursBo> 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;
}

6
ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderCheckServiceImpl.java
Unescape View File

@ -40,6 +40,9 @@ public class PayWorkOrderCheckServiceImpl implements IPayWorkOrderCheckService {
Map<String, Object> 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<String, Object> 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;

3
ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml
Unescape View File

@ -54,10 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectVoPage2" resultMap="PayDayWorkHoursQueryResult">
<select id="selectVoPage2" parameterType="PayDayWorkHoursBo" resultMap="PayDayWorkHoursQueryResult">
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}
<!--<where><if test="ew.sqlSegment != null and ew.sqlSegment != ''"> and ${ew.sqlSegment} </if></where>-->
</select>
<select id="selectDetailById" parameterType="Long" resultMap="PayDayWorkHoursQueryResult">

Write Preview
Loading…
Cancel
Save