合同汇总调整

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -763,8 +763,8 @@ public class ProjectcontentinfoController extends BaseController {
 
 	@RequestMapping(value = {"save"})
 	public String save(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model
-			,RedirectAttributes redirectAttributes) throws Exception {
-//		try{
+			,RedirectAttributes redirectAttributes)  {
+		try{
 			String str = projectcontentinfoService.saveData(projectcontentinfo,1);
 			if( projectcontentinfo.getProjectContentData() != null && StringUtils.isNotBlank(projectcontentinfo.getProjectContentData().getType())){
 				ProjectContentData projectContentData = projectcontentinfo.getProjectContentData();
@@ -809,9 +809,9 @@ public class ProjectcontentinfoController extends BaseController {
 					return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectcontentinfo/?id="+projectcontentinfo.getId();
 				}
 			}
-//		}catch (Exception e){
-//			logger.error("ProjectcontentinfoController save Exception e"+e);
-//		}
+		}catch (Exception e){
+			logger.error("ProjectcontentinfoController save Exception e"+e);
+		}
 		if(UserUtils.isManager()){
 			model.addAttribute("flag","1");
 		}

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentContractSumController.java

@@ -118,11 +118,9 @@ public class WorkContentContractSumController extends BaseController {
 		}else {
 			model.addAttribute("workContentContractSum", workContentContractSum);
 		}
-		String viewPath = "modules/workcontent/workContentContractSumForm";
-		if("view".equals(view)){
-			viewPath+="View";
-		}
-		return viewPath;
+		;
+
+		return "modules/workcontent/workContentContractSumFormView";
 	}
 
 	/**

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentTypeController.java

@@ -215,7 +215,16 @@ public class WorkContentTypeController extends BaseController {
         workContentType.setCompany(company);
         workContentType.setParentId(parentId);
         workContentType.setDelFlag(WorkContentType.DEL_FLAG_NORMAL);
-        return workContentTypeService.findList(workContentType);
+		List<WorkContentType> list = workContentTypeService.findList(workContentType);
+		if("4".equals(parentId)){
+			WorkContentType workContentType1 = new WorkContentType();
+			workContentType1.setTypeId("400");
+			workContentType1.setTypeName("合同动态汇总");
+			workContentType1.setParentId("4");
+			workContentType1.setParentIds("0,4");
+			list.add(workContentType1);
+		}
+        return list;
     }
 	public static List<WorkContentType> getProjectContentType(String parentId,String projectId){
 		WorkContentType workContentType = new WorkContentType();

src/main/webapp/webpage/modules/projectcontentinfo/workContentForm.jsp

@@ -209,6 +209,9 @@
                 case '53':
                     $("#contentDetail").load("${ctx}/workcontent/workContentDocument/form",param2);
                     break;
+                case '400':
+                    $("#contentDetail").load("${ctx}/workcontent/workContentContractSum/form",param2);
+                    break;
                 default:
                     detailFlag=0;
                     $("#contentDetail").html("");