Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

# Conflicts:
#	jyzb-process/src/main/java/com/junmp/junmpProcess/controller/SysFormController.java

app-log/log_error.log

@@ -5822,3 +5822,4 @@ Caused by: java.sql.SQLSyntaxErrorException: You have an error in your SQL synta
 2024-01-29 13:03:05.744 ERROR 7260 --- [http-nio-10030-exec-5] c.j.j.b.c.handle.GlobalExceptionHandler  : 业务异常，错误信息为：同类字典类型下，字典编码重复，字典类型：{}，字典名称：{}
 2024-01-29 13:03:06.352 ERROR 7260 --- [http-nio-10030-exec-1] c.j.j.b.c.handle.GlobalExceptionHandler  : 业务异常，错误信息为：同类字典类型下，字典编码重复，字典类型：{}，字典名称：{}
 2024-01-29 13:03:21.926 ERROR 7260 --- [http-nio-10030-exec-5] c.j.j.b.c.handle.GlobalExceptionHandler  : 业务异常，错误信息为：同类字典类型下，字典编码重复，字典类型：{}，字典名称：{}
+2024-01-29 13:12:05.545 ERROR 7260 --- [http-nio-10030-exec-7] com.junmp.v2.log.aop.ApiLogRecordAop     : com.junmp.junmpProcess.controller.BpmnController.getFormTemplateById(java.util.LinkedHashMap)

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProcessReq/FormReq.java

@@ -20,5 +20,5 @@ public class FormReq {
      */
     private String remark;
 
-
+    private String config;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/SysFormController.java

@@ -24,37 +24,37 @@ public class SysFormController {
     @Autowired
     private ISysFormService SysFormService;
 
-    @ApiOperation("创建新表单")
+    @ApiOperation("创建新表)
     @PostMapping("CreateForm")
-    public ApiRes<Boolean> CreateForm(@RequestBody FormReq formReq) {
+    public ApiRes<String> CreateForm(@RequestBody FormReq formReq) {
         return ApiRes.success(SysFormService.createNewForm(formReq));
     }
 
-    @ApiOperation("同时创建流程和表单")
+    @ApiOperation("同时创建流程和表)
     @PostMapping(value = "Create")
 
     public ApiRes<Boolean> Create(@RequestBody ProcessVO processVO) throws JsonProcessingException {
         return ApiRes.success(SysFormService.createBpmn(processVO));
     }
     /**
-     * 修改表单名称和备注
+     * 修改表单名称和备
      */
-    @ApiOperation("修改表单名称和备注")
+    @ApiOperation("修改表单名称和备)
     @PostMapping("UpdateFormName")
     public ApiRes<Boolean> UpdateFormName(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
         return  ApiRes.success(SysFormService.updateFormName(process));
     }
-    @ApiOperation("获取全部可用的表单和审核流")
+    @ApiOperation("获取全部可用的表单和审核)
     @PostMapping(value = "GetFormList")
     public ApiRes<PageResult<TemplateGroupVo>> GetFormList(@RequestBody BaseRequest br) {
         return ApiRes.success(SysFormService.getFormList(br));
     }
-    @ApiOperation("检查配置是否可用")
+    @ApiOperation("检查配置是否可)
     @PostMapping(value = "CheckConfig")
     public ApiRes<Boolean> CheckConfig(@RequestBody String br) {
         return ApiRes.success(SysFormService.CheckConfig(br));
     }
-    @ApiOperation("检查配置是否可用")
+    @ApiOperation("删除表单")
     @PostMapping(value = "DeleteFormList")
     public ApiRes<Boolean> DeleteFormList(@RequestBody String br) {
         return ApiRes.success(SysFormService.DeleteFrom(br));

jyzb-process/src/main/java/com/junmp/junmpProcess/service/ISysFormService.java

@@ -21,7 +21,7 @@ public interface ISysFormService {
      *
      * @return
      */
-    Boolean createNewForm(FormReq processVO);
+    String createNewForm(FormReq processVO);
 
     /**
      * 创建表单

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/SysFormServiceImpl.java

@@ -53,7 +53,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
     * @Return
     */
     @Override
-    public Boolean createNewForm(FormReq req) {
+    public String createNewForm(FormReq req) {
         ProcessTemplates processTemplates = ProcessTemplates.builder().build();
         String templateId = idWorker.nextId()+"";
         processTemplates.setTemplateId(templateId);
@@ -63,7 +63,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
         Date date= new Date();
         processTemplates.setUpdated(date);
         processTemplateService.save(processTemplates);
-        return true;
+        return templateId;
     }