Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

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

@@ -6,7 +6,6 @@ import com.management.platform.service.ReportService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -41,6 +40,10 @@ public class ReportController {
         return reportService.getReportList(date, request);
     }
 
+    /**
+     * 导出报告
+     * date 日期 格式yyyy-mm-dd
+     */
     @RequestMapping("/exportReport")
     public HttpRespMsg exportReport(@RequestParam String date) {
         return reportService.exportReport(date, request);
@@ -77,6 +80,7 @@ public class ReportController {
                         .setContent(content[i])
                         .setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                         .setCreatorId(request.getHeader("Token")));
+                /*后续需要加入状态*/
                 if (createDate[i] == null || projectId[i] == null) {
                     HttpRespMsg httpRespMsg = new HttpRespMsg();
                     httpRespMsg.setError("缺少数据");
@@ -99,5 +103,31 @@ public class ReportController {
     public HttpRespMsg deleteReport(@RequestParam Integer id) {
         return reportService.deleteReport(id);
     }
+
+    /**
+     * 获取所有未审批通过的报告
+     */
+    @RequestMapping("/uncensoredList")
+    public HttpRespMsg getUncensoredList(HttpServletRequest request) {
+        return reportService.getUncensoredList(request);
+    }
+
+    /**
+     * 审批通过报告
+     * id 要通过的报告的id
+     */
+    @RequestMapping("/approve")
+    public HttpRespMsg approveReport(Integer id, HttpServletRequest request) {
+        return reportService.approveReport(id, request);
+    }
+
+    /**
+     * 审批未通过报告 撤销通过报告
+     * id 要未通过的报告的id
+     */
+    @RequestMapping("/deny")
+    public HttpRespMsg denyReport(Integer id, HttpServletRequest request) {
+        return reportService.denyReport(id, request);
+    }
 }
 

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

@@ -2,30 +2,31 @@ package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-08
+ * @since 2020-02-17
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class Report extends Model<Report> {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
@@ -63,6 +64,12 @@ public class Report extends Model<Report> {
     @TableField(value = "content", updateStrategy = FieldStrategy.IGNORED)
     private String content;
 
+    /**
+     * 审查状态 0-未审核 1-已通过 2-未通过
+     */
+    @TableField("state")
+    private Integer state;
+
     /**
      * 创建时间
      */

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

@@ -22,4 +22,6 @@ public interface ReportMapper extends BaseMapper<Report> {
     List<Map<String, Object>> getReportByDate(@Param("date") String date, @Param("id") String id);
 
     List<Map<String, Object>> getReportNameByDate(@Param("date") String date, @Param("companyId") Integer companyId);
+
+    List<Map<String, Object>> getUncensoredList(@Param("companyId") Integer companyId);
 }

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

@@ -25,4 +25,10 @@ public interface ReportService extends IService<Report> {
     HttpRespMsg editReport(List<Report> reportList);
 
     HttpRespMsg deleteReport(Integer reportId);
+
+    HttpRespMsg getUncensoredList(HttpServletRequest request);
+
+    HttpRespMsg approveReport(Integer id, HttpServletRequest request);
+
+    HttpRespMsg denyReport(Integer id, HttpServletRequest request);
 }

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

@@ -1,31 +1,27 @@
 package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.entity.*;
 import com.management.platform.mapper.*;
 import com.management.platform.service.ReportService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.service.TimeCalculationService;
 import com.management.platform.util.HttpRespMsg;
 import org.apache.poi.hssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * <p>
  * 服务实现类
@@ -252,8 +248,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     httpRespMsg.setError("操作失败");
                 }
             } else {
-                if (reportMapper.updateById(report) == 0) {
-                    httpRespMsg.setError("操作失败");
+                if (reportMapper.selectById(report.getId()).getState() != 1) {
+                    if (reportMapper.updateById(report) == 0) {
+                        httpRespMsg.setError("操作失败");
+                    }
                 }
             }
         }
@@ -269,4 +267,58 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         return httpRespMsg;
     }
+
+    //获取未经审核的报告列表
+    @Override
+    public HttpRespMsg getUncensoredList(HttpServletRequest request) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        try {
+            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
+            httpRespMsg.data = reportMapper.getUncensoredList(companyId);
+        } catch (NullPointerException e) {
+            httpRespMsg.setError("验证失败");
+            return httpRespMsg;
+        }
+        return httpRespMsg;
+    }
+
+    //审核通过
+    @Override
+    public HttpRespMsg approveReport(Integer id, HttpServletRequest request) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        try {
+            User user = userMapper.selectById(request.getHeader("Token"));
+            Report report = reportMapper.selectById(id);
+            Project project = projectMapper.selectById(report.getProjectId());
+            if (user.getRole() == 0 || !project.getCompanyId().equals(user.getCompanyId())) {
+                httpRespMsg.setError("无修改权限");
+            } else {
+                reportMapper.updateById(report.setState(1));
+            }
+        } catch (NullPointerException e) {
+            httpRespMsg.setError("验证失败");
+            return httpRespMsg;
+        }
+        return httpRespMsg;
+    }
+
+    //审核未通过 以及 撤销审核
+    @Override
+    public HttpRespMsg denyReport(Integer id, HttpServletRequest request) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        try {
+            User user = userMapper.selectById(request.getHeader("Token"));
+            Report report = reportMapper.selectById(id);
+            Project project = projectMapper.selectById(report.getProjectId());
+            if (user.getRole() == 0 || !project.getCompanyId().equals(user.getCompanyId())) {
+                httpRespMsg.setError("无修改权限");
+            } else {
+                reportMapper.updateById(report.setState(2));
+            }
+        } catch (NullPointerException e) {
+            httpRespMsg.setError("验证失败");
+            return httpRespMsg;
+        }
+        return httpRespMsg;
+    }
 }

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

@@ -63,10 +63,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         } else if (userList.size() > 1) {
             //检索到两个及以上账号时
             httpRespMsg.setError("账号重名");
-        } /*else if (userList.get(0).getRole() == 0) {
-            //检索的账号role是0 即是普通员工时
-            httpRespMsg.setError("无登录权限");
-        }*/ else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
+        } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
             //查看该公司非会员公司，只能允许试用三天，超时不可登录
             Company company = companyMapper.selectOne(new QueryWrapper<Company>().eq("id", userList.get(0).getCompanyId()));
             //公司未办理会员
@@ -99,7 +96,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return httpRespMsg;
     }
 
-    //登录网页端
+    //登录PC端
     @Override
     public HttpRespMsg loginEmployee(String username, String password) {
         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("department");
+        strategy.setInclude("report");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -20,7 +20,8 @@
         SELECT SUM(b.working_time) AS time, SUM(b.working_time * a.cost) AS money
         FROM user AS a
         LEFT JOIN report AS b ON a.id = b.creator_id
-        WHERE a.department_id IN
+        WHERE b.state = 1
+        AND a.department_id IN
         <foreach collection="departmentIds" item="departmentId" index="index" open="(" close=")" separator=",">
             #{departmentId}
         </foreach>
@@ -33,7 +34,8 @@
         FROM user AS a
         LEFT JOIN report AS b ON a.id = b.creator_id
         LEFT JOIN project AS c ON b.project_id = c.id
-        WHERE a.department_id IN
+        WHERE b.state = 1
+        AND a.department_id IN
         <foreach collection="departmentIds" item="departmentId" index="index" open="(" close=")" separator=",">
             #{departmentId}
         </foreach>

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

@@ -17,7 +17,7 @@
     <!--获取查询者所在公司每个项目的工时成本-->
     <select id="getParticipatedProject" resultType="java.util.Map">
         SELECT id, project_name AS projectName
-        FROM project AS a
+        FROM project
         WHERE id IN (
             SELECT project_id
             FROM participation
@@ -33,6 +33,7 @@
         LEFT JOIN report AS b ON b.project_id = a.id
         JOIN user AS c ON b.creator_id = c.id
         WHERE a.company_id = #{companyId}
+        AND b.state = 1
         GROUP BY a.id
         ORDER BY a.id ASC
     </select>
@@ -43,6 +44,7 @@
         FROM report AS a
         JOIN user AS b ON a.creator_id = b.id
         WHERE a.project_id = #{projectId}
+        AND a.state = 1
         GROUP BY b.id
         ORDER BY b.id ASC
     </select>

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

@@ -10,12 +10,13 @@
         <result column="create_date" property="createDate"/>
         <result column="working_time" property="workingTime"/>
         <result column="content" property="content"/>
+        <result column="state" property="state"/>
         <result column="create_time" property="createTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, creator_id, project_id, create_date, working_time, content, create_time
+        id, creator_id, project_id, create_date, working_time, content, state, create_time
     </sql>
 
     <!--根据日期获取全部报告信息-->
@@ -24,9 +25,9 @@
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN user AS c ON a.creator_id=c.id
-        WHERE 1=1
+        WHERE a.state = 1
         <if test="date != null and date != ''">
-            AND a.create_date=#{date}
+            AND a.create_date = #{date}
         </if>
         ORDER BY a.creator_id ASC
     </select>
@@ -58,4 +59,14 @@
         </if>
     </select>
 
+    <!--获取未经审核的报告列表-->
+    <select id="getUncensoredList" resultType="java.util.Map">
+        SELECT a.id, b.name AS user, c.project_name AS project, a.create_date AS date, a.working_time AS time, a.content
+        FROM report AS a
+        LEFT JOIN user AS b ON a.creator_id=b.id
+        JOIN project AS c ON a.project_id = c.id
+        WHERE c.company_id = #{companyId}
+        AND a.state IN (0,2)
+    </select>
+
 </mapper>