登录和报告

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -30,8 +30,8 @@ public class ReportController {
      * pageSize 分页的大小
      * userId 筛选的用户id 可传
      * projectId 筛选的项目id 可传
-     * startDate 筛选时间段的开始时间 可传
-     * endDate 筛选时间段的结束时间 可传
+     * startDate 筛选时间段的开始时间 可传 yyyy-MM-dd
+     * endDate 筛选时间段的结束时间 可传 yyyy-MM-dd
      */
     @RequestMapping("/getReportList")
     public HttpRespMsg getReportList(@RequestParam Integer pageIndex, @RequestParam Integer pageSize,
@@ -44,7 +44,7 @@ public class ReportController {
      * id 报告id 编辑时传
      * creatorId 报告上传者id 新增时不可为空
      * projectId 报告相关项目id 新增时不可为空
-     * createDate 报告创建时间 新增时不可为空
+     * createDate 报告创建时间 新增时不可为空 yyyy-MM-dd
      * workingTime 工作时间
      * content 工作内容
      */

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Report.java

@@ -11,6 +11,7 @@ import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -48,6 +49,7 @@ public class Report extends Model<Report> {
     /**
      * 日期
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField("create_date")
     private LocalDate createDate;
 
@@ -60,7 +62,7 @@ public class Report extends Model<Report> {
     /**
      * 报告内容
      */
-    @TableField("content", insertStrategy = FieldStrategy.IGNORED)
+    @TableField(value = "content", insertStrategy = FieldStrategy.IGNORED)
     private String content;
 
     /**

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -9,6 +9,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
 import javax.annotation.Resource;
 
 /**
@@ -38,7 +41,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             queryWrapper.eq("project_id", projectId);
         }
         if (startDate != null && endDate != null) {
-            queryWrapper.between("create_date", startDate, endDate);
+            queryWrapper.between("create_date",
+                    LocalDate.parse(startDate, DateTimeFormatter.ofPattern("yyyy-MM-dd")),
+                    LocalDate.parse(endDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+            );
         }
         httpRespMsg.data = reportMapper.selectPage(new Page<>(pageIndex, pageSize), new QueryWrapper<>());
         return httpRespMsg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -41,16 +41,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         } else if (userList.size() > 1) {
             //检索到两个及以上账号时
             httpRespMsg.setError("账号重名");
-        } else if (!userList.get(0).getRole().equals(1)) {
+        } else if (userList.get(0).getRole() != 1) {
             //检索的账号role不是1 即不是管理员时
             httpRespMsg.setError("非管理员不能登陆系统");
         } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
             //检测密码正确时
-            Map<String, Object> resultMap = new HashMap<>();
-            resultMap.put("name", userList.get(0).getName());
-            resultMap.put("portraitUrl", userList.get(0).getPortraitUrl());
-            //将名字和头像的url返回回去
-            httpRespMsg.data = resultMap;
+            httpRespMsg.data = userList.get(0);
         } else {
             httpRespMsg.setError("密码错误");
         }
@@ -71,16 +67,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         } else if (userList.size() > 1) {
             //检索到两个及以上账号时
             httpRespMsg.setError("账号重名");
-        } else if (!userList.get(0).getRole().equals(0)) {
-            //检索的账号role不是1 即不是管理员时
+        } else if (userList.get(0).getRole() != 0) {
+            //检索的账号role不是0 即不是普通用户时
             httpRespMsg.setError("管理员无法登陆本端");
         } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
             //检测密码正确时
-            Map<String, Object> resultMap = new HashMap<>();
-            resultMap.put("name", userList.get(0).getName());
-            resultMap.put("portraitUrl", userList.get(0).getPortraitUrl());
-            //将名字和头像的url返回回去
-            httpRespMsg.data = resultMap;
+            httpRespMsg.data = userList.get(0);
         } else {
             httpRespMsg.setError("密码错误");
         }