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