1

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

@@ -209,7 +209,7 @@ public class TaskController {
             if (taskList.size() == 0) {
                 task.setSeq(1);
             } else {
-                task.setSeq(taskList.get(0).getSeq() + 1);
+                task.setSeq(taskList.get(0).getSeq()==null?0:taskList.get(0).getSeq() + 1);
             }
             //比当前创建的这条task的seq大于或者等于的，都要往后排一位
             queryWrapper = new QueryWrapper<>();
@@ -693,6 +693,7 @@ public class TaskController {
         String userId = request.getHeader("Token");
         User user = userMapper.selectById(userId);
         Task t = taskService.getById(id);
+        List<SapProjectService> serviceList = sapProjectServiceService.list(new LambdaQueryWrapper<SapProjectService>().eq(SapProjectService::getCompanyId, user.getCompanyId()));
         if (t == null) {
             //msg.setError("该任务已不存在");
             msg.setError(MessageUtils.message("Stages.noExist"));
@@ -711,7 +712,17 @@ public class TaskController {
             list.get(0).setCreatorName(name);
         }
         //查询任务的执行人
-        t.setExecutorList(taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", t.getId())));
+        List<TaskExecutor> executorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", t.getId()));
+        executorList.forEach(e->{
+            if(e.getServiceId()!=null){
+                Optional<SapProjectService> first = serviceList.stream().filter(s -> s.getId().equals(e.getServiceId())).findFirst();
+                if(first.isPresent()){
+                    e.setServiceName(first.get().getServiceName());
+                    e.setServiceCode(first.get().getServiceCode());
+                }
+            }
+        });
+        t.setExecutorList(executorList);
         //查询项目负责人id以及所属任务分组负责人id
         Project project = projectService.getOne(new QueryWrapper<Project>().eq("id", t.getProjectId()));
         TaskGroup group = taskGroupService.getOne(new QueryWrapper<TaskGroup>().eq("id", t.getGroupId()));

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

@@ -67,6 +67,12 @@ public class TaskExecutor extends Model<TaskExecutor> {
     @TableField("service_id")
     private Integer serviceId;
 
+    @TableField(exist = false)
+    private String serviceName;
+
+    @TableField(exist = false)
+    private String serviceCode;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -649,6 +649,14 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                         msg.setError("工位不能为空");
                         return msg;
                     }
+                    if(startDateCell!=null&&!StringUtils.isEmpty(startDateCell.getDateCellValue())&&endDateCell!=null&&!StringUtils.isEmpty(endDateCell.getDateCellValue())){
+                        LocalDate startDate = LocalDate.parse(sdf.format(startDateCell.getDateCellValue()), df);
+                        LocalDate endDate = LocalDate.parse(sdf.format(endDateCell.getDateCellValue()), df);
+                        if(endDate.isBefore(startDate)){
+                            msg.setError("第"+rowIndex+"行数据结束日期大于开始日期");
+                            return msg;
+                        }
+                    }
                     if(startDateCell!=null&&!StringUtils.isEmpty(startDateCell.getDateCellValue())){
                         plan.setStartDate(LocalDate.parse(sdf.format(startDateCell.getDateCellValue()),df));
                     }else {
@@ -756,6 +764,14 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                         msg.setError("工位不能为空");
                         return msg;
                     }
+                    if(startDateCell!=null&&!StringUtils.isEmpty(startDateCell.getDateCellValue())&&endDateCell!=null&&!StringUtils.isEmpty(endDateCell.getDateCellValue())){
+                        LocalDate startDate = LocalDate.parse(sdf.format(startDateCell.getDateCellValue()), df);
+                        LocalDate endDate = LocalDate.parse(sdf.format(endDateCell.getDateCellValue()), df);
+                        if(endDate.isBefore(startDate)){
+                            msg.setError("第"+rowIndex+"行数据结束日期大于开始日期");
+                            return msg;
+                        }
+                    }
                     if(startDateCell!=null&&!StringUtils.isEmpty(startDateCell.getDateCellValue())){
                         plan.setStartDate(LocalDate.parse(sdf.format(startDateCell.getDateCellValue()),df));
                     }else {