Merge remote-tracking branch 'origin/master'

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/formprocessmapping/FormProcessMappingController.java

@@ -91,5 +91,12 @@ public class FormProcessMappingController {
         ExcelUtils.write(response, "BPM 表单工作流对应.xls", "数据", FormProcessMappingRespVO.class,
                         BeanUtils.toBean(list, FormProcessMappingRespVO.class));
     }
-
+    @GetMapping("/get-form-view-path")
+    public CommonResult<String> getFormViewPath(@RequestParam("processKey") String processKey) {
+        return success(formProcessMappingService.selectFormViewPathByProcessKey(processKey));
+    }
+    @GetMapping("/get-form-create-path")
+    public CommonResult<String> getFormCreatePath(@RequestParam("processKey") String processKey) {
+        return success(formProcessMappingService.selectFormCreatePathByProcessKey(processKey));
+    }
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/formprocessmapping/FormProcessMappingMapper.java

@@ -29,6 +29,9 @@ public interface FormProcessMappingMapper extends BaseMapperX<FormProcessMapping
                 .betweenIfPresent(FormProcessMappingDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(FormProcessMappingDO::getId));
     }
-    @Select("SELECT form_custom_view_path FROM bpm_process_definition_info WHERE process_key = #{processKey}")
+    @Select("SELECT form_custom_view_path FROM bpm_form_process_mapping WHERE process_key = #{processKey}")
     String selectFormViewPathByProcessKey(@Param("processKey") String processKey);
+
+    @Select("SELECT form_custom_create_path FROM bpm_form_process_mapping WHERE process_key = #{processKey}")
+    String selectFormCreatePathByProcessKey(@Param("processKey") String processKey);
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/formprocessmapping/FormProcessMappingService.java

@@ -55,7 +55,14 @@ public interface FormProcessMappingService {
      * 通过 processKey 查询 formViewPath
      *
      * @param processKey 流程信息的键
-     * @return formCustomCreatePath 表单的提交路径
+     * @return formCustomViewPath 表单的提交路径
      */
     String selectFormViewPathByProcessKey(String processKey);
+    /**
+     * 通过 processKey 查询 formViewPath
+     *
+     * @param processKey 流程信息的键
+     * @return formCustomCreatePath 表单的提交路径
+     */
+    String selectFormCreatePathByProcessKey(String processKey);
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/formprocessmapping/FormProcessMappingServiceImpl.java

@@ -75,10 +75,21 @@ public class FormProcessMappingServiceImpl implements FormProcessMappingService
         if (StringUtils.isBlank(processKey)) {
             throw exception(PROCESS_KEY_NOT_PROVIDED); // 可自定义异常
         }
-        String formCustomCreatePath = formProcessMappingMapper.selectFormViewPathByProcessKey(processKey);
-        if (formCustomCreatePath == null) {
+        String formCustomViewPath = formProcessMappingMapper.selectFormViewPathByProcessKey(processKey);
+        if (formCustomViewPath == null) {
             throw exception(FORM_PROCESS_MAPPING_NOT_EXISTS); // 如果不存在对应记录
         }
-        return formCustomCreatePath;
+        return formCustomViewPath;
+    }
+    @Override
+    public String selectFormCreatePathByProcessKey(String processKey) {
+        if (StringUtils.isBlank(processKey)) {
+            throw exception(PROCESS_KEY_NOT_PROVIDED); // 可自定义异常
+        }
+        String formCustomViewPath = formProcessMappingMapper.selectFormCreatePathByProcessKey(processKey);
+        if (formCustomViewPath == null) {
+            throw exception(FORM_PROCESS_MAPPING_NOT_EXISTS); // 如果不存在对应记录
+        }
+        return formCustomViewPath;
     }
 }