增加费用报销图片上传功能

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

@@ -0,0 +1,55 @@
+package com.management.platform.controller;
+
+import com.management.platform.util.HttpRespMsg;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/common")
+public class CommonUploadController {
+
+    Logger logger = LogManager.getLogger(org.apache.logging.log4j.LogManager.ROOT_LOGGER_NAME);
+    @Value(value = "${upload.path}")
+    private String path;
+
+    @RequestMapping(value="uploadFile")
+    public HttpRespMsg uploadFile(MultipartFile multipartFile) {
+        HttpRespMsg msg = new HttpRespMsg();
+
+        //然后处理文件
+        String fileName = multipartFile.getOriginalFilename();
+        String[] split = fileName.split("\\.");
+        String serverName = UUID.randomUUID().toString().replaceAll("-", "") + "."+split[split.length-1];
+
+        File file = new File(path, serverName);
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        try {
+            inputStream = multipartFile.getInputStream();
+            outputStream = new FileOutputStream(file);
+            byte[] buffer = new byte[4096];
+            int temp = 0;
+            while ((temp = inputStream.read(buffer, 0, 4096)) != -1) {
+                outputStream.write(buffer, 0, temp);
+            }
+            inputStream.close();
+            outputStream.close();
+            msg.data = serverName;
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            logger.error(exception.getMessage());
+        }
+
+        return msg;
+    }
+}

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

@@ -78,14 +78,20 @@ public class TaskController {
     @RequestMapping("/save")
     public HttpRespMsg save(Task task) {
         String userId = request.getHeader("Token");
+        //当前用户
         User user = userMapper.selectById(userId);
-        Integer companyId = user.getCompanyId();
         HttpRespMsg msg = new HttpRespMsg();
-        task.setCreateDate(LocalDate.now());
-        task.setCreaterId(userId);
-        task.setCreaterName(user.getName());
-        task.setCreatorColor(user.getColor());
-        task.setCompanyId(user.getCompanyId());
+
+        //新建的任务，需要设置创建人，创建时间
+        if (task.getId() == null) {
+            task.setCreateDate(LocalDate.now());
+            task.setCreaterId(userId);
+            task.setCreaterName(user.getName());
+            task.setCreatorColor(user.getColor());
+            task.setCompanyId(user.getCompanyId());
+        }
+
+
         if (!StringUtils.isEmpty(task.getExecutorId())) {
             User executor = userMapper.selectById(task.getExecutorId());
 
@@ -138,7 +144,7 @@ public class TaskController {
         comment.setUserId(user.getId());
         comment.setUserName(user.getName());
         comment.setType(isNew?1:2);
-        comment.setContent(user.getName()+"创建了任务");
+        comment.setContent(user.getName()+(isNew?"创建":"编辑")+"了任务");
         taskCommentMapper.insert(comment);
 
         //更新执行人近期任务

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

@@ -67,13 +67,14 @@ public class UserController {
     /**
      * 获取员工的列表
      * departmentId 检索的部门id -1为全部 0为其他
+     * keyword 姓名关键字匹配，可不传
      * pageIndex 页面索引
      * pageSize 页面大小
      */
     @RequestMapping("/getEmployeeList")
-    public HttpRespMsg getEmployeeList(@RequestParam Integer departmentId,
+    public HttpRespMsg getEmployeeList(@RequestParam Integer departmentId, String keyword,
                                        @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return userService.getEmployeeList(departmentId, pageIndex, pageSize, request);
+        return userService.getEmployeeList(departmentId, keyword, pageIndex, pageSize, request);
     }
 
     /**

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

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2021-06-18
+ * @since 2021-12-06
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -87,6 +87,12 @@ public class ExpenseItem extends Model<ExpenseItem> {
     @TableField("expense_type")
     private String expenseType;
 
+    /**
+     * 报销凭证
+     */
+    @TableField("pic")
+    private String pic;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -19,17 +19,17 @@ import java.util.Map;
 public interface UserMapper extends BaseMapper<User> {
     List<Map<String, Object>> getUserByDepartment(Page page,
                                                   @Param("companyId") Integer companyId,
-                                                  @Param("departmentId") Integer departmentId);
+                                                  @Param("departmentId") Integer departmentId, String keyword);
 
     Integer countUserByDepartment(@Param("companyId") Integer companyId,
-                                  @Param("departmentId") Integer departmentId);
+                                  @Param("departmentId") Integer departmentId, String keyword);
 
     List<Map<String, Object>> getUserByDepartmentList(Page page,
                                                       @Param("companyId") Integer companyId,
-                                                      @Param("departmentIds") List departmentIds);
+                                                      @Param("departmentIds") List departmentIds, String keyword);
 
     Integer countUserByDepartmentList(@Param("companyId") Integer companyId,
-                                      @Param("departmentIds") List departmentIds);
+                                      @Param("departmentIds") List departmentIds, String keyword);
 
     List<Map<String, Object>> getPushUserList(@Param("companyId") Integer companyId);
 

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

@@ -22,7 +22,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg getUserInfo(String id);
 
-    HttpRespMsg getEmployeeList(Integer departmentId, Integer pageIndex, Integer pageSize, HttpServletRequest request);
+    HttpRespMsg getEmployeeList(Integer departmentId, String keyword, Integer pageIndex, Integer pageSize, HttpServletRequest request);
 
     HttpRespMsg deleteUser(String userId, HttpServletRequest request);
 

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

@@ -236,7 +236,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     //获取员工的列表
     @Override
-    public HttpRespMsg getEmployeeList(Integer departmentId, Integer pageIndex, Integer pageSize, HttpServletRequest request) {
+    public HttpRespMsg getEmployeeList(Integer departmentId, String keyword, Integer pageIndex, Integer pageSize, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
@@ -245,16 +245,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             Page<User> page = new Page<>(pageIndex, pageSize);
             if (departmentId == -1) {
                 //单独查找全部
-                list = userMapper.getUserByDepartment(page, companyId, null);
-                total = userMapper.countUserByDepartment(companyId, null);
+                list = userMapper.getUserByDepartment(page, companyId, null, keyword);
+                total = userMapper.countUserByDepartment(companyId, null, keyword);
             } else if (departmentId == 0) {
                 //单独查找0
-                list = userMapper.getUserByDepartment(page, companyId, departmentId);
-                total = userMapper.countUserByDepartment(companyId, departmentId);
+                list = userMapper.getUserByDepartment(page, companyId, departmentId, keyword);
+                total = userMapper.countUserByDepartment(companyId, departmentId, keyword);
             } else {
                 //范围查找
-                list = userMapper.getUserByDepartmentList(page, companyId, getBranchDepartment(departmentId, companyId));
-                total = userMapper.countUserByDepartmentList(companyId, getBranchDepartment(departmentId, companyId));
+                list = userMapper.getUserByDepartmentList(page, companyId, getBranchDepartment(departmentId, companyId), keyword);
+                total = userMapper.countUserByDepartmentList(companyId, getBranchDepartment(departmentId, companyId), keyword);
             }
             Map<String, Object> resultMap = new HashMap<>();
             resultMap.put("records", list);

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

@@ -15,11 +15,12 @@
         <result column="amount" property="amount" />
         <result column="remark" property="remark" />
         <result column="expense_type" property="expenseType" />
+        <result column="pic" property="pic" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, expense_id, project_id, happen_date, invoice_type, invoice_no, tax_percent, tax_value, amount, remark, expense_type
+        id, expense_id, project_id, happen_date, invoice_type, invoice_no, tax_percent, tax_value, amount, remark, expense_type, pic
     </sql>
 
 </mapper>

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

@@ -45,6 +45,9 @@
         <if test="departmentId != null and companyId != ''">
             AND a.department_id = #{departmentId}
         </if>
+        <if test="keyword != null and keyword != ''">
+            AND a.name like '%${keyword}%'
+        </if>
     </select>
 
     <!--单独分页获取人员数量-->
@@ -55,6 +58,9 @@
         <if test="departmentId != null and companyId != ''">
             AND a.department_id = #{departmentId}
         </if>
+        <if test="keyword != null and keyword != ''">
+            AND a.name like '%${keyword}%'
+        </if>
     </select>
 
     <!--范围分页获取人员-->
@@ -68,6 +74,9 @@
         <foreach collection="departmentIds" item="departmentId" index="index" open="(" close=")" separator=",">
             #{departmentId}
         </foreach>
+        <if test="keyword != null and keyword != ''">
+            AND a.name like '%${keyword}%'
+        </if>
     </select>
 
     <!--范围分页获取人员数量-->
@@ -78,6 +87,9 @@
         <foreach collection="departmentIds" item="departmentId" index="index" open="(" close=")" separator=",">
             #{departmentId}
         </foreach>
+        <if test="keyword != null and keyword != ''">
+            AND a.name like '%${keyword}%'
+        </if>
     </select>