Merge remote-tracking branch 'origin/main'

sql/sqlserver/20231010JS.sql

@@ -0,0 +1,7 @@
+-- 银行回单及审批流程字段新增
+ALTER TABLE archives_bank_slip ADD COLUMN `staff_id` bigint(20) NULL DEFAULT NULL COMMENT '认款员工id';
+ALTER TABLE archives_bank_slip ADD COLUMN `staff_name` varchar(64) NULL DEFAULT NULL COMMENT '认款员工名称';
+ALTER TABLE archives_bank_slip ADD COLUMN `subscription_status` varchar(64) NULL DEFAULT NULL COMMENT '认款状态 0:未认款 1 已认款';
+ALTER TABLE archives_flow ADD COLUMN `password` varchar(64) NULL DEFAULT NULL COMMENT '密码';
+
+

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/FlowController.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.accounting.controller.admin.flow;
 
+import cn.hutool.core.io.IoUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
@@ -9,6 +10,8 @@ import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.*;
 import cn.iocoder.yudao.module.accounting.convert.flow.FlowConvert;
 import cn.iocoder.yudao.module.accounting.dal.dataobject.flow.FlowDO;
 import cn.iocoder.yudao.module.accounting.service.flow.FlowService;
+import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import cn.iocoder.yudao.module.setting.service.passwords.PasswordsService;
 import com.alibaba.druid.util.StringUtils;
@@ -53,28 +56,23 @@ public class FlowController {
     @Operation(summary = "创建审批流程")
     @PreAuthorize("@ss.hasPermission('archives:flow:create')")
     public CommonResult<Long> createFlow(@Valid @RequestBody FlowCreateReqVO createReqVO) {
+        createReqVO.setFlowCode(execute());
         return success(flowService.createFlow(createReqVO));
     }
 
 
-    /**
-     * 账簿上传
-     */
+
     @PostMapping("/upload")
-    @Operation(summary = "上传审批流程图")
+    @Operation(summary = "上传审批流程img")
+    @Parameter(name = "multipartFile", description = "文件", required = true)
     @PreAuthorize("@ss.hasPermission('archives:flow:create')")
-    public Long uploadAccountingBook(@RequestPart("multipartFile") MultipartFile multipartFile) {
-        FlowCreateReqVO vo = new FlowCreateReqVO();
-        try {
-            String uri =  fileService.createFile(multipartFile.getName(), multipartFile.getOriginalFilename(), multipartFile.getBytes());
-            vo.setSuffix(multipartFile.getOriginalFilename())
-                    .setFileUrl(uri)
-                    .setFileAp(uri)
-                    .setFlowCode(execute());
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return flowService.createFlow(vo);
+    public CommonResult<FileDO> upload(@RequestParam("multipartFile") MultipartFile multipartFile) throws IOException {
+        String fileUrl = fileService.createFile(multipartFile.getOriginalFilename(), null, IoUtil.readBytes(multipartFile.getInputStream()));
+        FilePageReqVO pageReqVO = new FilePageReqVO();
+        String lastSegment = fileUrl.substring(fileUrl.lastIndexOf("/") + 1);
+        pageReqVO.setPath(lastSegment);
+        PageResult<FileDO> filePage = fileService.getFilePage(pageReqVO);
+        return success(filePage.getList().get(0));
     }
 
     /**