登录和报告

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2020-01-03
+ */
+@RestController
+@RequestMapping("/project")
+public class ProjectController {
+
+}
+

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

@@ -1,6 +1,7 @@
 package com.management.platform.controller;
 
 
+import com.management.platform.entity.Report;
 import com.management.platform.service.ReportService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,33 +25,37 @@ public class ReportController {
     private ReportService reportService;
 
     /**
-     * 分页获取报告列表
-     * pageIndex 分页页数
-     * pageSize 分页大小
-     * id 报告人id 可传
-     * type 报告种类 0-日报 1-月报 可传
-     * startDate 可传 检索开始时间（尚未约定格式）
-     * endDate 可传 检索结束时间
+     * 获取报告列表
+     * pageIndex 分页的页数
+     * pageSize 分页的大小
+     * userId 筛选的用户id 可传
+     * projectId 筛选的项目id 可传
+     * startDate 筛选时间段的开始时间 可传
+     * endDate 筛选时间段的结束时间 可传
      */
     @RequestMapping("/getReportList")
     public HttpRespMsg getReportList(@RequestParam Integer pageIndex, @RequestParam Integer pageSize,
-                                     Integer id, Integer type, String startDate, String endDate) {
-        return reportService.getReportList(pageIndex, pageSize, id, type, startDate, endDate);
+                                     Integer userId, Integer projectId, String startDate, String endDate) {
+        return reportService.getReportList(pageIndex, pageSize, userId, projectId, startDate, endDate);
     }
 
     /**
-     * 根据id编辑报告
-     * id 报告id
-     * content 报告内容
+     * 新增或编辑报告
+     * id 报告id 编辑时传
+     * creatorId 报告上传者id 新增时不可为空
+     * projectId 报告相关项目id 新增时不可为空
+     * createDate 报告创建时间 新增时不可为空
+     * workingTime 工作时间
+     * content 工作内容
      */
     @RequestMapping("/editReport")
-    public HttpRespMsg editReport(@RequestParam Integer id, @RequestParam String content) {
-        return reportService.editReport(id, content);
+    public HttpRespMsg editReport(Report report) {
+        return reportService.editReport(report);
     }
 
     /**
-     * 根据id删除报告
-     * id 报告id
+     * 删除报告
+     * id 要删除的报告的id
      */
     @RequestMapping("/deleteReport")
     public HttpRespMsg deleteReport(@RequestParam Integer id) {

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2020-01-03
+ */
+@RestController
+@RequestMapping("/screenshot")
+public class ScreenshotController {
+
+}
+

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

@@ -0,0 +1,45 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2020-01-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Project extends Model<Project> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目名称
+     */
+    @TableField("project_name")
+    private String projectName;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-02
+ * @since 2020-01-03
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -34,16 +34,16 @@ public class Report extends Model<Report> {
     private Integer id;
 
     /**
-     * user表外键
+     * user表外键 报告的作者
      */
     @TableField("creator_id")
     private Integer creatorId;
 
     /**
-     * 报告种类 0-日报 1-月报
+     * project表外键 相关项目
      */
-    @TableField("report_type")
-    private Integer reportType;
+    @TableField("project_id")
+    private Integer projectId;
 
     /**
      * 日期
@@ -51,10 +51,16 @@ public class Report extends Model<Report> {
     @TableField("create_date")
     private LocalDate createDate;
 
+    /**
+     * 工作时间
+     */
+    @TableField("working_time")
+    private Integer workingTime;
+
     /**
      * 报告内容
      */
-    @TableField(value = "content", updateStrategy = FieldStrategy.IGNORED)
+    @TableField("content", insertStrategy = FieldStrategy.IGNORED)
     private String content;
 
     /**

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

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -18,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-02
+ * @since 2020-01-03
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

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

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-02
+ * @since 2020-01-03
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.Project;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2020-01-03
+ */
+public interface ProjectMapper extends BaseMapper<Project> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.Project;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2020-01-03
+ */
+public interface ProjectService extends IService<Project> {
+
+}

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

@@ -13,10 +13,10 @@ import com.management.platform.util.HttpRespMsg;
  * @since 2019-12-31
  */
 public interface ReportService extends IService<Report> {
-    HttpRespMsg getReportList(Integer pageIndex, Integer pageSize, Integer creatorId, Integer reportType,
+    HttpRespMsg getReportList(Integer pageIndex, Integer pageSize, Integer creatorId, Integer projectId,
                               String startDate, String endDate);
 
-    HttpRespMsg editReport(Integer reportId, String content);
+    HttpRespMsg editReport(Report report);
 
     HttpRespMsg deleteReport(Integer reportId);
 }

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.Project;
+import com.management.platform.mapper.ProjectMapper;
+import com.management.platform.service.ProjectService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2020-01-03
+ */
+@Service
+public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
+
+}

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

@@ -25,27 +25,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Resource
     private ReportMapper reportMapper;
 
-
-    /**
-     * 获取报告列表
-     * 可以基于报告者id 报告种类 报告日期来筛选
-     *
-     * @param creatorId
-     * @param reportType
-     * @param startDate
-     * @param endDate
-     * @return
-     */
+    //获取报告列表
     @Override
-    public HttpRespMsg getReportList(Integer pageIndex, Integer pageSize, Integer creatorId, Integer reportType,
+    public HttpRespMsg getReportList(Integer pageIndex, Integer pageSize, Integer creatorId, Integer projectId,
                                      String startDate, String endDate) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         QueryWrapper<Report> queryWrapper = new QueryWrapper<>();
         if (creatorId != null) {
             queryWrapper.eq("creator_id", creatorId);
         }
-        if (reportType != null) {
-            queryWrapper.eq("report_type", reportType);
+        if (projectId != null) {
+            queryWrapper.eq("project_id", projectId);
         }
         if (startDate != null && endDate != null) {
             queryWrapper.between("create_date", startDate, endDate);
@@ -54,35 +44,30 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         return httpRespMsg;
     }
 
-    /**
-     * 基于id修改报告内容
-     *
-     * @param reportId
-     * @param content
-     * @return
-     */
+    //新增或编辑报告
     @Override
-    public HttpRespMsg editReport(Integer reportId, String content) {
+    public HttpRespMsg editReport(Report report) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        Report report = reportMapper.selectById(reportId);
-        if (report != null) {
-            report.setContent(content);
+        if (report.getId() == null) {
+            //新增报告时 需要检查项目和人员id
+            if (report.getCreatorId() == null || report.getProjectId() == null) {
+                httpRespMsg.setError("请填写完整信息");
+            } else {
+                Integer impactedRows = reportMapper.insert(report);
+                if (impactedRows == 0) {
+                    httpRespMsg.setError("操作失败");
+                }
+            }
+        } else {
             Integer impactedRows = reportMapper.updateById(report);
             if (impactedRows == 0) {
                 httpRespMsg.setError("操作失败");
             }
-        } else {
-            httpRespMsg.setError("未找到相应报告");
         }
         return httpRespMsg;
     }
 
-    /**
-     * 基于id删除报告
-     *
-     * @param reportId
-     * @return
-     */
+    //删除报告
     @Override
     public HttpRespMsg deleteReport(Integer reportId) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("report");
+//        strategy.setInclude("report");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.ProjectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.Project">
+        <id column="id" property="id" />
+        <result column="project_name" property="projectName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_name
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -6,15 +6,16 @@
     <resultMap id="BaseResultMap" type="com.management.platform.entity.Report">
         <id column="id" property="id" />
         <result column="creator_id" property="creatorId" />
-        <result column="report_type" property="reportType" />
+        <result column="project_id" property="projectId" />
         <result column="create_date" property="createDate" />
+        <result column="working_time" property="workingTime" />
         <result column="content" property="content" />
         <result column="create_time" property="createTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, creator_id, report_type, create_date, content, create_time
+        id, creator_id, project_id, create_date, working_time, content, create_time
     </sql>
 
 </mapper>