查考核表用户信息

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

@@ -85,15 +85,13 @@ public class CmcAssessController extends BaseController
         CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(assessId);
         List<CmcAssessContent> cmcAssessContentList = cmcAssessContentService.selectCmcAssessContentByContentId(assessId);
         List<CmcAssessContentWork> cmcAssessContentWorkList = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(assessId);
-        Long userId = cmcAssess.getUserId();
         JSONObject formData = new JSONObject();
+        Long userId = 0L;
+        if (cmcAssess == null)
+            userId = getLoginUser().getUserId();
+        else
+            userId = cmcAssess.getUserId();
         formData.put("nickName", userService.selectUserById(userId).getNickName());
-        formData.put("assessId", cmcAssess.getAssessId());
-        formData.put("assessTime", cmcAssess.getAssessTime());
-        if (cmcAssess.getProjectId() != null && !cmcAssess.getProjectId().equals("")){
-            formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
-            formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());
-        }
         formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
         formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
         formData.put("pmLevel", dictDataService.selectDictLabel("sys_user_pmlevel", userService.selectUserById(userId).getPmLevel()));
@@ -109,28 +107,37 @@ public class CmcAssessController extends BaseController
         formData.put("remark", userService.selectUserById(userId).getRemark());
         formData.put("entryDate", userService.selectUserById(userId).getEntryDate());
         formData.put("age", userService.selectUserById(userId).getAge());
-        formData.put("otherWork", cmcAssess.getOtherWork());
-        formData.put("selfAssess", cmcAssess.getSelfAssess());
-        formData.put("deptAssesser", cmcAssess.getDeptAssesser());
-        formData.put("deptAssessment", cmcAssess.getDeptAssessment());
-        formData.put("deptAdvice", cmcAssess.getDeptAdvice());
-        formData.put("deptTime", cmcAssess.getDeptTime());
-        formData.put("managerAssesser", cmcAssess.getManagerAssesser());
-        formData.put("managerAssessment", cmcAssess.getManagerAssessment());
-        formData.put("managerAdvice", cmcAssess.getManagerAdvice());
-        formData.put("managerTime", cmcAssess.getManagerTime());
-        for (CmcAssessContent cmcAssessContent: cmcAssessContentList) {
-            formData.put("role" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getRole());
-            formData.put("familiar" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getFamiliar());
-            formData.put("workload" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getWorkload());
-            formData.put("remark" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getRemark());
-            formData.put("skill" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getSkill());
-            formData.put("quality" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getQuality());
-            formData.put("assessment" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getAssessment());
-            formData.put("advice" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getAdvice());
-        }
-        for (CmcAssessContentWork cmcAssessContentWork: cmcAssessContentWorkList) {
-            formData.put("f" + cmcAssessContentWork.getWorkId().substring(19), cmcAssessContentWork.getWorkLoad());
+        if (cmcAssess != null) {
+            formData.put("assessId", cmcAssess.getAssessId());
+            formData.put("assessTime", cmcAssess.getAssessTime());
+            if (cmcAssess.getProjectId() != null && !cmcAssess.getProjectId().equals("")){
+                formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
+                formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());
+            }
+            
+            formData.put("otherWork", cmcAssess.getOtherWork());
+            formData.put("selfAssess", cmcAssess.getSelfAssess());
+            formData.put("deptAssesser", cmcAssess.getDeptAssesser());
+            formData.put("deptAssessment", cmcAssess.getDeptAssessment());
+            formData.put("deptAdvice", cmcAssess.getDeptAdvice());
+            formData.put("deptTime", cmcAssess.getDeptTime());
+            formData.put("managerAssesser", cmcAssess.getManagerAssesser());
+            formData.put("managerAssessment", cmcAssess.getManagerAssessment());
+            formData.put("managerAdvice", cmcAssess.getManagerAdvice());
+            formData.put("managerTime", cmcAssess.getManagerTime());
+            for (CmcAssessContent cmcAssessContent: cmcAssessContentList) {
+                formData.put("role" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getRole());
+                formData.put("familiar" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getFamiliar());
+                formData.put("workload" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getWorkload());
+                formData.put("remark" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getRemark());
+                formData.put("skill" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getSkill());
+                formData.put("quality" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getQuality());
+                formData.put("assessment" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getAssessment());
+                formData.put("advice" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getAdvice());
+            }
+            for (CmcAssessContentWork cmcAssessContentWork: cmcAssessContentWorkList) {
+                formData.put("f" + cmcAssessContentWork.getWorkId().substring(19), cmcAssessContentWork.getWorkLoad());
+            }
         }
         return success(formData);
     }

oa-back/sql/tony-flowable.sql

@@ -2768,12 +2768,12 @@ COMMIT;
 -- ----------------------------
 BEGIN;
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2021, '流程管理', 0, 6, 'flowable', NULL, NULL, 1, 0, 'M', '0', '0', NULL, 'cascader', 'tony', '2021-03-25 11:35:09', '', NULL, '');
-INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2022, '流程定义', 2020, 2, 'definition', 'flowable/definition/index', NULL, 1, 0, 'C', '0', '0', '', 'job', 'tony', '2021-03-25 13:53:55', 'admin', '2021-03-29 09:39:07', '');
+INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2022, '流程定义', 2021, 2, 'definition', 'flowable/definition/index', NULL, 1, 0, 'C', '0', '0', '', 'job', 'tony', '2021-03-25 13:53:55', 'admin', '2021-03-29 09:39:07', '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2023, '任务管理', 0, 7, 'task', NULL, NULL, 1, 0, 'M', '0', '0', '', 'dict', 'tony', '2021-03-26 10:53:10', 'admin', '2021-03-29 09:37:40', '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2024, '待办任务', 2023, 2, 'todo', 'flowable/task/todo/index', NULL, 1, 1, 'C', '0', '0', '', 'cascader', 'admin', '2021-03-26 10:55:52', 'admin', '2021-03-30 09:26:36', '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2025, '已办任务', 2023, 3, 'finished', 'flowable/task/finished/index', NULL, 1, 1, 'C', '0', '0', '', 'time-range', 'admin', '2021-03-26 10:57:54', 'admin', '2021-03-30 09:26:50', '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2026, '我的流程', 2023, 1, 'process', 'flowable/task/myProcess/index', NULL, 1, 1, 'C', '0', '0', '', 'guide', 'admin', '2021-03-30 09:26:23', 'admin', '2022-12-12 09:58:07', '');
-INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2027, '表单配置', 2020, 2, 'form', 'flowable/task/form/index', NULL, 1, 0, 'C', '0', '0', 'flowable:form:list', 'form', 'admin', '2021-03-30 22:55:12', 'admin', '2021-04-03 18:50:54', '');
+INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2027, '表单配置', 2021, 2, 'form', 'flowable/task/form/index', NULL, 1, 0, 'C', '0', '0', 'flowable:form:list', 'form', 'admin', '2021-03-30 22:55:12', 'admin', '2021-04-03 18:50:54', '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2028, '新增', 2027, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'flowable:form:add', '#', 'admin', '2021-07-07 14:23:37', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2029, '删除', 2027, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'flowable:form:remove', '#', 'admin', '2021-07-07 14:24:10', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2030, '编辑', 2027, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'flowable:form:edit', '#', 'admin', '2021-07-07 14:24:31', '', NULL, '');
@@ -2782,13 +2782,13 @@ INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2033, '删除', 2026, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:deployment:remove', '#', 'admin', '2021-07-07 14:26:02', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2034, '查询', 2027, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'flowable:form:query', '#', 'admin', '2021-07-08 14:05:22', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2035, '修改密码', 100, 8, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:user:updatePwd', '#', 'admin', '2022-04-29 11:27:13', '', NULL, '');
-INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2036, '流程表达式', 2020, 3, 'expression', 'system/expression/index', NULL, 1, 1, 'C', '0', '0', 'system:expression:list', 'list', 'admin', '2022-12-12 17:12:19', 'admin', '2022-12-12 17:13:44', '流程达式菜单');
+INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2036, '流程表达式', 2021, 3, 'expression', 'system/expression/index', NULL, 1, 1, 'C', '0', '0', 'system:expression:list', 'list', 'admin', '2022-12-12 17:12:19', 'admin', '2022-12-12 17:13:44', '流程达式菜单');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2037, '流程达式查询', 2036, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:expression:query', '#', 'admin', '2022-12-12 17:12:19', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2038, '流程达式新增', 2036, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:expression:add', '#', 'admin', '2022-12-12 17:12:19', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2039, '流程达式修改', 2036, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:expression:edit', '#', 'admin', '2022-12-12 17:12:19', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2040, '流程达式删除', 2036, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:expression:remove', '#', 'admin', '2022-12-12 17:12:19', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2041, '流程达式导出', 2036, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:expression:export', '#', 'admin', '2022-12-12 17:12:19', '', NULL, '');
-INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2042, '流程监听', 2020, 1, 'listener', 'system/listener/index', NULL, 1, 0, 'C', '0', '0', 'system:listener:list', '#', 'admin', '2022-12-25 11:44:16', '', NULL, '流程监听菜单');
+INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2042, '流程监听', 2021, 1, 'listener', 'system/listener/index', NULL, 1, 0, 'C', '0', '0', 'system:listener:list', '#', 'admin', '2022-12-25 11:44:16', '', NULL, '流程监听菜单');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2043, '流程监听查询', 2042, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:listener:query', '#', 'admin', '2022-12-25 11:44:16', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2044, '流程监听新增', 2042, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:listener:add', '#', 'admin', '2022-12-25 11:44:16', '', NULL, '');
 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2045, '流程监听修改', 2042, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:listener:edit', '#', 'admin', '2022-12-25 11:44:16', '', NULL, '');