Przeglądaj źródła

修改项目变更线上显示Date未实例化问题

user5 5 lat temu
rodzic
commit
3d8aed9d04

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

@@ -37,6 +37,8 @@ import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.converters.DateConverter;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -116,7 +118,7 @@ public class ProjectRecordsAlterController extends BaseController {
             //设置详细信息
             projectRecordsService.queryProjectDetail(projectRecords);
         }
-		if (projectRecordsAlter!=null&&StringUtils.isNotBlank(projectRecordsAlter.getId())) {
+		if (null != projectRecordsAlter && StringUtils.isNotBlank(projectRecordsAlter.getId())) {
 		    projectRecordsAlter=projectRecordsAlterService.get(projectRecordsAlter.getId());
             projectRecordsAlter.setAlterBeforeRecords(projectRecords);
 			//设置合同信息
@@ -128,6 +130,7 @@ public class ProjectRecordsAlterController extends BaseController {
                 return "redirect:"+Global.getAdminPath()+"/project/projectRecords/?repage";
             }
             try {
+				ConvertUtils.register(new DateConverter(null), java.util.Date.class);
                 BeanUtils.copyProperties(projectRecordsAlter,projectRecords);
                 projectRecordsAlter.setId(null);
             } catch (IllegalAccessException e) {