Merge branch 'pre'

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassStudentServiceImpl.java

@@ -8,6 +8,7 @@ import com.xjrsoft.common.enums.ArchivesStatusEnum;
 import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.RoleEnum;
+import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto;
 import com.xjrsoft.module.banding.dto.ChangeClassDto;
@@ -269,7 +270,12 @@ public class BandingTaskClassStudentServiceImpl extends MPJBaseServiceImpl<Bandi
 
         // 将字符串解析为LocalDate对象
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        return LocalDate.parse(birthdayString, formatter);
+        try {
+            LocalDate parse = LocalDate.parse(birthdayString, formatter);
+            return parse;
+        }catch (Exception e){
+            throw new MyException("身份证号填写错误，无法提取出生日期");
+        }
     }
 
     @Override

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassServiceImpl.java

@@ -18,6 +18,7 @@ import com.xjrsoft.module.organization.vo.UserStudentVo;
 import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -69,10 +70,14 @@ public class BaseClassServiceImpl extends MPJBaseServiceImpl<BaseClassMapper, Ba
         MPJLambdaWrapper<BaseClass> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .disableSubLogicDel()
-                .rightJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getClassId, BaseStudent::getId)
+                .innerJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getClassId, BaseStudent::getId)
                 .innerJoin(BaseStudentUser.class, BaseStudentUser::getId, BaseStudentSchoolRoll::getUserId)
+                .leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId)
                 .eq(BaseStudentSchoolRoll::getUserId, id)
                 .selectAs(BaseClass::getName, UserStudentVo::getClassName)
+                .selectAs(XjrUser::getName, UserStudentVo::getTeacherName)
+                .selectAs(XjrUser::getMobile, UserStudentVo::getTeacherMobile)
+                .selectAs(XjrUser::getId, UserStudentVo::getTeacherId)
                 .selectAs(BaseStudentUser::getName, UserStudentVo::getStudentName)
                 .selectAs(BaseStudentUser::getId, UserStudentVo::getStudentId)
                 .selectAs(BaseStudentSchoolRoll::getClassId, UserStudentVo::getClassId)

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -29,13 +29,12 @@ import com.xjrsoft.common.sms.SmsCtcc;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.config.CommonPropertiesConfig;
-import com.xjrsoft.module.base.dto.BaseClassroomChangeStatusDto;
 import com.xjrsoft.module.base.entity.BaseClass;
-import com.xjrsoft.module.base.entity.BaseClassroom;
 import com.xjrsoft.module.base.entity.BaseGrade;
+import com.xjrsoft.module.base.entity.WhitelistManagement;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
+import com.xjrsoft.module.base.service.IWhitelistManagementService;
 import com.xjrsoft.module.hikvision.util.DataUtil;
 import com.xjrsoft.module.organization.dto.AddUserDto;
 import com.xjrsoft.module.organization.dto.BindOpenidDto;
@@ -89,8 +88,8 @@ import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.BaseTeacher;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.workflow.constant.WorkflowConstant;
-import com.xjrsoft.module.workflow.mapper.WorkflowExtraMapper;
 import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -156,7 +155,7 @@ public class UserController {
     private final HistoryService historyService;
 
     private final IBaseStudentSchoolRollService baseStudentSchoolRollService;
-
+    private final IWhitelistManagementService whitelistManagementService;
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "用户列表（不分页）")
@@ -390,6 +389,9 @@ public class UserController {
         if (userStudentVo != null) {
             vo.setClassId(userStudentVo.getClassId());
             vo.setClassName(userStudentVo.getClassName());
+            vo.setTeacherId(userStudentVo.getTeacherId());
+            vo.setTeacherName(userStudentVo.getTeacherName());
+            vo.setTeacherMobile(userStudentVo.getTeacherMobile());
         }
 
         List<File> fileList = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, user.getSignFolderId()));
@@ -744,6 +746,15 @@ public class UserController {
             return RT.error("学生不存在！");
         }
 
+        List<WhitelistManagement> managementList = whitelistManagementService.list(
+                new QueryWrapper<WhitelistManagement>().lambda()
+                        .eq(WhitelistManagement::getUserId, dto.getUserId())
+        );
+        userStudentInfoVo.setWhitelistStatus(0);
+        if(!managementList.isEmpty()){
+            userStudentInfoVo.setWhitelistStatus(1);
+        }
+
         return RT.ok(userStudentInfoVo);
     }
 
@@ -768,7 +779,11 @@ public class UserController {
                         .innerJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, UserStudent::getStudentId)
                         .innerJoin(BaseStudentUser.class, BaseStudentUser::getId, UserStudent::getStudentId)
                         .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId)
+                        .leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId)
                         .select(BaseStudentSchoolRoll::getClassId)
+                        .selectAs(XjrUser::getName, UserStudentVo::getTeacherName)
+                        .selectAs(XjrUser::getMobile, UserStudentVo::getTeacherMobile)
+                        .selectAs(XjrUser::getId, UserStudentVo::getTeacherId)
                         .select(UserStudent::getStudentId,UserStudent::getStatus)
                         .selectAs(BaseClass::getName, UserStudentVo::getClassName)
                         .selectAs(BaseStudentUser::getName, UserStudentVo::getStudentName)

src/main/java/com/xjrsoft/module/organization/vo/UserInfoVo.java

@@ -129,4 +129,13 @@ public class UserInfoVo {
 
     @ApiModelProperty("身份证")
     private String credentialNumber;
+
+    @ApiModelProperty("班主任id")
+    private Long teacherId;
+
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+    @ApiModelProperty("班主任电话")
+    private String teacherMobile;
 }

src/main/java/com/xjrsoft/module/organization/vo/UserStudentInfoVo.java

@@ -33,4 +33,8 @@ public class UserStudentInfoVo implements Serializable {
     @ApiModelProperty("班主任")
     public Long teacherId;
 
+
+    @ApiModelProperty("是否存在于白名单中(1:是 0:否)")
+    public Integer whitelistStatus;
+
 }

src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java

@@ -93,7 +93,7 @@ public class FaceManagementController {
     @GetMapping(value = "/detail")
     @ApiOperation(value = "根据当前用户查询人脸信息")
     @SaCheckPermission("facemanager:detail")
-    public RT<FaceManagementVo> detail(@RequestParam Long id) {
+    public RT<FaceManagementVo> detail(Long id) {
         Long userId = StpUtil.getLoginIdAsLong();
         if(id != null){
             userId = id;

src/main/java/com/xjrsoft/module/personnel/controller/StundentFaceProcessController.java

@@ -359,7 +359,7 @@ public class StundentFaceProcessController {
                 String faceId = null;
                 if(process.getHikvisionResult() != null && process.getHikvisionResult().startsWith("{") && process.getHikvisionResult().endsWith("}")){
                     JsonObject object = parser.parse(process.getHikvisionResult()).getAsJsonObject();
-                    if("0".equals(object.get("code").getAsString()) && "success".equals(object.get("msg").getAsString())){
+                    if("0".equals(object.get("code").getAsString()) && "success".equals(object.get("msg").getAsString()) && !object.get("data").isJsonNull()){
                         faceId = object.get("data").getAsJsonObject().get("faceId").getAsString();
                     }
                 }

src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java

@@ -317,7 +317,7 @@ public class TeacherFaceProcessController {
                 String faceId = null;
                 if(process.getHikvisionResult() != null && process.getHikvisionResult().startsWith("{") && process.getHikvisionResult().endsWith("}")){
                     JsonObject object = parser.parse(process.getHikvisionResult()).getAsJsonObject();
-                    if("0".equals(object.get("code").getAsString()) && "success".equals(object.get("msg").getAsString())){
+                    if("0".equals(object.get("code").getAsString()) && "success".equals(object.get("msg").getAsString()) && !object.get("data").isJsonNull()){
                         faceId = object.get("data").getAsJsonObject().get("faceId").getAsString();
                     }
                 }

src/main/java/com/xjrsoft/module/personnel/service/impl/StundentFaceProcessServiceImpl.java

@@ -129,6 +129,7 @@ public class StundentFaceProcessServiceImpl extends MPJBaseServiceImpl<StundentF
         studentFace.setFacePhoto(dto.getFileId());
         studentFace.setName(dto.getName());
         studentFace.setStatus(1);
+        studentFace.setExamStatus(1);
         studentFace.setUserId(dto.getUserId());
         studentFace.setIdentityCard(user.getCredentialNumber());
         studentFace.setGender(user.getGender());

src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -273,7 +273,7 @@ public class BaseNewStudentController {
         //新增白名单信息
         List<WhitelistManagement> managementList = whitelistManagementService.list(
                 new QueryWrapper<WhitelistManagement>().lambda()
-                        .eq(WhitelistManagement::getUserId, dto)
+                        .eq(WhitelistManagement::getUserId, dto.getId())
         );
         if(managementList.isEmpty()){
             WhitelistManagement whitelistManagement = new WhitelistManagement() {{