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 745e8ae911 fb4e365f7e
commit b82aabfe0b
7 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File

6
ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java
Unescape View File

@ -1,14 +1,17 @@
/*
package com.ruoyi.test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
*/
/**
* 断言单元测试案例
*
* @author Lion Li
*/
*//*
@DisplayName("断言单元测试案例")
public class AssertUnitTest {
@ -43,3 +46,4 @@ public class AssertUnitTest {
}
}
*/

6
ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java
Unescape View File

@ -1,13 +1,16 @@
/*
package com.ruoyi.test;
import org.junit.jupiter.api.*;
import org.springframework.boot.test.context.SpringBootTest;
*/
/**
* 标签单元测试案例
*
* @author Lion Li
*/
*//*
@SpringBootTest
@DisplayName("标签单元测试案例")
public class TagUnitTest {
@ -52,3 +55,4 @@ public class TagUnitTest {
}
*/

2
ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java
Unescape View File

@ -198,6 +198,6 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
@Select("DELETE FROM pay_butie_emplyee WHERE date = #{month} and tenant_id=#{tenantId}")
void deleteSgrButieEmplyeeByDate(@Param("month") String month,@Param("tenantId") Long tenantId);
@Select("SELECT COUNT(*) FROM pay_butie_emplyee WHERE date = #{month}")
@Select("SELECT COUNT(*) FROM pay_butie_emplyee WHERE date = #{month} and tenant_id=#{tenantId}")
Integer getLatestDate(@Param("month") String month,@Param("tenantId") Long tenantId);
}

34
ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java
Unescape View File

@ -151,6 +151,7 @@ public class PayButieEmplyeeController extends BaseController {
@SaCheckPermission("pay:butieEmplyee:list")
@GetMapping("/summary")
public TableDataInfo<ButieSummaryVo> summary(PayButieEmplyeeBo bo, PageQuery pageQuery) {
List<ButieSummaryVo> butieSummaryVos = new ArrayList<>();
String date;
if (null==(bo.getDate())) { // 默认查询本月的数据
date = DateUtil.format(new Date(), "yyyy-MM");
@ -161,12 +162,16 @@ public class PayButieEmplyeeController extends BaseController {
employeeInfo.setId(bo.getEmployeeId());
employeeInfo.setTenantId(bo.getTenantId());
TableDataInfo<PayEmployeeInfoVo> payEmployeeTableDataInfo = employeeInfoService.queryPageList(employeeInfo, pageQuery);
List<ButieSummaryVo> butieSummaryVos = this.buildEmployeeInfo(payEmployeeTableDataInfo.getRows(), date);
if(payEmployeeTableDataInfo.getRows()!=null&&payEmployeeTableDataInfo.getRows().size()>0){
butieSummaryVos = this.buildEmployeeInfo(payEmployeeTableDataInfo.getRows(), date);
}
return TableDataInfo.build(butieSummaryVos);
}
private List<ButieSummaryVo> buildEmployeeInfo(List<PayEmployeeInfoVo> list, String date) {
List<PayButieVo> sgrButies = butieService.queryList(new PayButieBo());
PayButieBo pb = new PayButieBo();
pb.setTenantId(list.get(0).getTenantId());
List<PayButieVo> sgrButies = butieService.queryList(pb);
ArrayList<ButieSummaryVo> summaryVos = new ArrayList<>();
list.parallelStream().forEachOrdered(emp -> {
ButieSummaryVo butieSummaryVo = new ButieSummaryVo();
@ -174,21 +179,28 @@ public class PayButieEmplyeeController extends BaseController {
butieSummaryVo.setDate(date);
HashMap<String, Object> map = new HashMap<>();
for (PayButieVo butie : sgrButies) {
BigDecimal money = new BigDecimal(0);
PayButieEmplyeeBo query = new PayButieEmplyeeBo();
query.setEmployeeId(emp.getId());
query.setButieId(butie.getId());
query.setDate(date);
List<PayButieEmplyeeVo> butieEmplyeeVos = iPayButieEmplyeeService.queryList(query);
BigDecimal money =butieEmplyeeVos.get(0).getMoney();
HashMap<String, Object> inMap = new HashMap<>();
inMap.put("btid", butie.getId());
inMap.put("money",money);
map.put(butie.getName(), inMap);
if(butieEmplyeeVos!=null&&butieEmplyeeVos.size()>0){
money=butieEmplyeeVos.get(0).getMoney();
HashMap<String, Object> inMap = new HashMap<>();
inMap.put("btid", butie.getId());
inMap.put("money",money);
map.put(butie.getName(), inMap);
}
}
if(map.isEmpty()){
//没找到员工查询月的补贴数据 ，不添加数据
}else{
butieSummaryVo.setButieMap(map);
butieSummaryVo.setEdit(false);
butieSummaryVo.setEmpId(emp.getId());
summaryVos.add(butieSummaryVo);
}
butieSummaryVo.setButieMap(map);
butieSummaryVo.setEdit(false);
butieSummaryVo.setEmpId(emp.getId());
summaryVos.add(butieSummaryVo);
});
return summaryVos;
}

15
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java
Unescape View File

@ -27,6 +27,12 @@ public class PayDayWorkHoursQuery2 {
*//** 员工姓名 *//*
@Excel(name = "员工姓名")
private String empName;*/
/**
* 租户id
*/
private Long tenantId;
/**
* 员工集合
*/
@ -103,6 +109,14 @@ public class PayDayWorkHoursQuery2 {
this.note = note;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@ -111,6 +125,7 @@ public class PayDayWorkHoursQuery2 {
.append("deptName", getDeptName())
.append("employeeId", getEmployeeId())
.append("empName", getEmpName())*/
.append("tenantId", getTenantId())
.append("date", getDate())
.append("dwYearMonth", getDwYearMonth())
.append("note", getNote())

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

@ -103,6 +103,9 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService {
public R<Void> insertByBo(PayDayWorkHoursQuery2 payDayWorkHoursQuery2) {
//先拆分员工 然后每个员工信息存储到SgrDayWorkHoursQuery集合中
List<PayDayWorkHoursQuery> querys = new ArrayList<>();
if(payDayWorkHoursQuery2.getEmpInfos()!=null&&payDayWorkHoursQuery2.getEmpInfos().size()>0){
return R.fail("添加工时的员工为空！");
}
for(PayDayWorkEmps emp :payDayWorkHoursQuery2.getEmpInfos()){
PayDayWorkHoursQuery payDayWorkHoursQuery = new PayDayWorkHoursQuery();
payDayWorkHoursQuery.setEmpName(emp.getEmpName());

8
ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java
Unescape View File

@ -181,6 +181,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
PayAttendanceBo sgrAttendance = new PayAttendanceBo();
sgrAttendance.setEmpName(employee.getEmpName());
sgrAttendance.setKaoqinDate(bhworkTime.getDate());
sgrAttendance.setTenantId(bo.getTenantId());
List<PayAttendanceVo> ats = attendanceService.queryList(sgrAttendance);
// 判断考勤是否存在-务必存在考勤，没有需要补考勤
if (ObjectUtil.isNull(ats) || ats.size() == 0) {
@ -274,6 +275,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
// 增加对应的产品列表
for (PayBaohuoProduct product : prodList) {
product.setWoId(bo.getId());
product.setTenantId(bo.getTenantId());
PayBaohuoProductBo productBo= BeanUtil.toBean(product,PayBaohuoProductBo.class);
bhproductService.insertByBo(productBo);
}
@ -285,6 +287,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
employee.setIntime(bo.getInstorageTime());
employee.setHelper(employee.getHelper());
employee.setAmount(average);
employee.setTenantId(bo.getTenantId());
PayBaohuoEmployeeBo payBaohuoEmployeeBo = BeanUtil.toBean(employee, PayBaohuoEmployeeBo.class);
boolean a = bhemployeeService.insertByBo(payBaohuoEmployeeBo);
@ -294,6 +297,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
sgrWorkTime.setWoId(bo.getId());
sgrWorkTime.setEmpId(employee.getEmpId());
sgrWorkTime.setBheId(employee.getId());
sgrWorkTime.setTenantId(bo.getTenantId());
//sgrWorkTime.setIntime(sgrWorkOrderBaohuo.getInstorageTime());
PayBaohuoWorktimeBo payBaohuoWorktimeBo = BeanUtil.toBean(sgrWorkTime, PayBaohuoWorktimeBo.class);
bhworktimeService.insertByBo(payBaohuoWorktimeBo);
@ -383,6 +387,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
PayAttendanceBo sgrAttendance = new PayAttendanceBo();
sgrAttendance.setEmpName(employee.getEmpName());
sgrAttendance.setKaoqinDate(bhworkTime.getDate());
sgrAttendance.setTenantId(bo.getTenantId());
List<PayAttendanceVo> ats = attendanceService.queryList(sgrAttendance);
// 判断考勤是否存在-务必存在考勤，没有需要补考勤
if (ObjectUtil.isNull(ats) || ats.size() == 0) {
@ -459,6 +464,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
// 增加对应的产品列表
for (PayBaohuoProduct product : prodList) {
product.setWoId(bo.getId());
product.setTenantId(bo.getTenantId());
PayBaohuoProductBo productBo= BeanUtil.toBean(product,PayBaohuoProductBo.class);
bhproductService.insertByBo(productBo);
}
@ -470,6 +476,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
employee.setIntime(bo.getInstorageTime());
employee.setHelper(employee.getHelper());
employee.setAmount(average);
employee.setTenantId(bo.getTenantId());
PayBaohuoEmployeeBo payBaohuoEmployeeBo = BeanUtil.toBean(employee, PayBaohuoEmployeeBo.class);
boolean a = bhemployeeService.insertByBo(payBaohuoEmployeeBo);
@ -479,6 +486,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
sgrWorkTime.setWoId(bo.getId());
sgrWorkTime.setEmpId(employee.getEmpId());
sgrWorkTime.setBheId(employee.getId());
sgrWorkTime.setTenantId(bo.getTenantId());
//sgrWorkTime.setIntime(sgrWorkOrderBaohuo.getInstorageTime());
PayBaohuoWorktimeBo payBaohuoWorktimeBo = BeanUtil.toBean(sgrWorkTime, PayBaohuoWorktimeBo.class);
bhworktimeService.insertByBo(payBaohuoWorktimeBo);

Write Preview
Loading…
Cancel
Save