diff --git a/evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java b/evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java index d97d06a..34938e6 100644 --- a/evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java +++ b/evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java @@ -61,4 +61,5 @@ public interface IRzAttendanceService extends IService RzAttendance selectRzAttendanceBySfIdAndNameAndTime(Long userId, String employeeName, String replacementTime,Boolean isAttendance); + public void sendAbnormalAttendance(); } diff --git a/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java b/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java index 5964d7d..39a53c0 100644 --- a/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java @@ -20,6 +20,10 @@ import com.evo.equipment.service.IEqImagesService; import com.evo.system.domain.SysStaff; import com.evo.system.mapper.SysDeptMapper; import com.evo.system.service.ISysStaffService; +import com.evo.wechat.service.SendClientService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -34,6 +38,7 @@ import java.util.List; * @author chenyj * @date 2024-09-05 */ +@Slf4j @Service public class RzAttendanceServiceImpl extends ServiceImpl implements IRzAttendanceService { @Resource @@ -44,12 +49,15 @@ public class RzAttendanceServiceImpl extends ServiceImpl().eq(SysStaff::getIdCard, user.getIdCard()), false); + SysStaff sysStaff = sysStaffService.getOne(new LambdaQueryWrapper().eq(SysStaff::getName, user.getName().trim()).eq(SysStaff::getIdCard, user.getIdCard().trim()), false); if(ObjectUtils.isEmpty(sysStaff)){ - sysStaff = sysStaffService.getOne(new LambdaQueryWrapper().eq(SysStaff::getPhone, user.getPhone()), false); + model.addAttribute("message", "信息提交失败, 请检查你的个人信息录入是否正确"); + model.addAttribute("user", user); + return "error.html"; } - if(ObjectUtils.isEmpty(sysStaff)){ - model.addAttribute("message", "处理失败, 请检查你的个人信息录入是否正确"); - return "success.html"; + if(StringUtils.isEmpty(sysStaff.getOpenid())){ + sysStaff.setOpenid(user.getOpenid()); + sysStaffService.updateById(sysStaff); + model.addAttribute("message", "信息提交成功"); + }else{ + model.addAttribute("message", "当前用户信息已完善, 无需再次提交"); } - sysStaff.setOpenid(user.getOpenid()); - sysStaffService.updateById(sysStaff); - model.addAttribute("message", "处理成功"); return "success.html"; } } diff --git a/evo-admin/src/main/resources/templates/error.html b/evo-admin/src/main/resources/templates/error.html new file mode 100644 index 0000000..c67596b --- /dev/null +++ b/evo-admin/src/main/resources/templates/error.html @@ -0,0 +1,133 @@ + + + + + + 河北伊特机械设备有限公司-提交失败 + + + + + + + + + + + + +
+
+ +
+

河北伊特机械设备有限公司考勤系统

+

信息提交结果

+
+ + +
+
+
+ +
+
+ +

+ 信息提交失败,请检查相关信息后重试 +

+
+
+
+ + +
+

请修改以下信息并重新提交:

+ + +
+ + +

+
+ + +
+ + +

+
+ + + + + +
+ +
+
+
+
+ + + + + diff --git a/evo-admin/src/main/resources/templates/success.html b/evo-admin/src/main/resources/templates/success.html index af4bc46..1e63830 100644 --- a/evo-admin/src/main/resources/templates/success.html +++ b/evo-admin/src/main/resources/templates/success.html @@ -1,9 +1,61 @@ - Hello + + + 河北伊特机械设备有限公司-提交成功 + + + + + + + + + - -

+ + +
+
+ +
+

河北伊特机械设备有限公司考勤系统

+

信息提交结果

+
+ + +
+
+ +
+ +

+ 信息提交成功!您将收到考勤异常通知 +

+
+
+
- \ No newline at end of file + diff --git a/evo-admin/src/main/resources/templates/user_info.html b/evo-admin/src/main/resources/templates/user_info.html index 8f69107..60696dc 100644 --- a/evo-admin/src/main/resources/templates/user_info.html +++ b/evo-admin/src/main/resources/templates/user_info.html @@ -3,7 +3,7 @@ - 用户信息提交 + 河北伊特机械设备有限公司-用户信息完善 @@ -48,7 +48,7 @@
-

用户信息信息完善

+

河北伊特机械制造有限公司考勤系统

请填写以下信息并提交

@@ -78,26 +78,9 @@ required>

- - -
- - -

-
- - - - - - +

信息用途为完善考勤系统用户信息,以便通过微信公众号的途径将相关信息通知用户

+

此信息为自愿填报,若不填报将无法收到考勤异常通知