From dccbfed64d8154b72a70e7ac34f222f7ec440da2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Dec 2021 17:41:10 +0800
Subject: [PATCH] 考试签到记录新增，用户测试导入修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index e576865..523eeb6 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -62,6 +62,8 @@
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.jurisdiction.service.JurisdictionService;
+import org.springblade.modules.signinrecords.entity.SignInRecords;
+import org.springblade.modules.signinrecords.service.SignInRecordsService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
@@ -73,6 +75,8 @@
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springblade.modules.training.entity.TrainingRegistration;
+import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -115,6 +119,11 @@
private final JurisdictionService jurisdictionService;
private final IDispatcherService dispatcherService;
+
+ private final SignInRecordsService signInRecordsService;
+
+
+ private final TrainingRegistrationService trainingRegistrationService;
/**
* 查询单条
@@ -436,7 +445,7 @@
* 修改
*/
@PostMapping("/updateUserInfo")
- public R updateUserInfo(@Valid @RequestBody User user) throws Exception {
+ public R updateUserInfo(@Valid @RequestBody UserVO user) throws Exception {
String url = null;
if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
if (user.getFingerprint().length()>100) {
@@ -452,6 +461,35 @@
//更新
userService.updateById(user);
+ //生成签到记录
+ if (null!=user.getCandidateNo() && !user.getCandidateNo().equals("")){
+ //查询签到记录，如果已有，则更新，没有就新增
+ SignInRecords signInRecords = new SignInRecords();
+ signInRecords.setCandidateNo(user.getCandidateNo());
+ SignInRecords inRecordsServiceOne = signInRecordsService.getOne(Condition.getQueryWrapper(signInRecords));
+ //如果为null
+ if (null==inRecordsServiceOne){
+ //查询报名信息
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setCandidateNo(user.getCandidateNo());
+ TrainingRegistration one = trainingRegistrationService.getOne(Condition.getQueryWrapper(trainingRegistration));
+ //新增,数据封装
+ SignInRecords sign = new SignInRecords();
+ sign.setCreateTime(new Date());
+ sign.setUpdateTime(new Date());
+ sign.setCandidateNo(user.getCandidateNo());
+ sign.setUserId(user.getId());
+ sign.setApplyId(one.getId());
+ sign.setExamId(Long.parseLong(one.getTrainExamId()));
+ //新增
+ signInRecordsService.save(sign);
+ }else {
+ //更新
+ inRecordsServiceOne.setUpdateTime(new Date());
+ signInRecordsService.updateById(inRecordsServiceOne);
+ }
+ }
+
//内网同步
String s1 =
"update blade_user set account = " + "'" + user.getCardid() + "'"
--
Gitblit v1.9.3