فهرست منبع

工作报告流程调整

蔡德晨 5 سال پیش
والد
کامیت
dad3a1d011

+ 2 - 0
src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsAlterService.java

@@ -378,6 +378,8 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
             }
             processType = "projectAlter";
             variables.put("applyUserId", projectRecordsAlter.getCreateBy().getId());
+            variables.put("bmzrCount",bmzrs.size());
+            variables.put("bmzrList",bmzrs);
             users.addAll(bmzrs);
         }
         List<String> userIds = new ArrayList<>(users.size());

+ 6 - 6
src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsAlterController.java

@@ -211,11 +211,11 @@ public class ProjectRecordsAlterController extends BaseController {
 	 */
 	@RequiresPermissions(value={"project:projectRecords:add","project:projectRecords:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
-	public String save(ProjectRecordsAlter projectRecords, Model model, RedirectAttributes redirectAttributes){
+	public String save(ProjectRecordsAlter projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception {
 		if (!beanValidator(model, projectRecords)){
 			return form(projectRecords, model,redirectAttributes);
 		}
-        try {
+//        try {
             if(!projectRecords.getIsNewRecord()){//编辑表单保存
                 ProjectRecordsAlter t = projectRecordsAlterService.get(projectRecords.getId());//从数据库取出记录的值
                 MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -224,10 +224,10 @@ public class ProjectRecordsAlterController extends BaseController {
                 projectRecordsAlterService.saveProject(projectRecords,AlterStatusEnum.IN_APRL);//保存
             }
             addMessage(model,"保存项目变更成功");
-        } catch (Exception e) {
-            logger.error("保存项目变更异常:",e);
-            addMessage(model,"保存项目变更异常:"+e.getMessage());
-        }
+//        } catch (Exception e) {
+//            logger.error("保存项目变更异常:",e);
+//            addMessage(model,"保存项目变更异常:"+e.getMessage());
+//        }
 		return "redirect:"+Global.getAdminPath()+"/project/projectRecordsAlter/?repage";
 	}