Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperScanTask.java

@@ -1,5 +1,6 @@
 package com.qmth.paper.library.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -56,13 +57,13 @@ public class PaperScanTask extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "扫描员id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("scan_user_id")
+    @TableField(value = "scan_user_id", updateStrategy = FieldStrategy.IGNORED)
     private Long scanUserId;
 
     /**
      * 扫描量
      */
-    @TableField("student_count")
+    @TableField(value = "student_count", updateStrategy = FieldStrategy.IGNORED)
     private Integer studentCount;
 
     /**

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperScanTaskServiceImpl.java

@@ -218,6 +218,11 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
 
             // 删除该任务扫描的的数据
             paperLibraryService.removeByIds(willDeletePaperLibraryList.stream().map(PaperLibrary::getId).collect(Collectors.toList()));
+
+            // 清除扫描量
+            paperScanTask.setScanCount(null);
+            paperScanTask.updateInfo(requestUser.getId());
+            this.updateById(paperScanTask);
         }
     }
 
@@ -229,7 +234,6 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
             throw ExceptionResultEnum.ERROR.exception("扫描任务不存在");
         }
         paperScanTask.setScanUserId(null);
-        paperScanTask.setScanCount(null);
         paperScanTask.updateInfo(requestUser.getId());
         this.updateById(paperScanTask);
     }

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/params/ApproveUserResult.java

@@ -49,7 +49,6 @@ public class ApproveUserResult extends SysUser implements Serializable {
         setLoginName(loginName);
         setRealName(realName);
         setSchoolId(schoolId);
-        setCode(code);
         setMobileNumber(mobileNumber);
         setCreateTime(createTime);
         this.paperUrls = paperUrls;

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/result/BasicSemesterResult.java

@@ -20,18 +20,9 @@ public class BasicSemesterResult {
     @ApiModelProperty(value = "学期编号")
     private String semesterCode;
 
-    @ApiModelProperty(value = "学期开始时间")
-    private Long startTime;
-
-    @ApiModelProperty(value = "学期结束时间")
-    private Long endTime;
-
     @ApiModelProperty(value = "是否启用")
     private Boolean enable;
 
-    @ApiModelProperty(value = "是否当前使用")
-    private Boolean inUsed;
-
     public Long getId() {
         return id;
     }
@@ -56,22 +47,6 @@ public class BasicSemesterResult {
         this.semesterCode = semesterCode;
     }
 
-    public Long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Long startTime) {
-        this.startTime = startTime;
-    }
-
-    public Long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Long endTime) {
-        this.endTime = endTime;
-    }
-
     public Boolean getEnable() {
         return enable;
     }
@@ -80,11 +55,4 @@ public class BasicSemesterResult {
         this.enable = enable;
     }
 
-    public Boolean getInUsed() {
-        return inUsed;
-    }
-
-    public void setInUsed(Boolean inUsed) {
-        this.inUsed = inUsed;
-    }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/entity/SysRole.java

@@ -66,6 +66,9 @@ public class SysRole extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "角色说明")
     private String interpret;
 
+    @TableField(exist = false)
+    private Integer userCount;
+
     public RoleSourceEnum getSource() {
         return source;
     }
@@ -141,4 +144,12 @@ public class SysRole extends BaseEntity implements Serializable {
     public void setInterpret(String interpret) {
         this.interpret = interpret;
     }
+
+    public Integer getUserCount() {
+        return userCount;
+    }
+
+    public void setUserCount(Integer userCount) {
+        this.userCount = userCount;
+    }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/entity/SysUser.java

@@ -50,13 +50,6 @@ public class SysUser extends BaseEntity implements Serializable {
     @Length(message = "姓名不能超过{max}个字符", max = 32)
     private String realName;
 
-    /**
-     * 姓名
-     */
-    @TableField("code")
-    @NotBlank(message = "请输入工号")
-    @Length(message = "工号不能超过{max}个字符", max = 50)
-    private String code;
     /**
      * 密码
      */
@@ -251,14 +244,6 @@ public class SysUser extends BaseEntity implements Serializable {
         this.oldPassword = oldPassword;
     }
 
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getVerifyCode() {
         return verifyCode;
     }

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/BasicSemesterServiceImpl.java

@@ -106,7 +106,7 @@ public class BasicSemesterServiceImpl extends ServiceImpl<BasicSemesterMapper, B
     public boolean deleteBasicSemesterById(Long id) {
         if (SystemConstant.longNotNull(id)) {
             if (this.baseMapper.countBasicExamBySemesterId(id) > 0) {
-                throw ExceptionResultEnum.ERROR.exception("所选学期中包含考试 不能被删除");
+                throw ExceptionResultEnum.ERROR.exception("学期中包含档案信息，不能删除");
             }
             return this.removeById(id);
         } else {

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysRoleServiceImpl.java

@@ -62,7 +62,14 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     public IPage<SysRole> list(String name, Boolean enable, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, SystemConstant.translateSpecificSign(name), enable);
+        IPage<SysRole> sysRoleIPage = this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, SystemConstant.translateSpecificSign(name), enable);
+        for (SysRole record : sysRoleIPage.getRecords()) {
+            QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(SysUserRole::getRoleId, record.getId());
+            int count = sysUserRoleService.count(queryWrapper);
+            record.setUserCount(count);
+        }
+        return sysRoleIPage;
     }
 
     /**

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysUserServiceImpl.java

@@ -358,15 +358,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 requestUserId = requestUser.getId();
             }
 
-            String code = userSaveParams.getCode();
             String mobileNumber = userSaveParams.getMobileNumber();
-            // 工号检验
-            SysUser checkCode = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getEnable, true).eq(SysUser::getCode, code));
-            if (Objects.nonNull(checkCode)) {
-                if (!checkCode.getId().equals(userSaveParams.getId())) {
-                    throw ExceptionResultEnum.ERROR.exception("用户工号【" + code + "】重复");
-                }
-            }
             // 手机号检验
             if (SystemConstant.strNotNull(mobileNumber)) {
                 SysUser checkMobileNumber = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getEnable, true).eq(SysUser::getMobileNumber, mobileNumber));
@@ -399,7 +391,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                         .set(SysUser::getSchoolId, userSaveParams.getSchoolId())
                         .set(SysUser::getLoginName, sysUser.getLoginName())
                         .set(SysUser::getRealName, sysUser.getRealName())
-                        .set(SysUser::getCode, sysUser.getCode())
                         .set(SysUser::getMobileNumber, sysUser.getMobileNumber())
                         .set(SysUser::getOrgId, sysUser.getOrgId())
                         .set(SysUser::getEnable, dbUser.getEnable())
@@ -712,15 +703,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         // 用户基础信息更新 - 对用户权限缓存的更新
         Set<Long> willUpdateUserPri = new HashSet<>();
         for (UserSaveParams userSaveParams : userSaveParamsList) {
-            String code = userSaveParams.getCode();
             String mobileNumber = userSaveParams.getMobileNumber();
-            // 工号检验
-            SysUser checkCode = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getEnable, true).eq(SysUser::getCode, code));
-            if (Objects.nonNull(checkCode)) {
-                if (!checkCode.getId().equals(userSaveParams.getId())) {
-                    throw ExceptionResultEnum.ERROR.exception("用户工号【" + code + "】重复");
-                }
-            }
             // 手机号检验
             if (SystemConstant.strNotNull(mobileNumber)) {
                 SysUser checkMobileNumber = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getEnable, true).eq(SysUser::getMobileNumber, mobileNumber));
@@ -736,7 +719,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUser userCell = gson.fromJson(gson.toJson(userSaveParams), SysUser.class);
             if (Objects.isNull(userCell.getId())) {//新增用户
                 userCell.insertInfo(master.getId());
-                userCell.setLoginName(userCell.getCode());
                 userList.add(userCell);
                 List<SysUserRole> sysUserRoleCell = commonService.disposeUserPrivilege(userCell, userSaveParams.getRoleIds());
                 sysUserRoleList.addAll(sysUserRoleCell);

paper-library-common/src/main/resources/mapper/BasicSemesterMapper.xml

@@ -7,10 +7,7 @@
             id,
             name AS semesterName,
             code AS semesterCode,
-            start_time AS startTime,
-            end_time AS endTime,
-            enable,
-            in_used inUsed
+            enable
         FROM
             basic_semester bs
         <where>
@@ -31,7 +28,7 @@
         SELECT
             COUNT(*)
         FROM
-            basic_exam
+            paper_archives
         <where>
             <if test="semesterId != null and semesterId != ''">
                 AND semester_id = #{semesterId}

paper-library/src/main/java/com/qmth/paper/library/api/SysController.java

@@ -127,7 +127,7 @@ public class SysController {
             if (StringUtils.isBlank(password)) {
                 throw ExceptionResultEnum.ERROR.exception("密码不能为空");
             }
-            wrapper.lambda().and(w -> w.eq(SysUser::getLoginName, loginName).or().eq(SysUser::getCode, loginName));
+            wrapper.lambda().eq(SysUser::getLoginName, loginName);
             userList = sysUserService.list(wrapper);
 
             //用户不存在
@@ -304,7 +304,7 @@ public class SysController {
         }
         QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
         sysUserQueryWrapper.lambda().eq(SysUser::getSchoolId, basicSchool.getId())
-                .and(w -> w.eq(SysUser::getLoginName, loginName).or().eq(SysUser::getCode, loginName))
+                .eq(SysUser::getLoginName, loginName)
                 .eq(SysUser::getPassword, password);
         SysUser sysUser = sysUserService.getOne(sysUserQueryWrapper);
         if (sysUser == null) {