From 786b6a88d5f7533585a02483697ca46a51561549 Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 11 Jun 2025 16:42:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E3=80=81?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=91=98=E5=B7=A5=E6=9F=A5=E8=AF=A2=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysRegisterController.java | 2 +- .../controller/system/SysUserController.java | 4 +- .../ruoyi/pay/controller/WxController.java | 81 +++++++++++++++++++ .../service/impl/SysUserServiceImpl.java | 8 +- 4 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 ruoyi-pay/src/main/java/com/ruoyi/pay/controller/WxController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index fc7a025..88b3336 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -84,7 +84,7 @@ public class SysRegisterController extends BaseController { } if(iPayTenantService.insertByBo(bo)){ //公司注册成功后自动添加角色：管理员 todo - Long[] adids={1L, 1921833283434213378L, 1921827581902888962L, 1921827581902888963L, 1921827581902888964L, 1921827581902888965L, 1921827581902888966L, 1921827581902888967L, 1921833488053334018L, 1921827579365335041L, 1921827579365335042L, 1921827579365335043L, 1921827579365335044L, 1921827579365335045L, 1921827579365335046L, 1921827582745944066L, 1921827582745944067L, 1921827582745944068L, 1921827582745944069L, 1921827582745944070L, 1921827582745944071L, 1921827581055639553L, 1921827581055639554L, 1921827581055639555L, 1921827581055639556L, 1921827581055639557L, 1921827581055639558L, 1921827581252771841L, 1921827581252771842L, 1921827581252771843L, 1921827581252771844L, 1921827581252771845L, 1921827581252771846L, 1921834138757656577L, 1921827582162935809L, 1921827582162935810L, 1921827582162935811L, 1921827582162935812L, 1921827582162935813L, 1921827582162935814L, 1921827582490091522L, 1921827582490091523L, 1921827582490091524L, 1921827582490091525L, 1921827582490091526L, 1921827582490091527L, 1921827583140208641L, 1921827583140208642L, 1921827583140208643L, 1921827583140208644L, 1921827583140208645L, 1921827583140208646L, 1921827581449904130L, 1921827581449904131L, 1921827581449904132L, 1921827581449904133L, 1921827581449904134L, 1921827581449904135L, 1921827583601582082L, 1921827583601582083L, 1921827583601582084L, 1921827583601582085L, 1921827583601582086L, 1921827583601582087L, 1921835117498494977L, 1921827582880161794L, 1921827582880161795L, 1921827582880161796L, 1921827582880161797L, 1921827582880161798L, 1921827582880161799L, 100L, 1001L, 1002L, 1003L, 1004L, 1005L, 1006L, 1007L, 101L, 1010L, 1011L, 1012L, 1013L, 1014L}; + Long[] adids={1L, 1921827581902888962L, 1921827581902888963L, 1921827581902888964L, 1921827581902888965L, 1921827581902888966L, 1921827581902888967L, 1925831567442079745L, 103L, 1030L, 1031L, 1032L, 1033L, 1921833488053334018L, 1921827579365335041L, 1921827579365335042L, 1921827579365335043L, 1921827579365335044L, 1921827579365335045L, 1921827579365335046L, 1923557328978636802L, 1921827582745944066L, 1921827582745944067L, 1921827582745944068L, 1921827582745944069L, 1921827582745944070L, 1921827582745944071L, 1924730554400305154L, 1921827581055639553L, 1921827581055639554L, 1921827581055639555L, 1921827581055639556L, 1921827581055639557L, 1921827581055639558L, 1921827581252771841L, 1921827581252771842L, 1921827581252771843L, 1921827581252771844L, 1921827581252771845L, 1921827581252771846L, 1928011063268118530L, 1921834138757656577L, 1921827582162935809L, 1921827582162935810L, 1921827582162935811L, 1921827582162935812L, 1921827582162935813L, 1921827582162935814L, 1921827582490091522L, 1921827582490091523L, 1921827582490091524L, 1921827582490091525L, 1921827582490091526L, 1921827582490091527L, 1921827583140208641L, 1921827583140208642L, 1921827583140208643L, 1921827583140208644L, 1921827583140208645L, 1921827583140208646L, 1928258489392517122L, 1921827583601582082L, 1921827583601582083L, 1921827583601582084L, 1921827583601582085L, 1921827583601582086L, 1921827583601582087L, 1921827581449904130L, 1921827581449904131L, 1921827581449904132L, 1921827581449904133L, 1921827581449904134L, 1921827581449904135L, 1921835117498494977L, 1921827582880161794L, 1921827582880161795L, 1921827582880161796L, 1921827582880161797L, 1921827582880161798L, 1921827582880161799L, 1930900100035280898L, 100L, 1001L, 1002L, 1003L, 1004L, 1005L, 1006L, 1007L, 101L, 1010L, 1011L, 1012L, 1013L, 1014L}; Long[] ygids={1921835117498494977L, 1921827582880161794L, 1921827582880161795L}; SysRole role1 = new SysRole(); role1.setRoleKey("companyAdmin"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 4e56a02..e431145 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -152,8 +152,8 @@ public class SysUserController extends BaseController { return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkNickNameUnique(user)) { - return R.fail("新增用户'" + user.getUserName() + "'失败，用户已存在"); + } else if (StringUtils.isNotEmpty(user.getNickName()) && !userService.checkNickNameUnique(user)) { + return R.fail("新增用户'" + user.getUserName() + "'失败，用户昵称已存在"); } user.setPassword(BCrypt.hashpw(user.getPassword())); return toAjax(userService.insertUser(user)); diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/WxController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/WxController.java new file mode 100644 index 0000000..558fc19 --- /dev/null +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/WxController.java @@ -0,0 +1,81 @@ +package com.ruoyi.pay.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.pay.domain.PayDayWorkHoursQuery; +import com.ruoyi.pay.domain.PaySalaryReport; +import com.ruoyi.pay.domain.bo.PayAttendanceBo; +import com.ruoyi.pay.domain.bo.PaySalaryReportBo; +import com.ruoyi.pay.domain.vo.PayAttendanceVo; +import com.ruoyi.pay.domain.vo.PaySalaryReportVo; +import com.ruoyi.pay.service.IPayAttendanceService; +import com.ruoyi.pay.service.IPayDayWorkHoursService; +import com.ruoyi.pay.service.IPaySalaryReportService; +import com.ruoyi.pay.util.AttendanceExcelUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 微信移动端接口 + * + * @author ruoyi + * @date 2025-05-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/pay/wx/emp") +public class WxController extends BaseController { + + private final IPaySalaryReportService paySalaryReportService; + private final IPayDayWorkHoursService payDayWorkHoursService; + + /** + * 员工查询个人工资得接口 + */ + @GetMapping("/salary") + public TableDataInfo getSalaryReportForEmployee(PaySalaryReportBo bo) { + List list = paySalaryReportService.queryList(bo); + if(list!=null&&list.size()>0){ + if(list.get(0).getEmpQuery()==0){//如果状态为不可查询，返回null数据 + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("当前工资状态：不可查询"); + // rspData.setRows(new ArrayList()); + rspData.setTotal(0); + return rspData; + } + } + return TableDataInfo.build(list); + } + + /** + * 员工查询个人日工工时 + */ + @GetMapping("/dayWork") + public TableDataInfo getDayWorkForEmployee(PayDayWorkHoursQuery payDayWorkHoursQuery) { + List list =payDayWorkHoursService.selectPayDayWorkHoursList2(payDayWorkHoursQuery); + return TableDataInfo.build(list); + } + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index a38a70a..f2b6995 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -204,7 +204,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { public boolean checkUserNameUnique(SysUser user) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() .eq(SysUser::getUserName, user.getUserName()) - .eq(SysUser::getTenantId, user.getTenantId()) + // .eq(SysUser::getTenantId, user.getTenantId()) .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); return !exist; } @@ -219,7 +219,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { public boolean checkNickNameUnique(SysUser user) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() .eq(SysUser::getNickName, user.getNickName()) - .eq(SysUser::getTenantId, user.getTenantId()) + //.eq(SysUser::getTenantId, user.getTenantId()) .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); return !exist; } @@ -233,7 +233,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { public boolean checkPhoneUnique(SysUser user) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() .eq(SysUser::getPhonenumber, user.getPhonenumber()) - .eq(SysUser::getTenantId, user.getTenantId()) + // .eq(SysUser::getTenantId, user.getTenantId()) .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); return !exist; } @@ -247,7 +247,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { public boolean checkEmailUnique(SysUser user) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() .eq(SysUser::getEmail, user.getEmail()) - .eq(SysUser::getTenantId, user.getTenantId()) + //.eq(SysUser::getTenantId, user.getTenantId()) .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); return !exist; }