修改

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

@@ -6,6 +6,7 @@ import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 import lombok.Data;
@@ -130,7 +131,7 @@ public class Task extends Model<Task> {
      * 重复结束 在  ? 日期YYYY-MM-DD之后
      */
     @TableField("repeat_end_date")
-    private LocalDate repeatEndDate;
+    private Date repeatEndDate;
 
     /**
      * 自定义周期: 每 ? 天一次,保存为 x1,x2,x3,x4
@@ -166,25 +167,25 @@ public class Task extends Model<Task> {
      * 创建时间
      */
     @TableField("create_date")
-    private LocalDate createDate;
+    private Date createDate;
 
     /**
      * 截止时间
      */
     @TableField("end_date")
-    private LocalDate endDate;
+    private Date endDate;
 
     /**
      * 开始日期
      */
     @TableField("start_date")
-    private LocalDate startDate;
+    private Date startDate;
 
     /**
      * 完成日期
      */
     @TableField("finish_date")
-    private LocalDate finishDate;
+    private Date finishDate;
 
     /**
      * 是否被删除: 0否,1是

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -41,7 +43,7 @@ public class TaskLog extends Model<TaskLog> {
      * 修改时间
      */
     @TableField("mod_time")
-    private LocalDateTime modTime;
+    private Date modTime;
 
     /**
      * 修改人

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/vo/TasKVo.java

@@ -28,6 +28,7 @@ public class TasKVo extends Task {
     private String contactsName;
     private String contactsPhone;
 
+
     private List taskExecutors;
 
 

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

@@ -121,9 +121,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         }
         Task task = new Task();
         BeanUtils.copyProperties(taskDto,task);
-        task.setCreateDate(LocalDate.now());//任务的创建时间
+        task.setCreateDate(new Date());//任务的创建时间
         //根据任务的开始时间与当下时间判断任务的状态
-        if (taskDto.getStartDate()==null||taskDto.getStartDate().isAfter(LocalDate.now())){
+        if (taskDto.getStartDate()==null||taskDto.getStartDate().after(new Date())){
             task.setStatus(0);
         }else {
             task.setStatus(1);
@@ -163,7 +163,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         taskLog.setContent("创建了任务");
         taskLog.setUserId(userId);
         taskLog.setUserName(user.getName());
-        taskLog.setModTime(LocalDateTime.now());
         taskLog.setCompanyId(user.getCompanyId());
         taskLogMapper.insert(taskLog);
 
@@ -181,9 +180,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         List<TaskLog> taskLogList = taskLogMapper.selectList(new LambdaQueryWrapper<TaskLog>().eq(TaskLog::getCompanyId,user.getCompanyId()));
         List<TasKVo> taskVoList =taskMapper.getPageListTask(taskDto);
         for (TasKVo tasKVo : taskVoList) {
-            System.out.println(tasKVo.getStartDate());
-            System.out.println(tasKVo.getEndDate());
-            System.out.println(tasKVo.getCreateDate());
             if (!taskExecutorList.isEmpty()){
                 List<TaskExecutor> collect = taskExecutorList.stream().
                         filter(taskExecutor -> taskExecutor.getTaskId().equals(tasKVo.getId())).
@@ -204,17 +200,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             }
 
         }
-        if (!taskVoList.isEmpty()){
-            taskVoList.forEach(tasKVo -> {
-                if (!tasKVo.getTaskExecutors().isEmpty()){
-                    Integer taskId = tasKVo.getId();
-                    LambdaQueryWrapper<TaskExecutor> lqw = new LambdaQueryWrapper<>();
-                    lqw.eq(TaskExecutor::getTaskId,taskId);
-                    List<TaskExecutor> taskExecutors = taskExecutorMapper.selectList(lqw);
-                    tasKVo.setTaskExecutors(taskExecutors);
-                }
-            });
-        }
         List<TasKVo> taskVoTotalList= taskMapper.getPageListTotalTask(taskDto);
         HttpRespMsg msg = new HttpRespMsg();
         HashMap<String, Object> map = new HashMap<>();
@@ -272,7 +257,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         taskLog.setContent("修改了任务");
         taskLog.setUserId(user.getId());
         taskLog.setUserName(user.getName());
-        taskLog.setModTime(LocalDateTime.now());
         taskLogMapper.insert(taskLog);
 
         return msg;
@@ -414,7 +398,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 Task task=new Task();
                 task.setCompanyId(companyId);
                 task.setCreaterId(user.getId());
-                task.setCreateDate(LocalDate.now());
+                task.setCreateDate(new Date());
                 for (int i = 0; i < cellNum; i++) {
                     JSONObject item = configObJSONArray.getJSONObject(i);
                     String modelName = item.getString("model");
@@ -518,7 +502,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                             if (cell.getCellTypeEnum() == CellType.NUMERIC){
                                 double numericCellValue = cell.getNumericCellValue();
                                 long daysSince1900 = (long) numericCellValue - 2;
-                                task.setStartDate(LocalDate.of(1900, 1, 1).plusDays(daysSince1900));
+                                task.setStartDate(new Date(daysSince1900));
                             }
                         }
                     }
@@ -527,7 +511,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                             if (cell.getCellTypeEnum() == CellType.NUMERIC){
                                 double numericCellValue = cell.getNumericCellValue();
                                 long daysSince1900 = (long) numericCellValue - 2;
-                                task.setEndDate(LocalDate.of(1900, 1, 1).plusDays(daysSince1900));
+                                task.setEndDate(new Date(daysSince1900));
                             }
                         }
                     }
@@ -687,7 +671,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                         TaskLog taskLog = new TaskLog();
                         taskLog.setTaskId(task.getId());
                         taskLog.setContent("通过文件导入任务");
-                        taskLog.setModTime(LocalDateTime.now());
                         taskLog.setUserName(user.getName());
                         taskLog.setUserId(user.getId());
                         taskLog.setCompanyId(user.getCompanyId());
@@ -783,16 +766,16 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 }
                 if(model.equals("startDate")){
                     if (tasKVo.getStartDate()!=null){
-                        LocalDate startDate = tasKVo.getStartDate();
-                        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                        value=startDate.format(dateTimeFormatter);
+                        Date startDate = tasKVo.getStartDate();
+                        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        value=format.format(startDate);
                     }
                 }
                 if(model.equals("endDate")){
                     if (tasKVo.getEndDate()!=null){
-                        LocalDate endDate = tasKVo.getEndDate();
-                        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                        value=endDate.format(dateTimeFormatter);
+                        Date endDate = tasKVo.getEndDate();
+                        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        value=format.format(endDate);
                     }
                 }
                 item.add(value);
@@ -816,7 +799,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         taskMapper.update(null,luw);
         TaskLog taskLog = new TaskLog();
         taskLog.setUserId(user.getId()).setTaskId(taskDto.getId()).setUserName(user.getName())
-                .setContent("修改任务状态").setModTime(LocalDateTime.now());
+                .setContent("修改任务状态");
         taskLogMapper.insert(taskLog);
         return msg;
     }

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -62,16 +62,16 @@
         <result column="repeat_type" property="repeatType" />
         <result column="repeat_end_never" property="repeatEndNever" />
         <result column="repeat_end_count" property="repeatEndCount" />
-        <result column="repeat_end_date" property="repeatEndDate" jdbcType="DATE" javaType="java.time.LocalDate" />
+        <result column="repeat_end_date" property="repeatEndDate"  />
         <result column="repeat_design_day" property="repeatDesignDay" />
         <result column="repeat_design_sameday" property="repeatDesignSameday" />
         <result column="task_desc" property="taskDesc" />
         <result column="creater_id" property="createrId" />
         <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" jdbcType="DATE" javaType="java.time.LocalDate" />
-        <result column="end_date" property="endDate" jdbcType="DATE" javaType="java.time.LocalDate" />
-        <result column="start_date" property="startDate" jdbcType="DATE" javaType="java.time.LocalDate" />
-        <result column="finish_date" property="finishDate" jdbcType="DATE" javaType="java.time.LocalDate" />
+        <result column="create_date" property="createDate"  />
+        <result column="end_date" property="endDate" />
+        <result column="start_date" property="startDate" />
+        <result column="finish_date" property="finishDate" />
         <result column="is_delete" property="isDelete" />
         <result column="plate1" property="plate1" />
         <result column="plate2" property="plate2" />