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

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

@@ -97,7 +97,6 @@ public class TaskController {
             task.setCreatorColor(user.getColor());
             task.setCompanyId(user.getCompanyId());
         }
-
         if (!StringUtils.isEmpty(executorListStr)) {
             List<User> allUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
             List<TaskExecutor> executorList = JSONArray.parseArray(executorListStr, TaskExecutor.class);
@@ -185,6 +184,12 @@ public class TaskController {
                 msgRecepientList = task.getExecutorList().stream().filter(newT->!StringUtils.isEmpty(newT.getExecutorId()) && !oldExeList.stream().anyMatch(old->newT.getExecutorId().equals(old.getExecutorId())))
                         .map(TaskExecutor::getExecutorId).collect(Collectors.toList());
             }
+            if(task.getStartDate()==null){
+                taskMapper.updateStartDate(task.getId());
+            }
+            if(task.getEndDate()==null){
+                taskMapper.updateEndDate(task.getId());
+            }
         }
         System.out.println(task.getStartDate());
         System.out.println(task.getEndDate());

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

@@ -76,6 +76,11 @@ public class UserController {
         return userService.getSimpleActiveUserList(departmentId, request);
     }
 
+    @RequestMapping("/getUserListByRole")
+    public HttpRespMsg getUserListByRole(){
+        return userService.getUserListByRole(request);
+    }
+
     /**
      * 删除用户
      * userId 用户id

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

@@ -1,6 +1,5 @@
 package com.management.platform.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -99,7 +98,7 @@ public class Task extends Model<Task> {
     /**
      * 截止时间
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField("end_date")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endDate;
@@ -168,7 +167,7 @@ public class Task extends Model<Task> {
     /**
      * 完成日期
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField("finish_date")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate finishDate;
@@ -189,7 +188,7 @@ public class Task extends Model<Task> {
     /**
      * 开始日期
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField("start_date")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate startDate;

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

@@ -45,4 +45,8 @@ public interface TaskMapper extends BaseMapper<Task> {
     List<Task> selectMilepost(@Param("ids") List<Integer> ids);
 
     List getExecutorPlanHour(Integer projectId);
+    @Update("update task set start_date =null where id=#{id}")
+    void updateStartDate(Integer id);
+    @Update("update task set end_date =null where id=#{id}")
+    void updateEndDate(Integer id);
 }

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

@@ -69,4 +69,6 @@ public interface UserService extends IService<User> {
     HttpRespMsg batchUpdateRole(String userIds, Integer roleId, HttpServletRequest request);
 
     HttpRespMsg getSimpleActiveUserList(Integer departmentId, HttpServletRequest request);
+
+    HttpRespMsg getUserListByRole(HttpServletRequest request);
 }

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

@@ -135,6 +135,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private UserCustomMapper userCustomMapper;
     @Resource
     private ExpenseTypeService expenseTypeService;
+    @Resource
+    private DepartmentOtherManagerMapper departmentOtherManagerMapper;
     //登录网页端
     @Override
     public HttpRespMsg loginAdmin(String username, String password) {
@@ -1776,6 +1778,32 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getUserListByRole(HttpServletRequest request) {
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
+        List<DepartmentOtherManager> otherManagers = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("other_manager_id", user.getId()));
+        //获取全部子部门
+        List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
+        List<Integer> collect = departmentList.stream().distinct().map(Department::getDepartmentId).collect(Collectors.toList());
+        List<Integer> collect1 = otherManagers.stream().distinct().map(DepartmentOtherManager::getDepartmentId).collect(Collectors.toList());
+        List<Integer> deptIds=new ArrayList<>();
+        for (Integer departmentId : collect) {
+            List<Integer> ids = departmentService.getDeptIncludeSubDeptIds(departmentId, allDeptList);
+            deptIds.addAll(ids);
+        }
+        for (Integer departmentId : collect1) {
+            List<Integer> ids = departmentService.getDeptIncludeSubDeptIds(departmentId, allDeptList);
+            deptIds.addAll(ids);
+        }
+        if(deptIds!=null&&deptIds.size()>0){
+            List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("department_id", deptIds));
+            httpRespMsg.data=userList;
+        }
+        return httpRespMsg;
+    }
+
 
     public boolean push(User user, String date) {
         //1，配置

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -592,7 +592,7 @@
                     placeholder="请选择日期"></el-date-picker>
                 </el-form-item><br>
                 <el-form-item label="关联项目" prop="projectId">
-                    <el-select v-model="relationItem.projectId" placeholder="请选择项目" @change="getwuduList(2)" style="width:220px" filterable popper-class="projectSelectPopperClass">
+                    <el-select v-model="relationItem.projectId" placeholder="请选择项目" @change="getwuduList(2)" style="width:220px" filterable >
                         <el-option
                         v-for="item in projectList"
                         :key="item.id"