Browse Source

提交:运营中心修改字段 fileId → waylineId

pull/1/head
袁强 3 months ago
parent
commit
62dab1c420
  1. 2
      dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java
  2. 2
      dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessOperationBo.java
  3. 2
      dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java
  4. 2
      dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java
  5. 2
      dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessOperationServiceImpl.java
  6. 2
      dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceQrtzController.java

2
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 nickName;
private String deptName; private String deptName;
private Integer fileId; private String waylineId;
private String fileName; private String fileName;
private String jobName; private String jobName;
private String jobId; private String jobId;

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

@ -82,7 +82,7 @@ public class BusinessOperationBo {
* 航线id * 航线id
* */ * */
@NotBlank(message = "航线id不能为空", groups = { AddGroup.class, EditGroup.class }) @NotBlank(message = "航线id不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer fileId; private String waylineId;
/** /**
* 航线名称 * 航线名称
* */ * */

2
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 nickName;
private String deptName; private String deptName;
private Integer fileId; private String waylineId;
private String fileName; private String fileName;
private String jobName; private String jobName;
private String jobId; private String jobId;

2
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 String nickName;
private Long createDept; private Long createDept;
private String deptName; private String deptName;
private Integer fileId; private String waylineId;
private String fileName; private String fileName;
private String jobName; private String jobName;
private String jobId; private String jobId;

2
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) { public Boolean insertByBo(BusinessOperationBo bo) {
//根据工单绘制上传航线,绑定航线,填报信息 //根据工单绘制上传航线,绑定航线,填报信息
BusinessTaskVo businessTaskVo = businessTaskService.queryById(bo.getTaskId()); BusinessTaskVo businessTaskVo = businessTaskService.queryById(bo.getTaskId());
businessTaskVo.setFileId(bo.getFileId()); businessTaskVo.setWaylineId(bo.getWaylineId());
businessTaskVo.setFileName(bo.getFileName()); businessTaskVo.setFileName(bo.getFileName());
businessTaskVo.setStatus(BusinessConstants.TASK_STATUS_1); businessTaskVo.setStatus(BusinessConstants.TASK_STATUS_1);
BusinessTask businessTask = MapstructUtils.convert(businessTaskVo, BusinessTask.class); BusinessTask businessTask = MapstructUtils.convert(businessTaskVo, BusinessTask.class);

2
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.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.sample.manage.model.dto.DeviceQrtzDTO; 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.DeviceQrtzEntity;
import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity; import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity;
import org.dromara.sample.manage.service.IDeviceQrtzDateService;
import org.dromara.sample.manage.service.IDeviceQrtzService; import org.dromara.sample.manage.service.IDeviceQrtzService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;

Loading…
Cancel
Save