From 9858d97e0814bf61b97c937ef209222403fa1f27 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 04 七月 2025 02:43:31 +0800
Subject: [PATCH] dnc导出修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
index 6980c61..0428131 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
@@ -1,16 +1,32 @@
package org.springblade.mdm.program.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.task.Comment;
+import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.mdm.flow.service.ApproveRecordService;
+import org.springblade.mdm.flow.vo.ApproveRecordVO;
+import org.springblade.mdm.flow.vo.TaskTraceVO;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcProgramService;
+import org.springblade.mdm.program.service.ProcessProgRefService;
+import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
+import org.springblade.mdm.program.vo.NcProgramUploadVO;
+import org.springblade.mdm.program.vo.NcProgramVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 绋嬪簭鑺傜偣
@@ -26,12 +42,16 @@
public class NcProgramController {
private final NcProgramService ncProgramService;
+ private final ProcessProgRefService ncProcessProgRefService;
+
+ private final ApproveRecordService approveRecordService;
@PostMapping("/upload")
- @Operation(summary = "涓婁紶", description = "涓婁紶绋嬪簭/闄勪欢鏂囦欢")
- public R<Boolean> upload(@RequestParam MultipartFile file,Long nodeId,
- @RequestParam String category) {
- ncProgramService.uploadProgramFile(file,nodeId,category);
+ @Operation(summary = "涓婁紶鏂囦欢", description = "涓婁紶绋嬪簭/闄勪欢鏂囦欢")
+ public R<Boolean> upload(NcProgramUploadVO uploadVO) {
+ //@Parameter(description="鏂囦欢") @RequestPart("file") MultipartFile file, @Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam Long nodeId,
+ // @Parameter(description="鏂囦欢鍒嗙被锛屼娇鐢ㄥ瓧鍏�(node_file_type)") @RequestParam String category
+ ncProgramService.uploadProgramFile(uploadVO);
return R.<Boolean>status(true);
}
@@ -57,4 +77,38 @@
return R.fail(e.getMessage());
}
}
+
+ @GetMapping("/list-by-node")
+ @Operation(summary = "鑺傜偣绋嬪簭鏂囦欢鍒楄〃", description = "鏌愯妭鐐瑰唴鐨勭▼搴忓垪琛紝浠呪�樼▼搴忓寘鈥欏瓧鍏稿��60")
+ public R<List<NcProgramVO>> listByNode(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam Long nodeId) {
+ return R.data(ncProgramService.listByNode(nodeId));
+ }
+
+ @PostMapping("/upgrade-process-edition")
+ @Operation(summary = "鍗囩増", description = "鍗囩骇宸ュ簭鐗堟")
+ public R<Boolean> upgradeProcessEdition(Long id,String newProcessEdition ) {
+ ncProgramService.upgradeProcessEdition(id,newProcessEdition);
+ return R.<Boolean>status(true);
+ }
+
+ @Operation(summary = "绋嬪簭鍒嗛〉鏌ヨ", description = "鐢ㄤ簬鍦ㄧ紪鍒惰妭鐐归�夋嫨娴佺▼瀵瑰簲鐨勭▼搴�")
+ @GetMapping("/programpickpage")
+ public R<IPage<NcProgramVO>> page(NcNodeProgramQueryVO query) {
+ IPage<NcProgramVO> pages = ncProgramService.pageQuery(query);
+ return R.data(pages);
+ }
+
+ @GetMapping("/list-by-process")
+ @Operation(summary = "娴佺▼宸查�夌▼搴忔枃浠跺垪琛�", description = "娴佺▼宸查�夌▼搴忓垪琛�")
+ public R<List<NcProgramVO>> listByProcess(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam String processInstanceId) {
+ return R.data(ncProcessProgRefService.listByProcess(processInstanceId));
+ }
+
+ @Operation(summary = "鎿嶄綔鏃ュ織", description = "绋嬪簭鎿嶄綔鏃ュ織锛屽嵆瀹℃壒璁板綍锛屽湪涓婚〉鐐瑰嚮鏌愪竴涓▼搴忓悗鐨勪笅鏂规爣绛炬樉绀�")
+ @GetMapping("approve-records")
+ public R<List<ApproveRecordVO>> processTrace1(@Parameter(description = "绋嬪簭id") Long ncProgramId){
+ List<TaskTraceVO> result = new ArrayList<>();
+
+ return R.data(approveRecordService.listByNcProgramId(ncProgramId));
+ }
}
--
Gitblit v1.9.3