From d8bdde6d6a0e3b1ebee560a2cef4698b9d80534e Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 28 May 2025 15:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E4=BF=AE=E6=94=B9=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=85=A8=E9=83=A8=E8=A1=A5=E8=B4=B4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E5=BA=94=E5=87=BA=E5=8B=A4=E6=B7=BB=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayButieEmplyeeController.java | 15 ++++-- .../PayRequireAttendanceReportController.java | 11 +++++ .../com/ruoyi/pay/domain/vo/ButieTypeVo.java | 45 ++++++++++++++++++ .../ruoyi/pay/domain/vo/ButieUpdateVo.java | 46 +++++++++++++++++++ .../pay/mapper/PayButieEmplyeeMapper.java | 6 +++ .../pay/service/IPayButieEmplyeeService.java | 3 ++ .../impl/PayButieEmplyeeServiceImpl.java | 22 +++++++-- 7 files changed, 141 insertions(+), 7 deletions(-) create mode 100644 ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ButieTypeVo.java create mode 100644 ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ButieUpdateVo.java 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 a61574d..b264cf2 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 @@ -11,9 +11,7 @@ import com.ruoyi.pay.domain.PayButie; import com.ruoyi.pay.domain.PayEmployeeInfo; import com.ruoyi.pay.domain.bo.PayButieBo; import com.ruoyi.pay.domain.bo.PayEmployeeInfoBo; -import com.ruoyi.pay.domain.vo.ButieSummaryVo; -import com.ruoyi.pay.domain.vo.PayButieVo; -import com.ruoyi.pay.domain.vo.PayEmployeeInfoVo; +import com.ruoyi.pay.domain.vo.*; import com.ruoyi.pay.service.IPayButieService; import com.ruoyi.pay.service.IPayEmployeeInfoService; import lombok.RequiredArgsConstructor; @@ -32,7 +30,6 @@ import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.pay.domain.vo.PayButieEmplyeeVo; import com.ruoyi.pay.domain.bo.PayButieEmplyeeBo; import com.ruoyi.pay.service.IPayButieEmplyeeService; import com.ruoyi.common.core.page.TableDataInfo; @@ -106,6 +103,16 @@ public class PayButieEmplyeeController extends BaseController { public R edit(@Validated(EditGroup.class) @RequestBody PayButieEmplyeeBo bo) { return toAjax(iPayButieEmplyeeService.updateByBo(bo)); } + /** + * 修改员工对应月份所有的补贴类型的费用 + */ + @SaCheckPermission("pay:butieEmplyee:alledit") + @Log(title = "月度补贴修改", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/allbt") + public R updateAllBtempByDate(@RequestBody ButieUpdateVo vo) { + return iPayButieEmplyeeService.updateAllBtempByDate(vo); + } /** * 删除补贴和员工联系 diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayRequireAttendanceReportController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayRequireAttendanceReportController.java index c7966ec..bcf74d7 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayRequireAttendanceReportController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayRequireAttendanceReportController.java @@ -122,6 +122,17 @@ public class PayRequireAttendanceReportController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody PayRequireAttendanceReportBo bo) { + // 验证是否存在这个人的报告 + PayRequireAttendanceReportBo query = new PayRequireAttendanceReportBo(); + query.setTenantId(bo.getTenantId()); + query.setYear(bo.getYear()); + query.setMonth(bo.getMonth()); + query.setYear(bo.getEmpName()); + List r = iPayRequireAttendanceReportService.queryList(bo); + if (r!=null&&r.size()>0) + { + return R.fail("已存在"+bo.getEmpName()+" "+bo.getYear()+bo.getMonth()+"月的信息"); + } return toAjax(iPayRequireAttendanceReportService.insertByBo(bo)); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ButieTypeVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ButieTypeVo.java new file mode 100644 index 0000000..08aa0ab --- /dev/null +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ButieTypeVo.java @@ -0,0 +1,45 @@ +package com.ruoyi.pay.domain.vo; + +import java.math.BigDecimal; + +public class ButieTypeVo { + private Long btid; + + private String butieName; + + private BigDecimal money; + + public Long getBtid() { + return btid; + } + + public void setBtid(Long btid) { + this.btid = btid; + } + + public String getButieName() { + return butieName; + } + + public void setButieName(String butieName) { + this.butieName = butieName; + } + + public BigDecimal getMoney() { + return money; + } + + public void setMoney(BigDecimal money) { + this.money = money; + } + + @Override + public String toString() { + return "ButieTypeVo{" + + "btid=" + btid + + ", butieName='" + butieName + '\'' + + ", money=" + money + + '}'; + } +} + diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ButieUpdateVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ButieUpdateVo.java new file mode 100644 index 0000000..ef13291 --- /dev/null +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ButieUpdateVo.java @@ -0,0 +1,46 @@ +package com.ruoyi.pay.domain.vo; + +import java.util.List; + +public class ButieUpdateVo { + /** 员工ID */ + private Long empId; + + private String date; + + private List btList; + + public Long getEmpId() { + return empId; + } + + public void setEmpId(Long empId) { + this.empId = empId; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public List getBtList() { + return btList; + } + + public void setBtList(List btList) { + this.btList = btList; + } + + @Override + public String toString() { + return "ButieUpdateVo{" + + "empId=" + empId + + ", date='" + date + '\'' + + ", btList=" + btList + + '}'; + } +} + diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayButieEmplyeeMapper.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayButieEmplyeeMapper.java index a203c68..c224746 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayButieEmplyeeMapper.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayButieEmplyeeMapper.java @@ -3,6 +3,10 @@ package com.ruoyi.pay.mapper; import com.ruoyi.pay.domain.PayButieEmplyee; import com.ruoyi.pay.domain.vo.PayButieEmplyeeVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; + +import java.math.BigDecimal; /** * 补贴和员工联系Mapper接口 @@ -12,4 +16,6 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; */ public interface PayButieEmplyeeMapper extends BaseMapperPlus { + @Update("UPDATE pay_butie_emplyee SET money = #{money} WHERE butie_id = #{btid} AND employee_id = #{empId} AND date = #{date} ") + Integer updateButieEmplyeeByDate(@Param("btid") Long btid, @Param("empId") Long empId, @Param("date") String date, @Param("money") BigDecimal money); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayButieEmplyeeService.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayButieEmplyeeService.java index 12766a7..29fb776 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayButieEmplyeeService.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayButieEmplyeeService.java @@ -2,6 +2,7 @@ package com.ruoyi.pay.service; import com.ruoyi.common.core.domain.R; import com.ruoyi.pay.domain.PayButieEmplyee; +import com.ruoyi.pay.domain.vo.ButieUpdateVo; import com.ruoyi.pay.domain.vo.PayButieEmplyeeVo; import com.ruoyi.pay.domain.bo.PayButieEmplyeeBo; import com.ruoyi.common.core.page.TableDataInfo; @@ -51,4 +52,6 @@ public interface IPayButieEmplyeeService { R generateBuTieEmpByMonth(String month, Boolean cover); R checkDataExist(String month); + + R updateAllBtempByDate(ButieUpdateVo vo); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayButieEmplyeeServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayButieEmplyeeServiceImpl.java index dda7373..7ecd663 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayButieEmplyeeServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayButieEmplyeeServiceImpl.java @@ -14,12 +14,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.pay.domain.PayButie; import com.ruoyi.pay.domain.PayEmployeeInfo; import com.ruoyi.pay.domain.bo.PayButieBo; -import com.ruoyi.pay.domain.vo.PayButieVo; -import com.ruoyi.pay.domain.vo.PayEmployeeInfoVo; +import com.ruoyi.pay.domain.vo.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.ruoyi.pay.domain.bo.PayButieEmplyeeBo; -import com.ruoyi.pay.domain.vo.PayButieEmplyeeVo; import com.ruoyi.pay.domain.PayButieEmplyee; import com.ruoyi.pay.mapper.PayButieEmplyeeMapper; import com.ruoyi.pay.service.IPayButieEmplyeeService; @@ -106,6 +104,24 @@ public class PayButieEmplyeeServiceImpl implements IPayButieEmplyeeService { return baseMapper.updateById(update) > 0; } + @Override + public R updateAllBtempByDate(ButieUpdateVo vo) { + List btList = vo.getBtList(); + if (ObjectUtil.isNotNull(btList) && btList.size() > 0) { + for (ButieTypeVo typeVo : btList) { + if (ObjectUtil.isNull(typeVo.getMoney())) { + typeVo.setMoney(BigDecimal.ZERO); + } + Integer integer = baseMapper.updateButieEmplyeeByDate(typeVo.getBtid(), vo.getEmpId(), vo.getDate(), typeVo.getMoney()); + if (integer == 0) { + return R.fail("本月补贴数据未生成"); + } + } + return R.ok("修改成功"); + } + return R.fail("数据异常"); + } + /** * 保存前的数据校验 */