借款流程

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectWorkController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcProjectWork;
+import com.ruoyi.oa.service.ICmcProjectWorkService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc项目内容Controller
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+@RestController
+@RequestMapping("/oa/projectWork")
+public class CmcProjectWorkController extends BaseController
+{
+    @Autowired
+    private ICmcProjectWorkService cmcProjectWorkService;
+
+    /**
+     * 查询cmc项目内容列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProjectWork cmcProjectWork)
+    {
+        startPage();
+        List<CmcProjectWork> list = cmcProjectWorkService.selectCmcProjectWorkList(cmcProjectWork);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc项目内容列表
+     */
+    @Log(title = "cmc项目内容", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProjectWork cmcProjectWork)
+    {
+        List<CmcProjectWork> list = cmcProjectWorkService.selectCmcProjectWorkList(cmcProjectWork);
+        ExcelUtil<CmcProjectWork> util = new ExcelUtil<CmcProjectWork>(CmcProjectWork.class);
+        util.exportExcel(response, list, "cmc项目内容数据");
+    }
+
+    /**
+     * 获取cmc项目内容详细信息
+     */
+    @GetMapping(value = "/{workId}")
+    public AjaxResult getInfo(@PathVariable("workId") String workId)
+    {
+        return success(cmcProjectWorkService.selectCmcProjectWorkListByProjectId(workId));
+    }
+
+    /**
+     * 新增cmc项目内容
+     */
+    @Log(title = "cmc项目内容", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProjectWork cmcProjectWork)
+    {
+        return toAjax(cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork));
+    }
+
+    /**
+     * 修改cmc项目内容
+     */
+    @Log(title = "cmc项目内容", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProjectWork cmcProjectWork)
+    {
+        return toAjax(cmcProjectWorkService.updateCmcProjectWork(cmcProjectWork));
+    }
+
+    /**
+     * 删除cmc项目内容
+     */
+    @Log(title = "cmc项目内容", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{workIds}")
+    public AjaxResult remove(@PathVariable String[] workIds)
+    {
+        return toAjax(cmcProjectWorkService.deleteCmcProjectWorkByProjectIds(workIds));
+    }
+}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java

@@ -196,8 +196,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
             SysUser sysUser = SecurityUtils.getLoginUser().getUser();
             identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
             variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
-            Map<String, Object> map = variables;
-            JSONObject jsonObject = JSONObject.parse(JSONObject.toJSONString(map));
+            JSONObject jsonObject = JSONObject.parse(JSONObject.toJSONString(variables));
             variables.put("formId", jsonObject.getJSONObject("variables").getString("formId"));
             ProcessInstance startInstance = runtimeService.startProcessInstanceById(procDefId, variables);
             // 流程发起时 跳过发起人节点

oa-ui/src/api/oa/project/projectWork.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-04-07 15:29:32
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-07 15:33:55
+ */
+import request from '@/utils/request'
+
+// 查询cmc项目内容列表
+export function listProjectWork(query) {
+  return request({
+    url: '/oa/projectWork/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目内容详细
+export function getProjectWork(projectId) {
+  return request({
+    url: '/oa/projectWork/' + projectId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目内容
+export function addProjectWork(data) {
+  return request({
+    url: '/oa/projectWork',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目内容
+export function updateProjectWork(data) {
+  return request({
+    url: '/oa/projectWork',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目内容
+export function delProjectWork(projectId) {
+  return request({
+    url: '/oa/projectWork/' + projectId,
+    method: 'delete'
+  })
+}