Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
 import javax.validation.Valid;
 
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +39,6 @@ import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.feign.ArchiveTreeContractClient;
 import org.springblade.manager.feign.ProjectClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -452,4 +452,14 @@ public class ArchivesAutoController extends BladeController {
 		return R.data(archivesAutoService.getCarrierTypeByDict());
 	}
 
+	/**
+	 * 获取档案销毁人列表
+	 */
+	@GetMapping("/getArchiveDestroyUser")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "获取档案销毁人列表", notes = "获取档案销毁人列表")
+	public R getArchiveDestroyUser(){
+		return R.data(archivesAutoService.getArchiveDestroyUser());
+	}
+
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -22,6 +22,7 @@ import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.system.entity.DictBiz;
+import org.springblade.system.user.entity.User;
 
 import java.util.List;
 import java.util.Map;
@@ -81,4 +82,5 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	void archiveAutoMethodThread(Long projectId, Long contractId, Long nodeId);
 
+	List<User> getArchiveDestroyUser();
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -59,6 +59,7 @@ import org.springblade.manager.feign.ProjectClient;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
+import org.springblade.system.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -1667,6 +1668,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			}
 		});
 	}
-
+	@Override
+	public List<User> getArchiveDestroyUser() {
+		return autoMapper.getArchiveDestroyUser();
+	}
 
 }