1

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrientationInfoBo.java

@@ -37,31 +37,31 @@ public class OrientationInfoBo extends BaseEntity {
     /**
      * 用户名
      */
-    @NotBlank(message = "用户名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "用户名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String userName;
 
     /**
      * 地址
      */
-    @NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String address;
 
     /**
      * 经度
      */
-    @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String longitude;
 
     /**
      * 纬度
      */
-    @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String latitude;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/bo/ScoreDataBo.java

@@ -41,8 +41,8 @@ public class ScoreDataBo extends BaseEntity {
      * 考试时间
      */
     //@NotNull(message = "考试时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date scoreTime;
+    //@JsonFormat(pattern = "yyyy-MM-dd")
+    private String scoreTime;
 
     /**
      * 接收班级id

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java

@@ -124,7 +124,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     public SysOssVo upload(MultipartFile file) {
         String originalfileName = file.getOriginalFilename();
         String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
-        OssClient storage = OssFactory.instance();
+        OssClient storage = OssFactory.instance("image");
         UploadResult uploadResult;
         try {
             uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataServiceImpl.java

@@ -177,7 +177,7 @@ public class ScoreDataServiceImpl implements IScoreDataService {
             lqw.eq(ScoreData::getScoreTitle,scoreType);
         }
         lqw.eq(StringUtils.isNotBlank(bo.getScoreTitle()), ScoreData::getScoreTitle, bo.getScoreTitle());
-        lqw.eq(bo.getScoreTime() != null, ScoreData::getScoreTime, bo.getScoreTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getScoreTime()), ScoreData::getScoreTime, bo.getScoreTime());
         lqw.like(StringUtils.isNotBlank(bo.getScoreClassName()), ScoreData::getScoreClassName, bo.getScoreClassName());
         lqw.eq(StringUtils.isNotBlank(bo.getPrivacyType()), ScoreData::getPrivacyType, bo.getPrivacyType());
         lqw.eq(StringUtils.isNotBlank(bo.getAvg()), ScoreData::getAvg, bo.getAvg());