提交

dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java

@@ -45,7 +45,7 @@ public class BusinessTaskBo extends BaseEntity {
      * 期望完成时间
      */
     @NotNull(message = "期望完成时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date expectTime;
+    private String expectTime;
 
     /**
      * 说明
@@ -57,7 +57,7 @@ public class BusinessTaskBo extends BaseEntity {
      * 完成时间
      */
 
-    private Date completeTime;
+    private String completeTime;
 
     /**
      * 工单状态（0预约中  1 等待中，2执行中  3 未完成 4已完结 ）

dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java

@@ -51,7 +51,7 @@ public class BusinessTaskVo implements Serializable {
      * 期望完成时间
      */
     @ExcelProperty(value = "期望完成时间")
-    private Date expectTime;
+    private String expectTime;
 
     private String verbalTrick;
     /**
@@ -64,7 +64,7 @@ public class BusinessTaskVo implements Serializable {
      * 完成时间
      */
     @ExcelProperty(value = "完成时间")
-    private Date completeTime;
+    private String completeTime;
 
     /**
      * 工单状态（0预约中  1 等待中，2执行中  3 未完成 4已完结 ）

dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessTaskMapper.java

@@ -1,16 +1,16 @@
 package org.dromara.business.mapper;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.business.domain.BusinessTask;
 import org.dromara.business.domain.bo.BusinessTaskBo;
 import org.dromara.business.domain.vo.BusinessTaskVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.common.mybatis.core.page.PageQuery;
 
-import java.util.List;
+
+
 
 /**
  * 工单预约Mapper接口

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java

@@ -1,5 +1,8 @@
 package org.dromara.business.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import org.dromara.business.domain.BusinessTask;
 import org.dromara.business.domain.bo.BusinessTaskBo;
 import org.dromara.business.domain.vo.BusinessTaskVo;
@@ -90,6 +93,7 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
      */
     @Override
     public Boolean insertByBo(BusinessTaskBo bo) {
+        System.out.println("数据"+bo.getPolygonRegion());
         // 获取当前登录用户信息
         LoginUser currentUser = DataPermissionHelper.getVariable("user");
         bo.setCreateBy(currentUser.getUserId());
@@ -99,7 +103,12 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
         bo.setTenantId(currentUser.getTenantId());
         bo.setStatus("0");
         bo.setCreateTime(new Date());
+        String jsonString = JSON.toJSONString(bo.getPolygonRegion());
         BusinessTask add = MapstructUtils.convert(bo, BusinessTask.class);
+        add.setPolygonRegion(jsonString);
+        if(StrUtil.isNotBlank(bo.getExpectTime())){
+            add.setExpectTime(Convert.toDate(bo.getExpectTime()));
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());