From aff95ee864756012eec8082700c556b4599afae6 Mon Sep 17 00:00:00 2001 From: hshansha Date: Thu, 29 May 2025 16:08:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E9=9D=9E?= =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/ruoyi/test/AssertUnitTest.java | 6 +++++- .../src/test/java/com/ruoyi/test/TagUnitTest.java | 6 +++++- .../ruoyi/pay/controller/PayButieEmplyeeController.java | 9 +++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java index 5b9c9f8..ee1a940 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java @@ -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 { } } +*/ diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java index 04240a0..ce3163f 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java @@ -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 { } +*/ diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java index 6d11058..da1d67e 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java @@ -151,6 +151,7 @@ public class PayButieEmplyeeController extends BaseController { @SaCheckPermission("pay:butieEmplyee:list") @GetMapping("/summary") public TableDataInfo summary(PayButieEmplyeeBo bo, PageQuery pageQuery) { + List 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 payEmployeeTableDataInfo = employeeInfoService.queryPageList(employeeInfo, pageQuery); - List 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 buildEmployeeInfo(List list, String date) { - List sgrButies = butieService.queryList(new PayButieBo()); + PayButieBo pb = new PayButieBo(); + pb.setTenantId(list.get(0).getTenantId()); + List sgrButies = butieService.queryList(pb); ArrayList summaryVos = new ArrayList<>(); list.parallelStream().forEachOrdered(emp -> { ButieSummaryVo butieSummaryVo = new ButieSummaryVo(); From 03c79a6cd980dd2d9e6e7bc0519b3a143a5424c9 Mon Sep 17 00:00:00 2001 From: hshansha Date: Thu, 29 May 2025 17:04:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/mapper/BaseMapperPlus.java | 2 +- .../pay/service/impl/PayWorkOrderBaohuoServiceImpl.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java index db1b6d5..b3cf439 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java @@ -198,6 +198,6 @@ public interface BaseMapperPlus extends BaseMapper { @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); } 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 5b207dd..0596200 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 @@ -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 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 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); From 20d2698e6250a22d5a007faf7519ff1e73da9b06 Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 30 May 2025 08:14:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/pay/controller/PayButieEmplyeeController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java index da1d67e..477c988 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java @@ -179,12 +179,15 @@ public class PayButieEmplyeeController extends BaseController { butieSummaryVo.setDate(date); HashMap 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 butieEmplyeeVos = iPayButieEmplyeeService.queryList(query); - BigDecimal money =butieEmplyeeVos.get(0).getMoney(); + if(butieEmplyeeVos!=null&&butieEmplyeeVos.size()>0){ + money=butieEmplyeeVos.get(0).getMoney(); + } HashMap inMap = new HashMap<>(); inMap.put("btid", butie.getId()); inMap.put("money",money); From 59493532b1d0507f338bb0a00731380962931829 Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 30 May 2025 08:43:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=A1=A5=E8=B4=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0=E6=97=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=A9=BA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayButieEmplyeeController.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java index 477c988..a423601 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java @@ -187,16 +187,20 @@ public class PayButieEmplyeeController extends BaseController { List butieEmplyeeVos = iPayButieEmplyeeService.queryList(query); if(butieEmplyeeVos!=null&&butieEmplyeeVos.size()>0){ money=butieEmplyeeVos.get(0).getMoney(); + HashMap inMap = new HashMap<>(); + inMap.put("btid", butie.getId()); + inMap.put("money",money); + map.put(butie.getName(), inMap); } - HashMap inMap = new HashMap<>(); - inMap.put("btid", butie.getId()); - inMap.put("money",money); - map.put(butie.getName(), inMap); } - butieSummaryVo.setButieMap(map); - butieSummaryVo.setEdit(false); - butieSummaryVo.setEmpId(emp.getId()); - summaryVos.add(butieSummaryVo); + if(map.isEmpty()){ + //没找到员工查询月的补贴数据 ，不添加数据 + }else{ + butieSummaryVo.setButieMap(map); + butieSummaryVo.setEdit(false); + butieSummaryVo.setEmpId(emp.getId()); + summaryVos.add(butieSummaryVo); + } }); return summaryVos; } From fb4e365f7e5fc0bebb3ba487d32dc9cceff0477d Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 30 May 2025 10:46:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=A5=E5=B7=A5=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA=E9=AA=8C=E8=AF=81=E3=80=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/domain/vo/PayDayWorkHoursQuery2.java | 15 +++++++++++++++ .../service/impl/PayDayWorkHoursServiceImpl.java | 3 +++ 2 files changed, 18 insertions(+) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java index 2fb0683..d408cdb 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java @@ -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()) 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 dc5772d..1a68a51 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 @@ -103,6 +103,9 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { public R insertByBo(PayDayWorkHoursQuery2 payDayWorkHoursQuery2) { //先拆分员工 然后每个员工信息存储到SgrDayWorkHoursQuery集合中 List 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());