Merge remote-tracking branch 'origin/dev' into dev

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

@@ -21,11 +21,9 @@ import com.xjrsoft.module.banding.entity.BandingTaskClass;
 import com.xjrsoft.module.banding.entity.BandingTaskClassStudent;
 import com.xjrsoft.module.banding.mapper.BandingTaskClassMapper;
 import com.xjrsoft.module.banding.mapper.BandingTaskClassStudentMapper;
-import com.xjrsoft.module.banding.mapper.BandingTaskMapper;
 import com.xjrsoft.module.banding.service.IBandingTaskClassStudentService;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseSemester;
-import com.xjrsoft.module.base.mapper.BaseMajorSetMapper;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseSemesterService;
 import com.xjrsoft.module.organization.entity.User;
@@ -39,7 +37,6 @@ import com.xjrsoft.module.student.entity.BaseStudentFamily;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.entity.StudentReportPlan;
 import com.xjrsoft.module.student.entity.StudentReportRecord;
-import com.xjrsoft.module.student.mapper.BaseClassMajorSetMapper;
 import com.xjrsoft.module.student.mapper.StudentReportRecordMapper;
 import com.xjrsoft.module.student.service.IBaseNewStudentService;
 import com.xjrsoft.module.student.service.IBaseStudentFamilyService;
@@ -71,21 +68,18 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class BandingTaskClassStudentServiceImpl extends MPJBaseServiceImpl<BandingTaskClassStudentMapper, BandingTaskClassStudent> implements IBandingTaskClassStudentService {
     private final BandingTaskClassMapper taskClassMapper;
-    private final BandingTaskMapper bandingTaskMapper;
     private final IStudentReportPlanService reportPlanService;
     private final IBaseSemesterService semesterService;
     private final IBaseNewStudentService newStudentService;
     private final StudentReportRecordMapper reportRecordMapper;
 
     private final IBaseClassService classService;
-    private final BaseClassMajorSetMapper classMajorSetMapper;
     private final CommonPropertiesConfig propertiesConfig;
     private final IUserService userService;
     private final IUserRoleRelationService roleRelationService;
     private final IBaseStudentSchoolRollService schoolRollService;
     private final IBaseStudentService studentService;
     private final IBaseStudentFamilyService familyService;
-    private final BaseMajorSetMapper majorSetMapper;
     private final RedisUtil redisUtil;
 
     @Override
@@ -159,6 +153,7 @@ public class BandingTaskClassStudentServiceImpl extends MPJBaseServiceImpl<Bandi
 
             for (StudentReportPlan plan : planList) {
                 for (Long newStudentId : dto.getNewStudentIds()) {
+                    reportRecordMapper.deleteRecordByUserIdAndPlanId(newStudentId, plan.getId());
                     StudentReportRecord record = new StudentReportRecord();
                     record.setCreateDate(new Date());
                     record.setCreateUserId(StpUtil.getLoginIdAsLong());

src/main/java/com/xjrsoft/module/banding/vo/BandingTaskClassSureListVo.java

@@ -51,5 +51,17 @@ public class BandingTaskClassSureListVo {
     @ApiModelProperty("走读人数")
     private Integer notStayCount;
 
+    @ApiModelProperty("男生住校人数")
+    private Integer maleStayCount;
+
+    @ApiModelProperty("男生走读人数")
+    private Integer maleNotStayCount;
+
+    @ApiModelProperty("女生住校人数")
+    private Integer femaleStayCount;
+
+    @ApiModelProperty("女生走读人数")
+    private Integer femaleNotStayCount;
+
 
 }

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateObjectServiceImpl.java

@@ -516,6 +516,19 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
                 }
                 objectListVo.setExecuterCount(currentExecuterList.size());
                 objectListVo.setExecuterList(currentExecuterList);
+
+
+                Set<String> collect = currentExecuterList.stream().map(EvaluateExecuterVo::getExecuterId).collect(Collectors.toSet());
+                List<EvaluateExecuterVo> notExecuterList = new ArrayList<>();
+                List<User> notUserList = userList.stream().filter(x -> !collect.contains(x.getId().toString())).collect(Collectors.toList());
+                for (User user : notUserList) {
+                    EvaluateExecuterVo evaluateExecuterVo = new EvaluateExecuterVo();
+                    evaluateExecuterVo.setExecuterId(user.getId().toString());
+                    evaluateExecuterVo.setEvaluateObjectId(objectListVo.getObjectId());
+                    evaluateExecuterVo.setExecuterName(user.getName());
+                    notExecuterList.add(evaluateExecuterVo);
+                }
+                objectListVo.setNotExecuterList(notExecuterList);
             }
 
         }

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateObjectListVo.java

@@ -52,6 +52,9 @@ public class EvaluateObjectListVo {
     @ApiModelProperty("参与评价的人")
     private List<EvaluateExecuterVo> executerList;
 
+    @ApiModelProperty("待选参与评价的人")
+    private List<EvaluateExecuterVo> notExecuterList;
+
     /**
      * 被评价对象id
      */

src/main/java/com/xjrsoft/module/hikvision/util/DataUtil.java

@@ -144,8 +144,8 @@ public class DataUtil {
         Set<String> classTypeSet = new HashSet<>();
         for (String status : stduyStatus) {
             for (Map<String, Object> dict : classTypeList) {
-                if (tableData != null && tableData.containsKey(dict.get("code").toString())) {
-                    classTypeSet.add(dict.get("code").toString());
+                if (tableData != null && tableData.containsKey(dict.get("code").toString() + "-" + status)) {
+                    classTypeSet.add(dict.get("code").toString() + "-" + status);
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
@@ -180,7 +180,7 @@ public class DataUtil {
         for (String classType : classTypeSet) {
             for (Map<String, Object> baseGrade : gradeList) {
                 gradeNameMap.put(Long.parseLong(baseGrade.get("id").toString()), baseGrade.get("name").toString().replaceAll("级", ""));
-                if (tableData != null && tableData.containsKey(baseGrade.get("id").toString())) {
+                if (tableData != null && tableData.containsKey(baseGrade.get("name").toString().replaceAll("级", "") + "-" + classType)) {
                     continue;
                 }
                 JsonObject paramJson = new JsonObject();
@@ -394,7 +394,7 @@ public class DataUtil {
         }
 
         //插入记录表
-        //insertRecord(tableName, idMap);
+        insertRecord(tableName, idMap);
         return idMap;
     }
 

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

@@ -6,6 +6,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.annotation.XjrLog;
+import com.xjrsoft.common.enums.ArchivesStatusEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -105,6 +106,7 @@ public class BaseStudentInfoController {
     @SaCheckPermission("room:detail")
     @XjrLog(value = "根据姓名或者身份证号查询详情信息")
     public RT<List<BaseStudentSompleInfoVo>> info(@Valid BaseStudentSimpleInfoDto dto) {
+        dto.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
         List<BaseStudentSompleInfoVo> infos = baseStudentSchoolRollService.getInfosByParam(dto);
         return RT.ok(infos);
     }

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.annotation.XjrLog;
+import com.xjrsoft.common.enums.ArchivesStatusEnum;
 import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.GenderDictionaryEnum;
 import com.xjrsoft.common.exception.MyException;
@@ -27,25 +28,40 @@ import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
 import com.xjrsoft.module.concat.service.IXjrUserService;
-import com.xjrsoft.module.feedback.entity.FeedbackItem;
 import com.xjrsoft.module.hikvision.util.DataUtil;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.organization.service.IUserDeptRelationService;
 import com.xjrsoft.module.room.service.IRoomBedService;
 import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
+import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
+import com.xjrsoft.module.student.dto.BaseStudentSimpleInfoDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.dto.MajorGradeClassDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
 import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.student.service.IStudentManagerService;
-import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.student.vo.BaseDepMajorGradeClassStudenTreeVo;
+import com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo;
+import com.xjrsoft.module.student.vo.BaseStudentSchoolRollVo;
+import com.xjrsoft.module.student.vo.BaseStudentSompleInfoVo;
+import com.xjrsoft.module.student.vo.BaseStudentTreeVo;
+import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentUserVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
@@ -53,7 +69,16 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -65,6 +90,7 @@ import java.util.zip.ZipFile;
 public class StudentManagerController {
 
     private final IStudentManagerService studentManagerService;
+    private final IBaseStudentSchoolRollService schoolRollService;
     private final IBaseGradeService baseGradeService;
     private final IBaseClassService baseClassService;
     private final IXjrUserService xjrUserService;
@@ -213,6 +239,19 @@ public class StudentManagerController {
         return R.ok(studentManagerService.add(dto));
     }
 
+    @GetMapping(value = "/find-student-exist")
+    @ApiOperation(value = "新增前判断学生是否存在")
+    @SaCheckPermission("studentmanager:detail")
+    @XjrLog(value = "新增前判断学生是否存在")
+    public RT<BaseStudentSompleInfoVo> info(@Valid BaseStudentSimpleInfoDto dto) {
+        List<BaseStudentSompleInfoVo> infos = schoolRollService.getInfosByParam(dto);
+        if(infos.isEmpty()){
+            return RT.ok();
+        }
+        return RT.ok(infos.get(0));
+    }
+
+
     @PostMapping("upload-image")
     @ApiOperation(value = "上传学生学籍照片")
     @SaCheckPermission("studentmanager:add")
@@ -252,10 +291,13 @@ public class StudentManagerController {
     @PostMapping("/import")
     @ApiOperation(value = "导入学生信息")
     @XjrLog(value = "导入学生信息", saveRequestData = false, saveResponseData = true)
-    public RT<Boolean> importData(@RequestParam("file") MultipartFile file) throws IOException, ParseException {
+    public RT<List<BaseStudentSompleInfoVo>> importData(@RequestParam("file") MultipartFile file) throws IOException, ParseException {
         List<Map<Integer, Object>> excelDataList = EasyExcel.read(file.getInputStream()).sheet().headRowNumber(3).doReadSync();
-
-        return RT.ok(studentManagerService.importStudentData(excelDataList));
+        List<BaseStudentSompleInfoVo> result = studentManagerService.importStudentData(excelDataList);
+        if(!result.isEmpty()){
+            return RT.ok(result);
+        }
+        return RT.ok(null);
     }
 
 

src/main/java/com/xjrsoft/module/student/dto/BaseStudentSimpleInfoDto.java

@@ -1,8 +1,11 @@
 package com.xjrsoft.module.student.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author dzx
  * @date 2024/7/9
@@ -23,4 +26,9 @@ public class BaseStudentSimpleInfoDto {
 
     @ApiModelProperty("学籍状态")
     private String archivesStatus;
+
+    private List<String> idNumberList;
+
+    @JsonIgnore
+    private Integer findNewStudent = 1;
 }

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentSchoolRollMapper.java

@@ -50,16 +50,16 @@ public interface BaseStudentSchoolRollMapper extends MPJBaseMapper<BaseStudentSc
 
 
     @Update("UPDATE base_student_school_roll SET class_id = #{classId},major_set_id=#{majorSetId} where user_id = #{userId}")
-    Boolean updateStudentClass1(Long classId, Long majorSetId, Long userId);
+    Boolean updateStudentClass1(@Param("classId") Long classId, @Param("majorSetId") Long majorSetId, @Param("userId") Long userId);
 
     @Update("UPDATE base_student_school_roll SET class_id = #{classId} where user_id = #{userId}")
-    Boolean updateStudentClass(Long classId, Long userId);
+    Boolean updatestudentclassByClassIdAndUserId(@Param("classId") Long classId, @Param("userId") Long userId);
 
     @Update("UPDATE base_student_school_roll SET class_id = #{classId},major_set_id=#{majorSetId},grade_id=#{gradeId} where user_id = #{userId}")
-    Boolean updateStudentClass(Long classId, Long gradeId, Long majorSetId, Long userId);
+    Boolean updateStudentClass(@Param("classId") Long classId, @Param("gradeId") Long gradeId, @Param("majorSetId") Long majorSetId, @Param("userId") Long userId);
 
     @Update("UPDATE base_student_school_roll SET class_id = #{classId},major_set_id=#{majorSetId},grade_id=#{gradeId},stduy_status=#{stduyStatus} where user_id = #{userId}")
-    Boolean updateStudentClassGradeMajorStduyStatus(Long classId, Long gradeId, Long majorSetId, String stduyStatus, Long userId);
+    Boolean updateStudentClassGradeMajorStduyStatus(@Param("classId") Long classId, @Param("gradeId") Long gradeId, @Param("majorSetId") Long majorSetId, @Param("stduyStatus") String stduyStatus, @Param("userId") Long userId);
 
 
     String getClassNameByUserId(@Param("userId") Long userId);

src/main/java/com/xjrsoft/module/student/mapper/StudentReportRecordMapper.java

@@ -12,6 +12,7 @@ import com.xjrsoft.module.student.vo.StudentReportRecordStatisticsListVo;
 import com.xjrsoft.module.student.vo.StudentReportRecordStatisticsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -41,4 +42,7 @@ public interface StudentReportRecordMapper extends MPJBaseMapper<StudentReportRe
 
     List<StudentReportRecordPlanPageVo> getTryReadingList(@Param("dto") StudentTryReadingReportPageDto dto);
 
+    @Update("update student_report_record set delete_mark = 1 where user_id = #{userId} and student_report_plan_id = #{planId}")
+    Boolean deleteRecordByUserIdAndPlanId(@Param("userId") Long userId, @Param("planId") Long planId);
+
 }

src/main/java/com/xjrsoft/module/student/service/IStudentManagerService.java

@@ -9,6 +9,7 @@ import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.vo.BaseDepMajorGradeClassStudenTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentClassVo;
+import com.xjrsoft.module.student.vo.BaseStudentSompleInfoVo;
 import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
 import com.xjrsoft.module.student.vo.PersonalPortraitPersonalInfoVo;
 import org.springframework.web.multipart.MultipartFile;
@@ -60,7 +61,7 @@ public interface IStudentManagerService extends MPJBaseService<BaseStudentUser>
      */
     PersonalPortraitPersonalInfoVo getPersonalInfo(Long userId);
 
-    Boolean importStudentData(List<Map<Integer, Object>> excelDataList) throws ParseException;
+    List<BaseStudentSompleInfoVo> importStudentData(List<Map<Integer, Object>> excelDataList) throws ParseException;
 
 
     Page<BaseStudentUserPageVo> getStudentPage(Page<BaseStudentUserPageVo> page, BaseStudentUserPageDto dto);

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentSchoolRollServiceImpl.java

@@ -269,14 +269,13 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateStudentClass(Long classId, Long userId) {
-        return baseStudentSchoolRollMapper.updateStudentClass(classId, userId);
+        return baseStudentSchoolRollMapper.updatestudentclassByClassIdAndUserId(classId, userId);
     }
 
     @Override
     public List<BaseStudentSompleInfoVo> getInfosByParam(BaseStudentSimpleInfoDto dto) {
-        dto.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
         List<BaseStudentSompleInfoVo> userList = userMapper.getInfosByParam(dto);
-        if(userList.isEmpty()){
+        if(userList.isEmpty() && dto.getFindNewStudent() == 1){
             userList = newStudentMapper.getInfosByParam(dto);
         }
         return userList;

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -32,11 +32,13 @@ import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.mapper.UserDeptRelationMapper;
+import com.xjrsoft.module.organization.mapper.UserMapper;
 import com.xjrsoft.module.organization.mapper.UserRoleRelationMapper;
 import com.xjrsoft.module.organization.service.IDepartmentService;
 import com.xjrsoft.module.organization.service.IUserDeptRelationService;
 import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
+import com.xjrsoft.module.student.dto.BaseStudentSimpleInfoDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.dto.MajorGradeClassDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
@@ -75,7 +77,7 @@ import java.util.stream.Collectors;
 @Service
 @AllArgsConstructor
 public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUserMapper, BaseStudentUser> implements IStudentManagerService {
-    private final com.xjrsoft.module.student.mapper.BaseStudentUserMapper studentbaseManagerBaseStudentUserMapper;
+    private final com.xjrsoft.module.student.mapper.BaseStudentUserMapper baseStudentUserMapper;
 
     private final IBaseStudentService baseStudentService;
     private final BaseClassMapper baseClassMapper;
@@ -109,6 +111,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
     private final IBaseGradeService baseGradeService;
     private final IStudentChangeRecordService recordService;
     private IDictionarydetailService dictionarydetailService;
+    private final UserMapper userMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -119,7 +122,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
 
         // 用户身份证后6位作为默认密码
         baseStudentUser.setPassword(BCrypt.hashpw(propertiesConfig.getDefaultPassword(), BCrypt.gensalt()));
-        studentbaseManagerBaseStudentUserMapper.insert(baseStudentUser);
+        baseStudentUserMapper.insert(baseStudentUser);
         for (BaseStudent baseStudent : baseStudentUser.getBaseStudentList()) {
 
             baseStudent.setUserId(baseStudentUser.getId());
@@ -203,11 +206,18 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean update(UpdateBaseStudentUserDto dto) {
-
+        List<BaseStudentUser> studentUserList = baseStudentUserMapper.selectList(
+                new QueryWrapper<BaseStudentUser>().lambda()
+                        .eq(BaseStudentUser::getCredentialNumber, dto.getCredentialNumber())
+                        .ne(BaseStudentUser::getId, dto.getId())
+        );
+        if(!studentUserList.isEmpty()){
+            throw new MyException("该身份证已被其他人占用，请检查是否正确");
+        }
         BaseStudentUser baseStudentUser = BeanUtil.toBean(dto, BaseStudentUser.class);
         baseStudentUser.setCode(dto.getUserName());
 
-        studentbaseManagerBaseStudentUserMapper.updateById(baseStudentUser);
+        baseStudentUserMapper.updateById(baseStudentUser);
 
         //先删除再新增
         userDeptRelationService.remove(Wrappers.<UserDeptRelation>query().lambda().eq(UserDeptRelation::getUserId, baseStudentUser.getId()));
@@ -428,7 +438,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delete(List<Long> ids) {
-        studentbaseManagerBaseStudentUserMapper.deleteBatchIds(ids);
+        baseStudentUserMapper.deleteBatchIds(ids);
         baseStudentService.remove(Wrappers.lambdaQuery(BaseStudent.class).in(BaseStudent::getUserId, ids));
         studentContactService.remove(Wrappers.lambdaQuery(BaseStudentContact.class).in(BaseStudentContact::getUserId, ids));
         familyMapper.delete(Wrappers.lambdaQuery(BaseStudentFamily.class).in(BaseStudentFamily::getUserId, ids));
@@ -481,11 +491,19 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
     }
 
     @Override
-    public Boolean importStudentData(List<Map<Integer, Object>> excelDataList) throws ParseException {
+    public List<BaseStudentSompleInfoVo> importStudentData(List<Map<Integer, Object>> excelDataList) throws ParseException {
         List<String> idNumbers = new ArrayList<>();
         for (Map<Integer, Object> integerObjectMap : excelDataList) {
             idNumbers.add(integerObjectMap.get(0).toString());
         }
+
+        List<BaseStudentSompleInfoVo> infos = userMapper.getInfosByParam(new BaseStudentSimpleInfoDto() {{
+            setIdNumberList(idNumbers);
+        }});
+        if(!infos.isEmpty()){
+           return infos;
+        }
+
         //查询所有学生的用户信息，组装起来备用
         List<BaseStudentUser> studentUsers = this.selectJoinList(BaseStudentUser.class,
                 new MPJLambdaWrapper<BaseStudentUser>()
@@ -998,7 +1016,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
         if (!insertContactList.isEmpty()) {
             studentContactService.saveBatch(insertContactList);
         }
-        return true;
+        return new ArrayList<>();
     }
 
     @Override
@@ -1008,7 +1026,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
 
     @Override
     public Boolean uploadImage(Long userId, MultipartFile file) throws IOException {
-        BaseStudentUser studentUser = studentbaseManagerBaseStudentUserMapper.selectById(userId);
+        BaseStudentUser studentUser = baseStudentUserMapper.selectById(userId);
         String[] imgSuffix = new String[]{"png", "jpg", "jpeg"};
         String suffix = StringUtils.substringAfterLast(file.getOriginalFilename(), StringPool.DOT);
         if (!Arrays.asList(imgSuffix).contains(suffix)) {
@@ -1024,7 +1042,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
             }
         };
         studentUser.setAvatar(map.get(suffix) + base64String);
-        studentbaseManagerBaseStudentUserMapper.updateById(studentUser);
+        baseStudentUserMapper.updateById(studentUser);
         return true;
     }
 
@@ -1037,8 +1055,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 .selectAs(BaseMajorSet::getMajorId, BaseClassMajorSetVo::getMajorId)
                 .selectAs(BaseClass::getName, BaseClassMajorSetVo::getClassName)
                 .selectAs(BaseClass::getGradeId, BaseClassMajorSetVo::getGradeId)
-                .leftJoin(BaseClassMajorSet.class, BaseClassMajorSet::getClassId, BaseClass::getId)
-                .leftJoin(BaseMajorSet.class, BaseMajorSet::getId, BaseClassMajorSet::getMajorSetId)
+                .leftJoin(BaseMajorSet.class, BaseMajorSet::getId, BaseClass::getMajorSetId)
                 .eq(dto.getIsGraduate() != null, BaseClass::getIsGraduate, dto.getIsGraduate())
                 .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(BaseClass::getEnabledMark, EnabledMark.ENABLED.getCode())

src/main/java/com/xjrsoft/module/student/service/impl/StudentReportRecordServiceImpl.java

@@ -389,8 +389,11 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
             }
             //根据身份证号查询这个学生是否存在
             User user = userService.getOne(
-                    new QueryWrapper<User>().lambda()
-                            .eq(User::getCredentialNumber, student.getCredentialNumber())
+                new MPJLambdaWrapper<User>()
+                    .disableLogicDel()
+                    .select(User::getId)
+                    .select(User.class, x -> VoToColumnUtil.fieldsToColumns(User.class).contains(x.getProperty()))
+                    .eq(User::getCredentialNumber, student.getCredentialNumber())
             );
             if(user != null){
                 //学生已存在，则修改班级信息
@@ -443,7 +446,7 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
                 schoolRoll.setMajorSetId(baseClass.getMajorSetId());
                 schoolRoll.setStduyStatus(student.getStduyStatus());
                 schoolRoll.setEnrollType(baseClass.getEnrollType());
-                schoolRoll.setStudentSource(student.getSource());
+                schoolRoll.setStudentType(student.getSource());
                 schoolRoll.setGradeId(baseClass.getGradeId());
                 schoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
                 schoolRoll.setCreateDate(now);
@@ -476,7 +479,9 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
                     new QueryWrapper<User>().lambda()
                             .eq(User::getCredentialNumber, student.getCredentialNumber())
             );
-            rollService.disableStudent(user.getId());
+            if(user != null){
+                rollService.disableStudent(user.getId());
+            }
         }
 
         return true;

src/main/java/com/xjrsoft/module/student/vo/BaseStudentSompleInfoVo.java

@@ -72,6 +72,9 @@ public class BaseStudentSompleInfoVo {
     @ApiModelProperty("学籍状态")
     private String archivesStatus;
 
+    @ApiModelProperty("学籍状态-中文")
+    private String archivesStatusCn;
+
     @ApiModelProperty("年级id")
     private Long gradeId;
 

src/main/resources/mapper/banding/BandingTaskClassMapper.xml

@@ -54,20 +54,32 @@
         SELECT t1.id, t1.major_set_id,t2.name AS major_set_name, t1.name,t1.sort_code,
         (SELECT COUNT(*) FROM base_new_student a1
         INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
-        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id and a1.is_can_banding = 1) AS number,
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1) AS NUMBER,
         (SELECT COUNT(*) FROM base_new_student a1
         INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
-        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id and a1.is_can_banding = 1 AND a1.gender = 'SB10001') AS male_count,
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1 AND a1.gender = 'SB10001') AS male_count,
         (SELECT COUNT(*) FROM base_new_student a1
         INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
-        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id and a1.is_can_banding = 1 AND a1.gender = 'SB10002') AS female_count,
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1 AND a1.gender = 'SB10002') AS female_count,
         (SELECT COUNT(*) FROM base_new_student a1
         INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
-        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id and a1.is_can_banding = 1 AND a1.stduy_status = 'FB3001') AS not_stay_count,
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1 AND a1.stduy_status = 'FB3001') AS not_stay_count,
         (SELECT COUNT(*) FROM base_new_student a1
         INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
-        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id and a1.is_can_banding = 1 AND a1.stduy_status = 'FB3002') AS stay_count,
-        t3.name AS teacher_name,t4.name as classroom_name, t1.is_order_class FROM banding_task_class t1
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1 AND a1.stduy_status = 'FB3002') AS stay_count,
+        (SELECT COUNT(*) FROM base_new_student a1
+        INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1 AND a1.stduy_status = 'FB3001' AND a1.gender = 'SB10001') AS male_not_stay_count,
+        (SELECT COUNT(*) FROM base_new_student a1
+        INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1 AND a1.stduy_status = 'FB3002' AND a1.gender = 'SB10001') AS male_stay_count,
+        (SELECT COUNT(*) FROM base_new_student a1
+        INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1 AND a1.stduy_status = 'FB3001' AND a1.gender = 'SB10002') AS female_not_stay_count,
+        (SELECT COUNT(*) FROM base_new_student a1
+        INNER JOIN banding_task_class_student a2 ON a1.id = a2.new_student_id
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_class_id = t1.id AND a1.is_can_banding = 1 AND a1.stduy_status = 'FB3002' AND a1.gender = 'SB10002') AS female_stay_count,
+        t3.name AS teacher_name,t4.name AS classroom_name, t1.is_order_class FROM banding_task_class t1
         LEFT JOIN base_major_set t2 ON t1.major_set_id = t2.id
         LEFT JOIN xjr_user t3 ON t1.teacher_id = t3.id
         LEFT JOIN base_classroom t4 ON t1.classroom_id = t4.id

src/main/resources/mapper/organization/UserMapper.xml

@@ -29,7 +29,7 @@
         (SELECT name FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t1.id ORDER BY create_date ASC LIMIT 0,1) as parent_name,
         (SELECT mobile FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t1.id ORDER BY create_date ASC LIMIT 0,1) as parent_mobile,
         t1.gender,t4.id as class_id, t4.teacher_id,t6.name as teacher_name,t6.user_name as teacher_user_name,t6.mobile as teacher_mobile,t5.name as classroom_name,
-        t3.archives_status,t7.id as grade_id,t7.name as grade_name
+        t3.archives_status,t7.id as grade_id,t7.name as grade_name,t8.name as archives_status_cn
         FROM xjr_user t1
         INNER JOIN base_student t2 ON t1.id = t2.user_id
         INNER JOIN base_student_school_roll t3 ON t1.id = t3.user_id
@@ -37,6 +37,7 @@
         left join base_classroom t5 on t4.classroom_id = t5.id
         left join xjr_user t6 on t4.teacher_id = t6.id
         left join base_grade t7 on t4.grade_id = t7.id
+        left join xjr_dictionary_detail t8 on t3.archives_status = t8.code
         WHERE t1.delete_mark = 0
         <if test="dto.keyword != null and dto.keyword != ''">
             AND (t1.name like concat('%', #{dto.keyword}, '%') OR t1.credential_number like concat('%', #{dto.keyword}, '%'))
@@ -44,11 +45,21 @@
         <if test="dto.name != null and dto.name != '' and dto.idNumber != null and dto.idNumber != ''">
             AND t1.name = #{dto.name} and t1.credential_number = #{dto.idNumber}
         </if>
+        <if test="dto.idNumber != null and dto.idNumber != ''">
+            and t1.credential_number = #{dto.idNumber}
+        </if>
         <if test="dto.userId != null">
             AND t1.id = #{dto.userId}
         </if>
         <if test="dto.archivesStatus != null and dto.archivesStatus != ''">
-            AND t3.archives_status = ${dto.archivesStatus}
+            AND t3.archives_status = #{dto.archivesStatus}
+        </if>
+        <if test="dto.idNumberList != null">
+            and t1.credential_number in
+            <foreach item="idNumber" index="index" collection="dto.idNumberList" open="(" close=")"
+                     separator=",">
+                #{idNumber}
+            </foreach>
         </if>
     </select>
     <select id="personPage" parameterType="com.xjrsoft.module.organization.dto.PersonPageDto" resultType="com.xjrsoft.module.organization.vo.PersonPageVo">

src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -19,7 +19,7 @@
         LEFT JOIN base_student_school_roll t10 ON t9.id = t10.user_id AND t10.delete_mark = 0
         LEFT JOIN base_class t11 ON t10.class_id = t11.id
         LEFT JOIN xjr_user t12 ON t11.teacher_id = t12.id
-        LEFT JOIN banding_task_class_student t13 ON t1.id = t13.new_student_id AND t13.delete_mark = 0 AND t13.status = 1
+        LEFT JOIN banding_task_class_student t13 ON t1.id = t13.new_student_id AND t13.delete_mark = 0 -- AND t13.status = 1
         LEFT JOIN banding_task_class t14 ON t13.banding_task_class_id = t14.id AND t14.delete_mark = 0
         LEFT JOIN xjr_user t15 ON t14.teacher_id = t15.id
         WHERE t1.delete_mark = 0

src/main/resources/mapper/student/WfCadreCandidateMapper.xml

@@ -14,7 +14,8 @@
                  LEFT JOIN xjr_user t1 ON (t1.id = t.applicant_user_id)
                  LEFT JOIN cadre_dept t2 ON (t2.id = t.cadre_dept_id)
                  LEFT JOIN xjr_user t3 ON (t3.id = t.instructor_user_id)
-        WHERE t.delete_mark = 0
+                left join xjr_workflow_form_relation t4 on t.id = CAST(t4.form_key_value AS SIGNED)
+        WHERE t.delete_mark = 0 and t4.current_state = 'COMPLETED'
         <if test="dto.cadreDeptId != null and dto.cadreDeptId > 0">
             and t.cadre_dept_id = #{dto.cadreDeptId}
         </if>

src/test/java/com/xjrsoft/module/job/HikvisionBaseDataTaskTest.java

@@ -615,4 +615,53 @@ class HikvisionBaseDataTaskTest {
         System.out.println(result);
     }
 
+    /**
+     * 同步海康学生信息到hikvision_data表中
+     */
+    @Test
+    void syncStudentId(){
+        String sql = "SELECT t1.* FROM hikvision_data t1" +
+                " INNER JOIN base_class t2 ON t1.source_id LIKE CONCAT(t2.id, '%')" +
+                " WHERE t1.table_name = 'base_class'" +
+                " AND t2.grade_id = 1868532405673439232";
+        List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
+        List<String> orgIndexCodes = new ArrayList<>();
+        for (int i = 0; i < list.size(); i ++){
+            Map<String, Object> dataMap = list.get(i);
+            orgIndexCodes.add(dataMap.get("hikvision_id").toString());
+        }
+
+        JsonParser jsonParser = new JsonParser();
+        ApiUtil apiUtil = new ApiUtil();
+        String apiPath = "/api/resource/v2/person/advance/personList";
+
+        Set<String> personIds = new HashSet<>();
+        for (String orgIndexCode : orgIndexCodes) {
+            JsonObject jsonObject = new JsonObject();
+            jsonObject.addProperty("pageNo", 1);
+            jsonObject.addProperty("pageSize", 500);
+            jsonObject.addProperty("orgIndexCodes", orgIndexCode);
+
+            String result = apiUtil.doPost(apiPath, jsonObject.toString(), null, null);
+
+            JsonObject resultJson = jsonParser.parse(result).getAsJsonObject();
+            JsonArray array = resultJson.get("data").getAsJsonObject().get("list").getAsJsonArray();
+            for (JsonElement jsonElement : array) {
+                JsonObject element = jsonElement.getAsJsonObject();
+                String personId = element.get("personId").getAsString();
+                personIds.add(personId);
+            }
+        }
+
+        for (String personId : personIds) {
+            String insertsql = "INSERT INTO hikvision_data(create_date,TABLE_NAME,source_id,hikvision_id) " +
+                    " SELECT NOW(),'base_student','" + personId + "','" + personId + "'" +
+                    " where not EXISTS (" +
+                    " SELECT 1 FROM hikvision_data " +
+                    " WHERE source_id = '" + personId + "'" +
+                    " );";
+            SqlRunnerAdapter.db().insert(insertsql);
+        }
+    }
+
 }

src/test/java/com/xjrsoft/module/job/HikvisionBaseDataTaskTest2.java

@@ -0,0 +1,123 @@
+package com.xjrsoft.module.job;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xjrsoft.XjrSoftApplication;
+import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
+import com.xjrsoft.common.utils.SqlRunnerAdapterUtil;
+import com.xjrsoft.module.hikvision.entity.HikvisionData;
+import com.xjrsoft.module.hikvision.mapper.HikvisionDataMapper;
+import com.xjrsoft.module.hikvision.util.DataUtil;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author dzx
+ * @date 2025/5/7
+ */
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = XjrSoftApplication.class)
+class HikvisionBaseDataTaskTest2 {
+
+    @Autowired
+    private HikvisionDataMapper hikvisionDataMapper;
+
+    @Test
+    void execute() {
+        RefreshConnectionPool();
+    }
+
+    public void RefreshConnectionPool() {
+        String active = SpringUtil.getActiveProfile();
+        if (!"prod".equals(active)) {
+            return;
+        }
+        try {
+            String sql = "SELECT distinct table_name FROM hikvision_data WHERE 1 = 1";
+            List<Map<String, Object>> maps = SqlRunnerAdapter.db().selectList(sql);
+            Set<String> tables = new HashSet<>();
+            for (Map<String, Object> map : maps) {
+                String[] strings = SqlRunnerAdapterUtil.convertMapToStringArray(map);
+                tables.add(strings[0]);
+            }
+            sql = "SELECT * FROM hikvision_data WHERE 0 = 0";
+            List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
+            Map<String, Map<String, String>> dataMap = new HashMap<>();
+            for (String table : tables) {
+                Map<String, String> tableData = new HashMap<>();
+                for (Map<String, Object> hikvision : list) {
+
+                    if (!table.equals(hikvision.get("table_name").toString())) {
+                        continue;
+                    }
+                    tableData.put(hikvision.get("source_id").toString(), hikvision.get("hikvision_id").toString());
+                }
+                dataMap.put(table, tableData);
+            }
+            DataUtil dataUtil = new DataUtil();
+            //查询根机构
+            //JsonArray schoolDistrictData = dataUtil.getSchoolDistrictData();
+            //推送组织机构
+            String tableName = "xjr_department";
+//            Map<String, String> department = new HashMap<>();
+//            try {
+//                department = dataUtil.insertDepartment(tableName, dataMap.get(tableName));
+//            } catch (Exception e) {
+//                System.out.println(e);
+//            }
+//            if (department.isEmpty() && dataMap.get(tableName) != null) {
+//                department = dataMap.get(tableName);
+//            }
+//
+//
+//            //推送教职工
+//            tableName = "base_teacher";
+//            try {
+//                dataUtil.insertTeacher(tableName, dataMap.get(tableName), department);
+//            } catch (Exception e) {
+//                System.out.println(e);
+//            }
+//
+//            //推送车辆
+//            String carTableName = "car_message_apply";
+//            Map<String, String> baseCar = dataMap.get(carTableName);
+//            try {
+//                dataUtil.insertCar(carTableName, baseCar, hikvisionDataMapper);
+//            } catch (Exception e) {
+//                System.out.println(e);
+//            }
+
+
+            tableName = "base_class";
+            Map<String, String> baseClass = dataMap.get(tableName);
+            try {
+                dataUtil.insertClass(tableName, baseClass);
+            } catch (Exception e) {
+                System.out.println(e);
+            }
+
+
+            tableName = "base_student";
+            List<HikvisionData> studentList = hikvisionDataMapper.selectList(
+                    new QueryWrapper<HikvisionData>().lambda().eq(HikvisionData::getTableName, tableName)
+            );
+            Map<String, String> baseStudent = dataMap.get(tableName);
+            dataUtil.insertStudentOne(tableName, baseStudent, studentList);
+
+        } catch (Exception e) {
+        }
+    }
+
+}

src/test/java/com/xjrsoft/module/liteflow/node/ImportStudentFaceNodeTest.java

@@ -40,9 +40,10 @@ class ImportStudentFaceNodeTest {
     private FaceImportMapper faceImportMapper;
     @Test
     void test(){
-        String sql = "SELECT t1.* FROM xjr_user t1" +
-                " INNER JOIN base_student_school_roll t2 ON t1.id = t2.user_id" +
-                " WHERE t2.archives_status = 'FB2901' and t1.id = 654321987655958";
+        String sql = "SELECT t3.* FROM base_new_student t1" +
+                " INNER JOIN student_report_record t2 ON t1.id = t2.user_id" +
+                " INNER JOIN xjr_user t3 ON t1.credential_number = t3.credential_number" +
+                " WHERE t2.report_time IS NOT NULL;";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
 
         ApiUtil apiUtil = new ApiUtil();