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

fhKeeper/formulahousekeeper/management-crm-qrcode/src/main/resources/application.yml

@@ -7,9 +7,6 @@ server:
 spring:
   servlet:
     multipart:
-      # 配置上传文件的大小设置
-
-      # Single file max size  即单个文件大小
       max-file-size: 100MB
       max-request-size: 100MB
       location: C:/upload/
@@ -40,11 +37,6 @@ spring:
         maxActive: 8
   ####全局配置时间返回格式#####
   jackson:
-    #参数意义：
-    #JsonInclude.Include.ALWAYS       默认
-    #JsonInclude.Include.NON_DEFAULT   属性为默认值不序列化
-    #JsonInclude.Include.NON_EMPTY     属性为 空（””） 或者为 NULL 都不序列化
-    #JsonInclude.Include.NON_NULL      属性为NULL  不序列化
     default-property-inclusion: ALWAYS
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
@@ -63,9 +55,6 @@ logging:
   path: C:/
 ##########
 mybatis-plus:
-#  mapper-locations: classpath:mapper/*/*.xml
-#  #实体扫描，多个package用逗号或者分号分隔
-#  typeAliasesPackage: com.hssx.cloudmodel
   global-config:
     #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
     id-type: 0
@@ -111,10 +100,6 @@ management:
     enabled:false:
   server:
     port: 10012
-#  endpoints:
-#    web:
-#      exposure:
-#        include: "*"
 
   health:
     redis:

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/time/VisitPlanTask.java

@@ -41,10 +41,10 @@ public class VisitPlanTask {
     //TODO 需还原
     public void checkRemindMessage() {
         Date now = new Date();
-        System.out.println("===开始检查该分钟需提醒的访客计划==="+now);
+//        System.out.println("===开始检查该分钟需提醒的访客计划==="+now);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<VisitPlan> visitPlans = visitPlanMapper.getMinuteVisitPlans(now);
-        System.out.println("需提醒计划数量为: "+visitPlans.size());
+//        System.out.println("需提醒计划数量为: "+visitPlans.size());
         List<WxCorpInfo> wxCorpInfos = wxCorpInfoMapper.selectList(null);
         Map<Integer, WxCorpInfo> companyWXCorpMap = new HashMap<>();
         if(CollectionUtils.isNotEmpty(wxCorpInfos)){
@@ -83,7 +83,7 @@ public class VisitPlanTask {
 
             }
         }
-        System.out.println("===检查该分钟需提醒的访客计划结束===");
+//        System.out.println("===检查该分钟需提醒的访客计划结束===");
     }
 
 

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

@@ -240,6 +240,7 @@ public class TaskController {
             task.setCreaterName(user.getName());
             task.setCreatorColor(user.getColor());
             task.setCompanyId(user.getCompanyId());
+            task.setTaskDesc("");
             //无需审核，直接通过
             if (!taskType.getNeedAudit()){
                 task.setTaskStatus(STATUS_DOING);
@@ -698,7 +699,7 @@ public class TaskController {
                 }
                 if (stringJoiner.length()>0){
                     log.info("stringJoiner==>"+stringJoiner.toString());
-                    String msg1="计划:"+task.getName()+",审核人有以下改动:";
+                    String msg1="计划:"+task.getName()+(initTaskStatus==3?",一级审核人有以下改动:":",二级审核人有以下改动:");
                     Information information = new Information();
                     information.setType(11);
                     information.setMsg(msg1+stringJoiner.toString());

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

@@ -649,7 +649,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             String initExectorIds="";
             String initExectorNames="";
             Double initworkHourExector= (double) 0;
-            for (int rowIndex = 1; rowIndex <= sheet.getLastRowNum(); rowIndex++) {
+            for (int rowIndex = 2; rowIndex <= sheet.getLastRowNum(); rowIndex++) {
                 ArrayList<TaskExecutor> taskExecutors = new ArrayList<>();
                 XSSFRow row = sheet.getRow(rowIndex);
                 Task task = new Task();
@@ -957,6 +957,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                     task.setExecutorName(executorStr);
                     initExectorIds=exectorIds.toString();
                     initExectorColors=exectorColors.toString();
+                    initExectorNames=executorStr;
                     taskDailyAllocate.setUserId(exectorIds.toString());
                     task.setExecutorId(exectorIds.toString());
                     task.setExecutorColor(exectorColors.toString());
@@ -1777,7 +1778,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
                 String infoMsg = project.getProjectName() + "项目的FTE计划审批任务" +
                         (executorNames.isEmpty() ? "" : ",执行人有:" + executorNames) +
-                        ",工作计划被驳回";
+                        ",工作计划被一级审核人驳回";
                 information.setMsg(infoMsg);
                 information.setType(11);
                 information.setJumpType(2);
@@ -1807,7 +1808,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
                 String infoMsg = project.getProjectName() + "项目的FTE计划审批任务" +
                         (executorNames.isEmpty() ? "" : ",执行人有:" + executorNames) +
-                        ",工作计划被驳回";
+                        ",工作计划被二级审核人驳回";
                 information.setMsg(infoMsg);
                 information.setType(11);
                 information.setJumpType(2);

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

@@ -274,7 +274,7 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
             Integer companyId = targetUser.getCompanyId();
             Map<String, Object> resultMap = new HashMap<>();
 
-            List<Map<String, Object>> list =deviceLogMapper.selectListGroupByProject(companyId,startDate,endDate,projectId);
+            List<Map<String, Object>> list =deviceLogMapper.selectListGroupByProject(companyId,startDate,endDate + " 23:59:59",projectId);
 
             BigDecimal totalMoneyCost = BigDecimal.valueOf(0);
             for (Map<String, Object> map : list) {
@@ -309,7 +309,7 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
         Integer companyId = targetUser.getCompanyId();
         List<Map<String, Object>> sumProjectList =deviceLogMapper.selectListGroupByProject(companyId,startDate,endDate,projectId);
         List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().eq("company_id", companyId));
-        List<DeviceLog> deviceLogs = deviceLogMapper.selectList(new QueryWrapper<DeviceLog>().between("create_date", startDate, endDate).isNotNull("end_time"));
+        List<DeviceLog> deviceLogs = deviceLogMapper.selectList(new QueryWrapper<DeviceLog>().between("start_time", startDate, endDate + " 23:59:59").isNotNull("end_time"));
 
         ArrayList<List<String>> allList = new ArrayList<>();
         List<String> headList = new ArrayList<String>();

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

@@ -414,6 +414,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
             // 获取所有用户并按部门分组
             List<User> allUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id", targetUser.getCompanyId()));
+
+            //根据时间过滤掉该时间段离职或未入职的员工
+            if (allUsers != null && !allUsers.isEmpty()) {
+                allUsers.removeIf(u -> u.getIsActive() == 0 &&u.getInactiveDate()!=null && u.getInactiveDate().isBefore(startDate));
+                allUsers.removeIf(u -> u.getIsActive() == 1 &&u.getInductionDate()!=null && u.getInductionDate().isAfter(lastDate));
+            }
             Map<Integer, List<User>> usersByDepartment = allUsers.stream().collect(Collectors.groupingBy(User::getDepartmentId));
 
             // 获取部门信息
@@ -524,7 +530,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                 // 添加到多Sheet数据
                 multiSheetList[deptIndex] = body;
-                sheetsName[deptIndex] = department.getDepartmentName()+"_"+(deptIndex+1);
+                if (wxCorpInfo != null) {
+                    sheetsName[deptIndex] ="$departmentName="+(department.getCorpwxDeptid()==null?"":department.getCorpwxDeptid())+"$"+"_"+(deptIndex+1); //避免sheet名称重复
+                } else {
+                    sheetsName[deptIndex] = (StringUtils.isEmpty(department.getDepartmentName())?"":department.getDepartmentName())+"_"+(deptIndex+1);//避免sheet名称重复
+                }
             }
 
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java

@@ -329,8 +329,8 @@ public class DataCollectTask {
                                     //获取某人每天请假的时长合计
                                     String ownerId = tmp.getOwnerId();
                                     User owner = userMapper.selectById(ownerId);
-                                    //停用的用户不生成日报
-                                    if (owner.getIsActive() == 0) {
+                                    //停用的/不需要填写日报的用户不生成日报
+                                    if (owner.getIsActive() == 0 || owner.getReportStatus() == 1) {
                                         continue;
                                     }
                                     Project project = projectMapper.selectOne(new QueryWrapper<Project>().eq("project_code", "HH-QJ-0000001").eq("company_id", specialCompanyId));

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -66,7 +66,7 @@
                 <el-form-item label="任务完成校验" v-if="user.timeType.taskFileCharge">
                     <el-checkbox v-model="addForm.attachFileRequired" >是否必须上传成果文件</el-checkbox>
                 </el-form-item>
-                <el-form-item  :label="$t('taskdefinition')" prop="name">
+                <el-form-item  label="任务内容" prop="name">
                     <!-- <el-input v-model="addForm.name" :maxlength="40" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)" :placeholder="$t('enterthetaskcontent')" clearable></el-input> -->
                     <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="addForm.name" :maxlength="500" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)" clearable show-word-limit></el-input>
                 </el-form-item>

fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/gantt.vue

@@ -412,8 +412,9 @@ export default {
       }
 
       // 更改为统一的
-      if([2,3,4,5,6].includes(taskStatus)) {
+      if([0,2,3,4,5,6].includes(taskStatus)) {
           return `<div class="task_text">
+            ${task.taskStatus == 0 ? `<div class="exclamation-circle circle greenStr" style="color: #8ecaf8">V</div><div class="exclamation-circle circle greenStr" style="color: #8ecaf8">V</div>` : ''}
             ${task.taskStatus == 2 ? `<div class="circle greyStr"></div>` : ''}
             ${task.taskStatus == 3 ? `<div class="circle orangeStr"></div> <div class="circle"></div>` : ''}
             ${task.taskStatus == 4 ? `<div class="exclamation-circle circle greenStr" style="color: #8ecaf8">V</div> <div class="circle orangeStr"></div>` : ''}