From 2a9fc638373684b995b70597c953830a20ed3d21 Mon Sep 17 00:00:00 2001 From: hshansha Date: Thu, 5 Jun 2025 08:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=AE=E6=94=B9=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7?= =?UTF-8?q?id=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()); } }