lamphua 1 рік тому
джерело
коміт
ee7f9d5c2d

+ 2
- 2
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java Переглянути файл

107
         formData.put("remark", userService.selectUserById(userId).getRemark());
107
         formData.put("remark", userService.selectUserById(userId).getRemark());
108
         formData.put("entryDate", userService.selectUserById(userId).getEntryDate());
108
         formData.put("entryDate", userService.selectUserById(userId).getEntryDate());
109
         formData.put("age", userService.selectUserById(userId).getAge());
109
         formData.put("age", userService.selectUserById(userId).getAge());
110
+        formData.put("assessId", assessId);
110
         if (cmcAssess != null) {
111
         if (cmcAssess != null) {
111
-            formData.put("assessId", cmcAssess.getAssessId());
112
             formData.put("assessTime", cmcAssess.getAssessTime());
112
             formData.put("assessTime", cmcAssess.getAssessTime());
113
             if (cmcAssess.getProjectId() != null && !cmcAssess.getProjectId().equals("")){
113
             if (cmcAssess.getProjectId() != null && !cmcAssess.getProjectId().equals("")){
114
                 formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
114
                 formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
115
                 formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());
115
                 formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());
116
             }
116
             }
117
-            
117
+
118
             formData.put("otherWork", cmcAssess.getOtherWork());
118
             formData.put("otherWork", cmcAssess.getOtherWork());
119
             formData.put("selfAssess", cmcAssess.getSelfAssess());
119
             formData.put("selfAssess", cmcAssess.getSelfAssess());
120
             formData.put("deptAssesser", cmcAssess.getDeptAssesser());
120
             formData.put("deptAssesser", cmcAssess.getDeptAssesser());

Завантаження…
Відмінити
Зберегти