浏览代码

借款流程

lamphua 1年前
父节点
当前提交
5a50b5cc62

+ 97
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectWorkController.java 查看文件

1
+package com.ruoyi.web.controller.oa;
2
+
3
+import java.util.List;
4
+import javax.servlet.http.HttpServletResponse;
5
+import org.springframework.beans.factory.annotation.Autowired;
6
+import org.springframework.web.bind.annotation.GetMapping;
7
+import org.springframework.web.bind.annotation.PostMapping;
8
+import org.springframework.web.bind.annotation.PutMapping;
9
+import org.springframework.web.bind.annotation.DeleteMapping;
10
+import org.springframework.web.bind.annotation.PathVariable;
11
+import org.springframework.web.bind.annotation.RequestBody;
12
+import org.springframework.web.bind.annotation.RequestMapping;
13
+import org.springframework.web.bind.annotation.RestController;
14
+import com.ruoyi.common.annotation.Log;
15
+import com.ruoyi.common.core.controller.BaseController;
16
+import com.ruoyi.common.core.domain.AjaxResult;
17
+import com.ruoyi.common.enums.BusinessType;
18
+import com.ruoyi.oa.domain.CmcProjectWork;
19
+import com.ruoyi.oa.service.ICmcProjectWorkService;
20
+import com.ruoyi.common.utils.poi.ExcelUtil;
21
+import com.ruoyi.common.core.page.TableDataInfo;
22
+
23
+/**
24
+ * cmc项目内容Controller
25
+ * 
26
+ * @author cmc
27
+ * @date 2024-04-07
28
+ */
29
+@RestController
30
+@RequestMapping("/oa/projectWork")
31
+public class CmcProjectWorkController extends BaseController
32
+{
33
+    @Autowired
34
+    private ICmcProjectWorkService cmcProjectWorkService;
35
+
36
+    /**
37
+     * 查询cmc项目内容列表
38
+     */
39
+    @GetMapping("/list")
40
+    public TableDataInfo list(CmcProjectWork cmcProjectWork)
41
+    {
42
+        startPage();
43
+        List<CmcProjectWork> list = cmcProjectWorkService.selectCmcProjectWorkList(cmcProjectWork);
44
+        return getDataTable(list);
45
+    }
46
+
47
+    /**
48
+     * 导出cmc项目内容列表
49
+     */
50
+    @Log(title = "cmc项目内容", businessType = BusinessType.EXPORT)
51
+    @PostMapping("/export")
52
+    public void export(HttpServletResponse response, CmcProjectWork cmcProjectWork)
53
+    {
54
+        List<CmcProjectWork> list = cmcProjectWorkService.selectCmcProjectWorkList(cmcProjectWork);
55
+        ExcelUtil<CmcProjectWork> util = new ExcelUtil<CmcProjectWork>(CmcProjectWork.class);
56
+        util.exportExcel(response, list, "cmc项目内容数据");
57
+    }
58
+
59
+    /**
60
+     * 获取cmc项目内容详细信息
61
+     */
62
+    @GetMapping(value = "/{workId}")
63
+    public AjaxResult getInfo(@PathVariable("workId") String workId)
64
+    {
65
+        return success(cmcProjectWorkService.selectCmcProjectWorkListByProjectId(workId));
66
+    }
67
+
68
+    /**
69
+     * 新增cmc项目内容
70
+     */
71
+    @Log(title = "cmc项目内容", businessType = BusinessType.INSERT)
72
+    @PostMapping
73
+    public AjaxResult add(@RequestBody CmcProjectWork cmcProjectWork)
74
+    {
75
+        return toAjax(cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork));
76
+    }
77
+
78
+    /**
79
+     * 修改cmc项目内容
80
+     */
81
+    @Log(title = "cmc项目内容", businessType = BusinessType.UPDATE)
82
+    @PutMapping
83
+    public AjaxResult edit(@RequestBody CmcProjectWork cmcProjectWork)
84
+    {
85
+        return toAjax(cmcProjectWorkService.updateCmcProjectWork(cmcProjectWork));
86
+    }
87
+
88
+    /**
89
+     * 删除cmc项目内容
90
+     */
91
+    @Log(title = "cmc项目内容", businessType = BusinessType.DELETE)
92
+	@DeleteMapping("/{workIds}")
93
+    public AjaxResult remove(@PathVariable String[] workIds)
94
+    {
95
+        return toAjax(cmcProjectWorkService.deleteCmcProjectWorkByProjectIds(workIds));
96
+    }
97
+}

+ 1
- 2
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java 查看文件

196
             SysUser sysUser = SecurityUtils.getLoginUser().getUser();
196
             SysUser sysUser = SecurityUtils.getLoginUser().getUser();
197
             identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
197
             identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
198
             variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
198
             variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
199
-            Map<String, Object> map = variables;
200
-            JSONObject jsonObject = JSONObject.parse(JSONObject.toJSONString(map));
199
+            JSONObject jsonObject = JSONObject.parse(JSONObject.toJSONString(variables));
201
             variables.put("formId", jsonObject.getJSONObject("variables").getString("formId"));
200
             variables.put("formId", jsonObject.getJSONObject("variables").getString("formId"));
202
             ProcessInstance startInstance = runtimeService.startProcessInstanceById(procDefId, variables);
201
             ProcessInstance startInstance = runtimeService.startProcessInstanceById(procDefId, variables);
203
             // 流程发起时 跳过发起人节点
202
             // 流程发起时 跳过发起人节点

+ 9
- 1
oa-back/sql/sql.sql
文件差异内容过多而无法显示
查看文件


+ 50
- 0
oa-ui/src/api/oa/project/projectWork.js 查看文件

1
+/*
2
+ * @Author: wrh
3
+ * @Date: 2024-04-07 15:29:32
4
+ * @LastEditors: wrh
5
+ * @LastEditTime: 2024-04-07 15:33:55
6
+ */
7
+import request from '@/utils/request'
8
+
9
+// 查询cmc项目内容列表
10
+export function listProjectWork(query) {
11
+  return request({
12
+    url: '/oa/projectWork/list',
13
+    method: 'get',
14
+    params: query
15
+  })
16
+}
17
+
18
+// 查询cmc项目内容详细
19
+export function getProjectWork(projectId) {
20
+  return request({
21
+    url: '/oa/projectWork/' + projectId,
22
+    method: 'get'
23
+  })
24
+}
25
+
26
+// 新增cmc项目内容
27
+export function addProjectWork(data) {
28
+  return request({
29
+    url: '/oa/projectWork',
30
+    method: 'post',
31
+    data: data
32
+  })
33
+}
34
+
35
+// 修改cmc项目内容
36
+export function updateProjectWork(data) {
37
+  return request({
38
+    url: '/oa/projectWork',
39
+    method: 'put',
40
+    data: data
41
+  })
42
+}
43
+
44
+// 删除cmc项目内容
45
+export function delProjectWork(projectId) {
46
+  return request({
47
+    url: '/oa/projectWork/' + projectId,
48
+    method: 'delete'
49
+  })
50
+}

正在加载...
取消
保存