From 5a995556b3b319f6276ec019b714e0f4288ba5b9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 02 Jan 2023 10:15:52 +0800
Subject: [PATCH] 添加申请撤销逻辑，删除撤销申请包
---
/dev/null | 50 -------------------------
src/main/java/org/springblade/flow/business/controller/WorkController.java | 46 +++++++++++++++++++++--
src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java | 5 ++
src/main/java/org/springblade/flow/engine/constant/FlowEngineConstant.java | 4 ++
4 files changed, 51 insertions(+), 54 deletions(-)
diff --git a/src/main/java/org/springblade/flow/business/controller/WorkController.java b/src/main/java/org/springblade/flow/business/controller/WorkController.java
index 5020192..441b727 100644
--- a/src/main/java/org/springblade/flow/business/controller/WorkController.java
+++ b/src/main/java/org/springblade/flow/business/controller/WorkController.java
@@ -16,17 +16,22 @@
*/
package org.springblade.flow.business.controller;
+import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
+import org.flowable.engine.impl.RuntimeServiceImpl;
+import org.springblade.common.constant.AuditStatusConstant;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.flow.business.service.FlowBusinessService;
@@ -34,6 +39,12 @@
import org.springblade.flow.core.utils.TaskUtil;
import org.springblade.flow.engine.entity.FlowProcess;
import org.springblade.flow.engine.service.FlowEngineService;
+import org.springblade.modules.application.entity.ApplicationEntity;
+import org.springblade.modules.application.service.IApplicationService;
+import org.springblade.modules.applicationCarChange.entity.ApplicationCarChangeEntity;
+import org.springblade.modules.applicationCarChange.service.IApplicationCarChangeService;
+import org.springblade.modules.applicationDelay.entity.ApplicationDelayEntity;
+import org.springblade.modules.applicationDelay.service.IApplicationDelayService;
import org.springframework.web.bind.annotation.*;
import java.time.Duration;
@@ -50,10 +61,15 @@
public class WorkController {
private final TaskService taskService;
+ private final RuntimeService runtimeService;
private final FlowEngineService flowEngineService;
private final FlowBusinessService flowBusinessService;
private final BladeRedis bladeRedis;
+
+ private final IApplicationService applicationService;
+ private final IApplicationDelayService applicationDelayService;
+ private final IApplicationCarChangeService applicationCarChangeService;
/**
* 发起事务列表页
@@ -156,15 +172,37 @@
@PostMapping("withdraw-task")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "撤销任务", notes = "传入流程信息")
- public R withdraw(String userId){
- int times = Func.toInt(bladeRedis.get("AUDIT-CANCEL" + userId), 1);
+ public R withdraw(@RequestBody BladeFlow bladeFlow){
+ int times = Func.toInt(bladeRedis.get("AUDIT-CANCEL" + AuthUtil.getUser().getUserId()), 1);
if (times>3){
- return R.success("撤销任务失败");
+ return R.fail("撤销任务失败");
}
- bladeRedis.setEx("AUDIT-CANCEL"+userId,times+1, Duration.ofDays(1));
+ bladeRedis.setEx("AUDIT-CANCEL"+AuthUtil.getUser().getUserId(),times+1, Duration.ofDays(1));
//撤销任务操作
+ runtimeService.deleteProcessInstance(bladeFlow.getProcessInstanceId(),"自己撤销");
+ switch (bladeFlow.getProcessDefinitionKey()){
+ case "Leave":
+ break;
+ case "Audit":
+ ApplicationEntity applicationEntity = applicationService.getById(bladeFlow.getBusinessId());
+ applicationEntity.setStatus(AuditStatusConstant.SELF_CANCEL);
+ applicationService.updateById(applicationEntity);
+ break;
+ case "delayAudit":
+ ApplicationDelayEntity applicationDelayEntity = applicationDelayService.getById(bladeFlow.getBusinessId());
+ applicationDelayEntity.setStatus(AuditStatusConstant.SELF_CANCEL);
+ applicationDelayService.updateById(applicationDelayEntity);
+ break;
+ case "carChangeAudit":
+ ApplicationCarChangeEntity applicationCarChangeEntity = applicationCarChangeService.getById(bladeFlow.getBusinessId());
+ applicationCarChangeEntity.setStatus(AuditStatusConstant.SELF_CANCEL);
+ applicationCarChangeService.updateById(applicationCarChangeEntity);
+ break;
+ default:
+ break;
+ }
return R.success("撤销任务成功");
}
diff --git a/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java b/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
index 8859947..debceeb 100644
--- a/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
+++ b/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -173,6 +173,11 @@
} else {
flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
}
+ //当deleteReason不为null时视为自行撤销
+ if (historicProcessInstance.getDeleteReason() != null){
+ flow.setProcessIsFinished(FlowEngineConstant.STATUS_WITHDRAW);
+ }
+
flow.setStatus(FlowEngineConstant.STATUS_FINISH);
flowList.add(flow);
});
diff --git a/src/main/java/org/springblade/flow/engine/constant/FlowEngineConstant.java b/src/main/java/org/springblade/flow/engine/constant/FlowEngineConstant.java
index bb660ab..f9ebc50 100644
--- a/src/main/java/org/springblade/flow/engine/constant/FlowEngineConstant.java
+++ b/src/main/java/org/springblade/flow/engine/constant/FlowEngineConstant.java
@@ -42,6 +42,10 @@
String STATUS_FINISHED = "finished";
String STATUS_UNFINISHED = "unfinished";
+ /**
+ * 自行撤销
+ */
+ String STATUS_WITHDRAW = "withdraw";
String STATUS_FINISH = "finish";
diff --git a/src/main/java/org/springblade/modules/applicationCancel/controller/ApplicationCancelController.java b/src/main/java/org/springblade/modules/applicationCancel/controller/ApplicationCancelController.java
deleted file mode 100644
index 9356023..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/controller/ApplicationCancelController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.applicationCancel.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.applicationCancel.entity.ApplicationCancelEntity;
-import org.springblade.modules.applicationCancel.vo.ApplicationCancelVO;
-import org.springblade.modules.applicationCancel.wrapper.ApplicationCancelWrapper;
-import org.springblade.modules.applicationCancel.service.IApplicationCancelService;
-import org.springblade.core.boot.ctrl.BladeController;
-
-/**
- * 撤销申请表 控制器
- *
- * @author BladeX
- * @since 2022-12-13
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("applicationCancel/applicationCancel")
-@Api(value = "撤销申请表", tags = "撤销申请表接口")
-public class ApplicationCancelController extends BladeController {
-
- private final IApplicationCancelService applicationCancelService;
-
- /**
- * 撤销申请表 详情
- */
- @GetMapping("/detail")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入applicationCancel")
- public R<ApplicationCancelVO> detail(ApplicationCancelEntity applicationCancel) {
- ApplicationCancelEntity detail = applicationCancelService.getOne(Condition.getQueryWrapper(applicationCancel));
- return R.data(ApplicationCancelWrapper.build().entityVO(detail));
- }
- /**
- * 撤销申请表 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入applicationCancel")
- public R<IPage<ApplicationCancelVO>> list(ApplicationCancelEntity applicationCancel, Query query) {
- IPage<ApplicationCancelEntity> pages = applicationCancelService.page(Condition.getPage(query), Condition.getQueryWrapper(applicationCancel));
- return R.data(ApplicationCancelWrapper.build().pageVO(pages));
- }
-
- /**
- * 撤销申请表 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入applicationCancel")
- public R<IPage<ApplicationCancelVO>> page(ApplicationCancelVO applicationCancel, Query query) {
- IPage<ApplicationCancelVO> pages = applicationCancelService.selectApplicationCancelPage(Condition.getPage(query), applicationCancel);
- return R.data(pages);
- }
-
- /**
- * 撤销申请表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入applicationCancel")
- public R save(@Valid @RequestBody ApplicationCancelEntity applicationCancel) {
- return R.status(applicationCancelService.save(applicationCancel));
- }
-
- /**
- * 撤销申请表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入applicationCancel")
- public R update(@Valid @RequestBody ApplicationCancelEntity applicationCancel) {
- return R.status(applicationCancelService.updateById(applicationCancel));
- }
-
- /**
- * 撤销申请表 新增或修改
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入applicationCancel")
- public R submit(@Valid @RequestBody ApplicationCancelEntity applicationCancel) {
- return R.status(applicationCancelService.saveOrUpdate(applicationCancel));
- }
-
- /**
- * 撤销申请表 删除
- */
- @PostMapping("/remove")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(applicationCancelService.deleteLogic(Func.toLongList(ids)));
- }
-
-
-}
diff --git a/src/main/java/org/springblade/modules/applicationCancel/dto/ApplicationCancelDTO.java b/src/main/java/org/springblade/modules/applicationCancel/dto/ApplicationCancelDTO.java
deleted file mode 100644
index 9953c0d..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/dto/ApplicationCancelDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.applicationCancel.dto;
-
-import org.springblade.modules.applicationCancel.entity.ApplicationCancelEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 撤销申请表 数据传输对象实体类
- *
- * @author BladeX
- * @since 2022-12-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ApplicationCancelDTO extends ApplicationCancelEntity {
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/src/main/java/org/springblade/modules/applicationCancel/entity/ApplicationCancelEntity.java b/src/main/java/org/springblade/modules/applicationCancel/entity/ApplicationCancelEntity.java
deleted file mode 100644
index b83bc97..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/entity/ApplicationCancelEntity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.applicationCancel.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
-/**
- * 撤销申请表 实体类
- *
- * @author BladeX
- * @since 2022-12-13
- */
-@Data
-@TableName("sys_application_cancel")
-@ApiModel(value = "ApplicationCancel对象", description = "撤销申请表")
-@EqualsAndHashCode(callSuper = true)
-public class ApplicationCancelEntity extends TenantEntity {
-
- /**
- * 申请表主键
- */
- @ApiModelProperty(value = "申请表主键")
- private String applicationId;
- /**
- * 撤销原因
- */
- @ApiModelProperty(value = "撤销原因")
- private String content;
-
-}
diff --git a/src/main/java/org/springblade/modules/applicationCancel/mapper/ApplicationCancelMapper.java b/src/main/java/org/springblade/modules/applicationCancel/mapper/ApplicationCancelMapper.java
deleted file mode 100644
index d354322..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/mapper/ApplicationCancelMapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.applicationCancel.mapper;
-
-import org.springblade.modules.applicationCancel.entity.ApplicationCancelEntity;
-import org.springblade.modules.applicationCancel.vo.ApplicationCancelVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- * 撤销申请表 Mapper 接口
- *
- * @author BladeX
- * @since 2022-12-13
- */
-public interface ApplicationCancelMapper extends BaseMapper<ApplicationCancelEntity> {
-
- /**
- * 自定义分页
- *
- * @param page
- * @param applicationCancel
- * @return
- */
- List<ApplicationCancelVO> selectApplicationCancelPage(IPage page, ApplicationCancelVO applicationCancel);
-
-
-}
diff --git a/src/main/java/org/springblade/modules/applicationCancel/mapper/ApplicationCancelMapper.xml b/src/main/java/org/springblade/modules/applicationCancel/mapper/ApplicationCancelMapper.xml
deleted file mode 100644
index b766184..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/mapper/ApplicationCancelMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.applicationCancel.mapper.ApplicationCancelMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="applicationCancelResultMap" type="org.springblade.modules.applicationCancel.entity.ApplicationCancelEntity">
- <result column="id" property="id"/>
- <result column="application_id" property="applicationId"/>
- <result column="content" property="content"/>
- <result column="tenant_id" property="tenantId"/>
- <result column="create_user" property="createUser"/>
- <result column="create_dept" property="createDept"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
- <result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
- </resultMap>
-
-
- <select id="selectApplicationCancelPage" resultMap="applicationCancelResultMap">
- select * from sys_application_cancel where is_deleted = 0
- </select>
-
-
-</mapper>
diff --git a/src/main/java/org/springblade/modules/applicationCancel/service/IApplicationCancelService.java b/src/main/java/org/springblade/modules/applicationCancel/service/IApplicationCancelService.java
deleted file mode 100644
index b316cc4..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/service/IApplicationCancelService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.applicationCancel.service;
-
-import org.springblade.modules.applicationCancel.entity.ApplicationCancelEntity;
-import org.springblade.modules.applicationCancel.vo.ApplicationCancelVO;
-import org.springblade.core.mp.base.BaseService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- * 撤销申请表 服务类
- *
- * @author BladeX
- * @since 2022-12-13
- */
-public interface IApplicationCancelService extends BaseService<ApplicationCancelEntity> {
-
- /**
- * 自定义分页
- *
- * @param page
- * @param applicationCancel
- * @return
- */
- IPage<ApplicationCancelVO> selectApplicationCancelPage(IPage<ApplicationCancelVO> page, ApplicationCancelVO applicationCancel);
-
-
-}
diff --git a/src/main/java/org/springblade/modules/applicationCancel/service/impl/ApplicationCancelServiceImpl.java b/src/main/java/org/springblade/modules/applicationCancel/service/impl/ApplicationCancelServiceImpl.java
deleted file mode 100644
index 1146f9f..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/service/impl/ApplicationCancelServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.applicationCancel.service.impl;
-
-import org.springblade.modules.applicationCancel.entity.ApplicationCancelEntity;
-import org.springblade.modules.applicationCancel.vo.ApplicationCancelVO;
-import org.springblade.modules.applicationCancel.mapper.ApplicationCancelMapper;
-import org.springblade.modules.applicationCancel.service.IApplicationCancelService;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- * 撤销申请表 服务实现类
- *
- * @author BladeX
- * @since 2022-12-13
- */
-@Service
-public class ApplicationCancelServiceImpl extends BaseServiceImpl<ApplicationCancelMapper, ApplicationCancelEntity> implements IApplicationCancelService {
-
- @Override
- public IPage<ApplicationCancelVO> selectApplicationCancelPage(IPage<ApplicationCancelVO> page, ApplicationCancelVO applicationCancel) {
- return page.setRecords(baseMapper.selectApplicationCancelPage(page, applicationCancel));
- }
-
-
-}
diff --git a/src/main/java/org/springblade/modules/applicationCancel/vo/ApplicationCancelVO.java b/src/main/java/org/springblade/modules/applicationCancel/vo/ApplicationCancelVO.java
deleted file mode 100644
index a6c3bf4..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/vo/ApplicationCancelVO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.applicationCancel.vo;
-
-import org.springblade.modules.applicationCancel.entity.ApplicationCancelEntity;
-import org.springblade.core.tool.node.INode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 撤销申请表 视图实体类
- *
- * @author BladeX
- * @since 2022-12-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ApplicationCancelVO extends ApplicationCancelEntity {
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/src/main/java/org/springblade/modules/applicationCancel/wrapper/ApplicationCancelWrapper.java b/src/main/java/org/springblade/modules/applicationCancel/wrapper/ApplicationCancelWrapper.java
deleted file mode 100644
index cf80ba2..0000000
--- a/src/main/java/org/springblade/modules/applicationCancel/wrapper/ApplicationCancelWrapper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.applicationCancel.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.applicationCancel.entity.ApplicationCancelEntity;
-import org.springblade.modules.applicationCancel.vo.ApplicationCancelVO;
-import java.util.Objects;
-
-/**
- * 撤销申请表 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2022-12-13
- */
-public class ApplicationCancelWrapper extends BaseEntityWrapper<ApplicationCancelEntity, ApplicationCancelVO> {
-
- public static ApplicationCancelWrapper build() {
- return new ApplicationCancelWrapper();
- }
-
- @Override
- public ApplicationCancelVO entityVO(ApplicationCancelEntity applicationCancel) {
- ApplicationCancelVO applicationCancelVO = Objects.requireNonNull(BeanUtil.copy(applicationCancel, ApplicationCancelVO.class));
-
- //User createUser = UserCache.getUser(applicationCancel.getCreateUser());
- //User updateUser = UserCache.getUser(applicationCancel.getUpdateUser());
- //applicationCancelVO.setCreateUserName(createUser.getName());
- //applicationCancelVO.setUpdateUserName(updateUser.getName());
-
- return applicationCancelVO;
- }
-
-
-}
--
Gitblit v1.9.3