1、增加签名上传和获取接口

2、登录时将签名url存入
3、课表数据推送，解决性别问题导致的报错

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

@@ -59,7 +59,6 @@ import com.xjrsoft.module.organization.service.IUserRoleRelationService;
 import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.organization.service.IUserStudentService;
 import com.xjrsoft.module.organization.utils.OrganizationUtil;
-import com.xjrsoft.module.organization.vo.DepartmentTreeVo;
 import com.xjrsoft.module.organization.vo.PendingCountDto;
 import com.xjrsoft.module.organization.vo.ResetUserPageVo;
 import com.xjrsoft.module.organization.vo.ResetUserRoleVo;
@@ -73,7 +72,8 @@ import com.xjrsoft.module.organization.vo.UserStudentVo;
 import com.xjrsoft.module.organization.vo.UserVo;
 import com.xjrsoft.module.oss.factory.OssFactory;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
-import com.xjrsoft.module.student.vo.BaseStudentTreeVo;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -127,6 +127,8 @@ public class UserController {
 
     private final RedisUtil redisUtil;
 
+    private final IFileService fileService;
+
     private final SmsCtcc smsCtcc;
     private final IBaseGradeService baseGradeService;
     private final IUserStudentService userStudentService;
@@ -633,4 +635,28 @@ public class UserController {
     public R unBindStudent(@Valid @RequestParam Long id) {
         return R.ok(baseClassService.getStudents(id));
     }
+
+    @GetMapping("/upload-sign")
+    @ApiOperation(value = "上传签名")
+    public RT<Boolean> uploadSign(@Valid @RequestParam Long folderId) {
+        long loginIdAsLong = StpUtil.getLoginIdAsLong();
+        User user = userService.getById(loginIdAsLong);
+        user.setSignFolderId(folderId);
+        return RT.ok(userService.updateById(user));
+    }
+
+    @GetMapping("/getSign")
+    @ApiOperation(value = "获取登录者的签名url")
+    public RT<String> getSign() {
+        long loginIdAsLong = StpUtil.getLoginIdAsLong();
+        User user = userService.getById(loginIdAsLong);
+        if(user.getSignFolderId() == null){
+            return RT.error("未上传签名");
+        }
+        List<File> list = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, user.getSignFolderId()));
+        if(list.isEmpty()){
+            return RT.error("签名文件丢失");
+        }
+        return RT.ok(list.get(0).getFileUrl());
+    }
 }

src/main/java/com/xjrsoft/module/organization/entity/User.java

@@ -102,4 +102,7 @@ public class User extends AuditEntity implements Serializable {
     private Integer isChangePassword;
 
     private LocalDateTime birthDate;
+
+    @ApiModelProperty("签名文件")
+    private Long signFolderId;
 }

src/main/java/com/xjrsoft/module/schedule/vo/StudentJianyuekbVo.java

@@ -38,7 +38,7 @@ public class StudentJianyuekbVo {
     * 是否允许德育检查(1:是 0:否)
     */
     @ApiModelProperty("性别：1男，2女")
-    private Integer gender;
+    private String gender;
     /**
     * 职责描述
     */

src/main/java/com/xjrsoft/module/student/entity/BaseStudentUser.java

@@ -196,4 +196,6 @@ public class BaseStudentUser implements Serializable {
     @EntityMapping(thisField = "id", joinField = "userId")
     private List<BaseStudentSubsidize> baseStudentSubsidizeList;
 
+    @ApiModelProperty("签名文件")
+    private Long signFolderId;
 }

src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -16,6 +16,7 @@ import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.RoleEnum;
 import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.FixedArithmeticCaptcha;
 import com.xjrsoft.common.utils.RSAUtil;
 import com.xjrsoft.common.utils.RedisUtil;
@@ -38,6 +39,8 @@ import com.xjrsoft.module.system.dto.LoginByCodeDto;
 import com.xjrsoft.module.system.dto.LoginCaptchaDto;
 import com.xjrsoft.module.system.dto.LoginDto;
 import com.xjrsoft.module.system.dto.LoginQRCodeDto;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.system.service.ILoginService;
 import com.xjrsoft.module.system.vo.CreateTokenVo;
 import com.xjrsoft.module.system.vo.ImgCaptchaVo;
@@ -77,6 +80,8 @@ public class LoginServiceImpl implements ILoginService {
 
     private final UserRoleRelationMapper userRoleRelationMapper;
 
+    private final IFileService fileService;
+
     @Override
     public LoginVo login(LoginDto dto) throws Exception {
         if (licenseConfig.getEnabled()) {
@@ -112,6 +117,7 @@ public class LoginServiceImpl implements ILoginService {
             throw new MyException("账号或密码不正确");
         }
 
+
         return getLoginInfo(loginUser, "PC");
     }
 
@@ -297,6 +303,11 @@ public class LoginServiceImpl implements ILoginService {
             result.setRedirectUri(redisUtil.get(oauth2Info));
         }
 
+        List<File> list = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, loginUser.getSignFolderId()));
+        if(!list.isEmpty()){
+            result.setSignUrl(list.get(0).getFileUrl());
+        }
+
         return result;
     }
 

src/main/java/com/xjrsoft/module/system/vo/LoginVo.java

@@ -27,4 +27,7 @@ public class LoginVo {
      * 跳转地址
      */
     private String redirectUri;
+
+    @ApiModelProperty("签名地址")
+    private String signUrl;
 }

src/main/java/com/xjrsoft/module/teacher/entity/XjrUser.java

@@ -208,4 +208,6 @@ public class XjrUser implements Serializable {
     @ApiModelProperty("微信unionId")
     private String unionId;
 
+    @ApiModelProperty("签名文件")
+    private Long signFolderId;
 }