修改

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

@@ -41,7 +41,7 @@ public class ContactsController {
      * @return
      */
     @RequestMapping("/addContacts")
-    public HttpRespMsg addContacts(@RequestBody Contacts contacts){
+    public HttpRespMsg addContacts(Contacts contacts){
         return contactsService.addContacts(contacts, request);
     }
 
@@ -66,7 +66,7 @@ public class ContactsController {
      * @return
      */
     @RequestMapping("selectContactsByCustomId")
-    public HttpRespMsg selectContactsByCustomId(@RequestBody Custom custom){
+    public HttpRespMsg selectContactsByCustomId(Custom custom){
         return contactsService.selectContactsByCustomId(custom,request);
     }
 
@@ -76,7 +76,7 @@ public class ContactsController {
      * @return
      */
     @RequestMapping("updateContacts")
-    public HttpRespMsg updateContacts(@RequestBody Contacts contacts){
+    public HttpRespMsg updateContacts( Contacts contacts){
         return contactsService.updateContacts(contacts,request);
     }
 
@@ -86,7 +86,7 @@ public class ContactsController {
      * @return
      */
     @RequestMapping("deleteContacts")
-    public HttpRespMsg deleteContacts(@RequestBody List<Integer> ids){
+    public HttpRespMsg deleteContacts( List<Integer> ids){
         return contactsService.deleteContacts(ids,request);
     }
 
@@ -105,7 +105,7 @@ public class ContactsController {
      * 批量删除回收站中的联系人
      */
     @RequestMapping("confirmDeleteContacts")
-    public HttpRespMsg confirmDeleteContacts(@RequestBody List<Integer> ids){
+    public HttpRespMsg confirmDeleteContacts(List<Integer> ids){
         return contactsService.confirmDeleteContacts(ids);
     }
 
@@ -115,12 +115,12 @@ public class ContactsController {
      * @return
      */
     @RequestMapping("returnContacts")
-    public HttpRespMsg returnContacts(@RequestBody List<Integer> ids){
+    public HttpRespMsg returnContacts(List<Integer> ids){
         return contactsService.returnContacts(ids);
     }
 
     @RequestMapping("getContactsDetail")
-    public HttpRespMsg getContactsDetail(@RequestBody Contacts contacts ){
+    public HttpRespMsg getContactsDetail(Contacts contacts ){
         return contactsService.getContactsDetail(contacts,request);
     }
 

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

@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -62,6 +65,8 @@ public class ContactsDocument extends Model<ContactsDocument> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime indate;
 
     /**

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

@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -38,6 +41,8 @@ public class ContactsLog extends Model<ContactsLog> {
      * 操作时间
      */
     @TableField("operate_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime operateDate;
 
     /**

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

@@ -52,6 +52,7 @@ public class Custom extends Model<Custom> {
      */
     @TableField("incharger_id")
     private String inchargerId;
+    @TableField(exist = false)
     private String inchargerName;
 
     /**

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

@@ -2,34 +2,32 @@ package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.time.LocalDate;
-
 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 java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
- *
+ * 
  * </p>
  *
  * @author Seyason
- * @since 2024-03-14
+ * @since 2024-04-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class Task extends Model<Task> {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID=1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
@@ -121,7 +119,7 @@ public class Task extends Model<Task> {
     private Integer repeatType;
 
     /**
-     * 重复永不结束   1:勾选
+     * 重复永不结束   1:勾选  
      */
     @TableField("repeat_end_never")
     private Integer repeatEndNever;
@@ -135,11 +133,13 @@ public class Task extends Model<Task> {
     /**
      * 重复结束 在  ? 日期YYYY-MM-DD之后
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField("repeat_end_date")
-    private Date repeatEndDate;
+    private LocalDateTime repeatEndDate;
 
     /**
-     * 自定义周期: 每 ? 天一次,保存为 x1,x2,x3,x4
+     * 自定义日期: 每 ? 天一次,保存为 x1,x2,x3,x4
      */
     @TableField("repeat_design_day")
     private String repeatDesignDay;
@@ -171,26 +171,34 @@ public class Task extends Model<Task> {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("create_date")
-    private Date createDate;
+    private LocalDateTime createDate;
 
     /**
      * 截止时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("end_date")
-    private Date endDate;
+    private LocalDateTime endDate;
 
     /**
      * 开始日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("start_date")
-    private Date startDate;
+    private LocalDateTime startDate;
 
     /**
      * 完成日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("finish_date")
-    private Date finishDate;
+    private LocalDateTime finishDate;
 
     /**
      * 是否被删除: 0否,1是

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

@@ -274,10 +274,12 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
                 if (StringUtils.isNotEmpty(task.getExecutorId())) {
                     String executorIdString = task.getExecutorId();
                     String[] executorIds = executorIdString.split(",");
+                    ArrayList<String> list = new ArrayList<>();
                     for (int index = 0; index < executorIds.length; index++) {
-                        User userSelect = userMapper.selectById(executorIds);
-                        task.getExecutorNames().add(userSelect.getName());
+                        User userSelect = userMapper.selectById(executorIds[index]);
+                        list.add(userSelect.getName());
                     }
+                    task.setExecutorNames(list);
                 }
             });
 

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

@@ -163,7 +163,7 @@ public class SysFormServiceImpl extends ServiceImpl<SysFormMapper, SysForm> impl
             cellStyle.setBorderLeft(BorderStyle.THIN);//左边框
             cellStyle.setBorderTop(BorderStyle.THIN);//上边框
             cellStyle.setBorderRight(BorderStyle.THIN);//右边框
-
+            cellStyle.setDataFormat(workBook.createDataFormat().getFormat("yyyy-MM-dd HH:mm:ss"));
             if(allList.size() > 0) {
                 int start = 0;
                 for(List<String> rowList : allList) {

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(new Date());//任务的创建时间
+        task.setCreateDate(LocalDateTime.now());//任务的创建时间
         //根据任务的开始时间与当下时间判断任务的状态
-        if (taskDto.getStartDate()==null||taskDto.getStartDate().after(new Date())){
+        if (taskDto.getStartDate()==null||taskDto.getStartDate().isAfter(LocalDateTime.now())){
             task.setStatus(0);
         }else {
             task.setStatus(1);
@@ -397,7 +397,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 Task task=new Task();
                 task.setCompanyId(companyId);
                 task.setCreaterId(user.getId());
-                task.setCreateDate(new Date());
+                task.setCreateDate(LocalDateTime.now());
                 for (int i = 0; i < cellNum; i++) {
                     JSONObject item = configObJSONArray.getJSONObject(i);
                     String modelName = item.getString("model");
@@ -499,18 +499,34 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                     if(modelName.equals("startDate")){
                         if(cell != null && cell.getCellTypeEnum() != CellType.BLANK){
                             if (cell.getCellTypeEnum() == CellType.NUMERIC){
-                                double numericCellValue = cell.getNumericCellValue();
-                                long daysSince1900 = (long) numericCellValue - 2;
-                                task.setStartDate(new Date(daysSince1900));
+                                Date dateCellValue = cell.getDateCellValue();
+                                if (dateCellValue.before(new Date(-2208988800L))){
+                                    continue;
+                                }else {
+                                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                                    String string = format.format(dateCellValue);
+                                    System.out.println(string);
+                                    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                                    LocalDateTime time = LocalDateTime.parse(string, dateTimeFormatter);
+                                    task.setStartDate(time);
+                                }
                             }
                         }
                     }
                     if(modelName.equals("endDate")){
                         if(cell != null && cell.getCellTypeEnum() != CellType.BLANK){
                             if (cell.getCellTypeEnum() == CellType.NUMERIC){
-                                double numericCellValue = cell.getNumericCellValue();
-                                long daysSince1900 = (long) numericCellValue - 2;
-                                task.setEndDate(new Date(daysSince1900));
+                                Date dateCellValue = cell.getDateCellValue();
+                                if (dateCellValue.before(new Date(-2208988800L))){
+                                    continue;
+                                }else {
+                                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                                    String string = format.format(dateCellValue);
+                                    System.out.println(string);
+                                    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                                    LocalDateTime time = LocalDateTime.parse(string, dateTimeFormatter);
+                                    task.setEndDate(time);
+                                }
                             }
                         }
                     }
@@ -771,14 +787,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 }
                 else if(model.equals("startDate")){
                     if (tasKVo.getStartDate()!=null){
-                        Date startDate = tasKVo.getStartDate();
+                        LocalDateTime startDate = tasKVo.getStartDate();
                         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                         value=format.format(startDate);
                     }
                 }
                 else if(model.equals("endDate")){
                     if (tasKVo.getEndDate()!=null){
-                        Date endDate = tasKVo.getEndDate();
+                        LocalDateTime endDate = tasKVo.getEndDate();
                         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                         value=format.format(endDate);
                     }