From 62dab1c420d8f20ee38cc85b9feb0fa16d7ab8c2 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 21 Mar 2025 15:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=20fileId?= =?UTF-8?q?=20=E2=86=92=20waylineId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/business/domain/BusinessTask.java | 2 +- .../org/dromara/business/domain/bo/BusinessOperationBo.java | 2 +- .../java/org/dromara/business/domain/bo/BusinessTaskBo.java | 2 +- .../java/org/dromara/business/domain/vo/BusinessTaskVo.java | 2 +- .../business/service/impl/BusinessOperationServiceImpl.java | 2 +- .../dromara/sample/manage/controller/DeviceQrtzController.java | 2 -- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java index 4e7bfcd..01bbece 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java @@ -62,7 +62,7 @@ public class BusinessTask extends BaseEntity { private String nickName; private String deptName; - private Integer fileId; + private String waylineId; private String fileName; private String jobName; private String jobId; diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java index 8d63409..b32d452 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java @@ -82,7 +82,7 @@ public class BusinessOperationBo { * 航线id * */ @NotBlank(message = "航线id不能为空", groups = { AddGroup.class, EditGroup.class }) - private Integer fileId; + private String waylineId; /** * 航线名称 * */ diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java index 6a2fc34..d0d8695 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java @@ -75,7 +75,7 @@ public class BusinessTaskBo extends BaseEntity { private String nickName; private String deptName; - private Integer fileId; + private String waylineId; private String fileName; private String jobName; private String jobId; diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java index 8090eae..f8f2965 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java @@ -79,7 +79,7 @@ public class BusinessTaskVo implements Serializable { private String nickName; private Long createDept; private String deptName; - private Integer fileId; + private String waylineId; private String fileName; private String jobName; private String jobId; diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java index 93783ce..133ddfc 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java @@ -108,7 +108,7 @@ public class BusinessOperationServiceImpl implements IBusinessOperationService { public Boolean insertByBo(BusinessOperationBo bo) { //根据工单绘制上传航线，绑定航线，填报信息 BusinessTaskVo businessTaskVo = businessTaskService.queryById(bo.getTaskId()); - businessTaskVo.setFileId(bo.getFileId()); + businessTaskVo.setWaylineId(bo.getWaylineId()); businessTaskVo.setFileName(bo.getFileName()); businessTaskVo.setStatus(BusinessConstants.TASK_STATUS_1); BusinessTask businessTask = MapstructUtils.convert(businessTaskVo, BusinessTask.class); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java index f9971f0..5f7bf36 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java @@ -15,10 +15,8 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.sample.manage.model.dto.DeviceQrtzDTO; -import org.dromara.sample.manage.model.entity.DeviceQrtzDateEntity; import org.dromara.sample.manage.model.entity.DeviceQrtzEntity; import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity; -import org.dromara.sample.manage.service.IDeviceQrtzDateService; import org.dromara.sample.manage.service.IDeviceQrtzService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated;