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